From f99f5fbae6b02b93384ed10a0bc90674e7a96832 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Fri, 1 Aug 2025 11:21:57 +0300 Subject: [PATCH] Revert previous commit https://github.com/webmin/webmin/commit/5ee080d24a52a07040b8cf17b9db2e65cd26d47a#commitcomment-163253013 --- usermin/change_bind.cgi | 8 -------- usermin/edit_bind.cgi | 8 -------- webmin/change_bind.cgi | 8 -------- webmin/edit_bind.cgi | 8 -------- webmin/lang/en | 2 -- xterm/shellserver.pl | 9 +++------ 6 files changed, 3 insertions(+), 40 deletions(-) diff --git a/usermin/change_bind.cgi b/usermin/change_bind.cgi index 990f6a3ac..b397107f4 100755 --- a/usermin/change_bind.cgi +++ b/usermin/change_bind.cgi @@ -64,14 +64,6 @@ else { $miniserv{'bind'} = $first->[0]; } $miniserv{'sockets'} = join(" ", map { "$_->[0]:$_->[1]" } @sockets); -# WebSocket bind address -if ($in{'websocket_bind_def'}) { - delete($miniserv{'websocket_bind'}); - } -else { - $miniserv{'websocket_bind'} = $in{'websocket_bind'}; - } -# Websocket base port if ($in{'websocket_base_port_def'}) { delete($miniserv{'websocket_base_port'}); } diff --git a/usermin/edit_bind.cgi b/usermin/edit_bind.cgi index b2a4f746b..33e8fdbc0 100755 --- a/usermin/edit_bind.cgi +++ b/usermin/edit_bind.cgi @@ -46,14 +46,6 @@ if (&foreign_check("firewall") || &foreign_check("firewalld")) { } print &ui_table_row($text{'bind_sockets'}, $stable); -# WebSocket default bind address -print &ui_table_row($text{'bind_websocaddr'}, - &ui_radio("websocket_bind_def", - $miniserv{"websocket_bind"} ? 0 : 1, - [ [ 1, $text{'bind_websocaddr_localhost'} ], - [ 0, &ui_textbox("websocket_bind", - $miniserv{"websocket_bind"}, 15) ] ])); - # WebSocket based port print &ui_table_row($text{'bind_websocport'}, &ui_radio("websocket_base_port_def", diff --git a/webmin/change_bind.cgi b/webmin/change_bind.cgi index 04f38380b..f5592abe6 100755 --- a/webmin/change_bind.cgi +++ b/webmin/change_bind.cgi @@ -84,14 +84,6 @@ else { $miniserv{'bind'} = $first->[0]; } $miniserv{'sockets'} = join(" ", map { "$_->[0]:$_->[1]" } @sockets); -# WebSocket bind address -if ($in{'websocket_bind_def'}) { - delete($miniserv{'websocket_bind'}); - } -else { - $miniserv{'websocket_bind'} = $in{'websocket_bind'}; - } -# Websocket base port if ($in{'websocket_base_port_def'}) { delete($miniserv{'websocket_base_port'}); } diff --git a/webmin/edit_bind.cgi b/webmin/edit_bind.cgi index 836d62ab0..064b75cd9 100755 --- a/webmin/edit_bind.cgi +++ b/webmin/edit_bind.cgi @@ -43,14 +43,6 @@ if (&foreign_check("firewall") || &foreign_check("firewalld")) { } print &ui_table_row($text{'bind_sockets'}, $stable); -# WebSocket default bind address -print &ui_table_row($text{'bind_websocaddr'}, - &ui_radio("websocket_bind_def", - $miniserv{"websocket_bind"} ? 0 : 1, - [ [ 1, $text{'bind_websocaddr_localhost'} ], - [ 0, &ui_textbox("websocket_bind", - $miniserv{"websocket_bind"}, 15) ] ])); - # WebSocket based port print &ui_table_row($text{'bind_websocport'}, &ui_radio("websocket_base_port_def", diff --git a/webmin/lang/en b/webmin/lang/en index 43dc7dbf9..7e98cc203 100644 --- a/webmin/lang/en +++ b/webmin/lang/en @@ -49,8 +49,6 @@ bind_sport0=Same as first bind_sport1=Specific port .. bind_listen=Listen for broadcasts on UDP port bind_none=Don't listen -bind_websocaddr=WebSocket bind address or hostname -bind_websocaddr_localhost=Localhost (127.0.0.1) bind_websocport=WebSockets connection base port number bind_websocport_none=Default (555) bind_websoc_host=Hostname for WebSocket connections diff --git a/xterm/shellserver.pl b/xterm/shellserver.pl index 9b923cf04..473a528a2 100755 --- a/xterm/shellserver.pl +++ b/xterm/shellserver.pl @@ -104,19 +104,16 @@ $SIG{'ALRM'} = sub { die "timeout waiting for connection"; }; alarm(60); -my %miniserv; -&get_miniserv_config(\%miniserv); -my $host = $miniserv{'websocket_bind'} || '127.0.0.1'; -&error_stderr("Listening on port $host:$port"); +&error_stderr("Listening on port $port"); my ($wsconn, $shellbuf); my $server_socket = IO::Socket::INET->new( Listen => 5, - LocalAddr => $host, + LocalAddr => '127.0.0.1', LocalPort => $port, Proto => 'tcp', ReuseAddr => 1, ); -$server_socket || die "Failed to listen on port $host:$port"; +$server_socket || die "failed to listen on port $port"; Net::WebSocket::Server->new( listen => $server_socket, on_connect => sub {