github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Fix terminal mode handling

Browse Source 
ⓘ Avoid forcing xterm shell PTYs into IO::Stty raw/noecho mode, which can leave interactive shells with broken echo, line editing, and control-key behavior. Keep the existing stty logic for other PTY callers, but add an opt-out flag so xterm can let the shell manage terminal mode normally.

https://github.com/webmin/webmin/issues/2452
This commit is contained in:
Ilia Ross
2026-06-03 18:43:53 +02:00
parent 758aa4a9f7
commit f7b8ef379f
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proc/proc-lib.pl
+12 -14
View File
@@ -249,11 +249,11 @@ do { local $oldexit = $?;
} while($xp > 0);
}
# pty_process_exec(command, [uid, gid], [force-binary-name])
# pty_process_exec(command, [uid, gid], [force-binary-name], [skip-stty])
# Starts the given command in a new pty and returns the pty filehandle and PID
sub pty_process_exec
{
local ($cmd, $uid, $gid, $binary) = @_;
local ($cmd, $uid, $gid, $binary, $skip_stty) = @_;
if (&is_readonly_mode()) {
# When in readonly mode, don't run the command
$cmd = "/bin/true";
@@ -262,6 +262,13 @@ if (&is_readonly_mode()) {
if ($gconfig{'debug_what_cmd'});
my ($ptyfh, $ttyfh, $pty, $tty, $TIOCSCTTY);
my $set_pty_raw_noecho = sub {
my ($ttyfh) = @_;
eval "use IO::Stty";
if (!$@) {
IO::Stty::stty($ttyfh, 'raw', '-echo');
}
};
eval "use IO::Pty";
if (!$@) {
@@ -281,10 +288,7 @@ if (!$@) {
$ptyfh->make_slave_controlling_terminal();
# Turn off echoing, if we can
eval "use IO::Stty";
if (!$@) {
IO::Stty::stty($ttyfh, 'raw', '-echo');
}
$set_pty_raw_noecho->($ttyfh) if (!$skip_stty);
close(STDIN); close(STDOUT); close(STDERR);
untie(*STDIN); untie(*STDOUT); untie(*STDERR);
@@ -342,10 +346,7 @@ elsif (defined &linux_openpty &&
};
# Turn off echoing, if we can
eval "use IO::Stty";
if (!$@) {
IO::Stty::stty($ttyfh, 'raw', '-echo');
}
$set_pty_raw_noecho->($ttyfh) if (!$skip_stty);
close(STDIN); close(STDOUT); close(STDERR);
untie(*STDIN); untie(*STDOUT); untie(*STDERR);
@@ -397,10 +398,7 @@ else {
}
# Turn off echoing, if we can
eval "use IO::Stty";
if (!$@) {
IO::Stty::stty($ttyfh, 'raw', '-echo');
}
$set_pty_raw_noecho->($ttyfh) if (!$skip_stty);
if (defined(&open_controlling_pty)) {
&open_controlling_pty($ptyfh, $ttyfh, $pty, $tty);
xterm/shellserver.pl
+2 -1
View File
@@ -86,7 +86,8 @@ if ($config{'rcfile'} ne '0') {
$shelllogin = undef;
}
}
my ($shellfh, $pid) = proc::pty_process_exec($shellexec, $uid, $gid, $shelllogin);
my ($shellfh, $pid) = proc::pty_process_exec(
$shellexec, $uid, $gid, $shelllogin, 1);
reset_environment();
my $shcmd = "'$shellexec".($shelllogin ? " $shelllogin" : "")."'";
if (!$pid) {