michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to correctly support setting login shell mixed with params

Browse Source 
There is no way to make it work correctly across all shell, i.e. param sequence which work with `bash` will fail with `csh`, as `-l` (login shell) can be the only flag specified
This commit is contained in:
iliajie
2022-11-12 19:32:56 +02:00
parent e3212d7f94
commit a249e9be00
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proc/proc-lib.pl
View File

@@ -295,7 +295,7 @@ if (!$@) {
open(STDERR, ">&".fileno($ttyfh));
close($ttyfh); # Already dup'd
if ($binary) {
exec "$cmd $binary";
exec $cmd $binary;
}
else {
exec($cmd);
@@ -350,7 +350,7 @@ else {
open(STDERR, ">&STDOUT");
close($ptyfh);
if ($binary) {
exec "$cmd $binary";
exec $cmd $binary;
}
else {
exec($cmd);

24
xterm/shellserver.pl
View File

@@ -33,10 +33,10 @@ $ENV{'TERM'} = 'xterm-256color';
$ENV{'HOME'} = $uinfo[7];
chdir($dir || $uinfo[7] || "/");
my $shellcmd = $uinfo[8];
my $shell = $uinfo[8];
$shell =~ s/^.*\///;
my $shellname = $shell;
$shell = "-".$shell;
my $shellname = $shellcmd;
$shellname =~ s/^.*\///;
my $shellexec = $shellcmd;
my $shelllogin = "-".$shellname;
# Check for initialization file
if ($config{'rcfile'}) {
@@ -51,17 +51,21 @@ if ($config{'rcfile'}) {
}
if (-r $rcfile) {
# Bash
if ($shellcmd =~ /\/bash$/) {
$shellcmd .= " --rcfile $rcfile";
if ($shellname eq 'bash') {
$shellexec = "$shellcmd --rcfile $rcfile";
}
# Sh
elsif ($shellcmd =~ /\/sh$/) {
$shellcmd = "ENV=$rcfile; export ENV ; $shellcmd";
elsif ($shellname eq 'sh') {
$shellexec = "ENV=$rcfile; export ENV ; $shellexec";
}
print STDERR "using alternative shell init file $rcfile\n";
# Cannot use login shell while passing other parameters,
# and it is not necessary as we already add init files
$shelllogin = undef;
}
}
my ($shellfh, $pid) = &proc::pty_process_exec($shellcmd, $uid, $gid, $shell);
my ($shellfh, $pid) = &proc::pty_process_exec($shellexec, $uid, $gid, $shelllogin);
print STDERR "using shell command '$shellexec".($shelllogin ? " $shelllogin" : undef)."'\n";
&reset_environment();
if (!$pid) {
&cleanup_miniserv();