michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-07-25 02:40:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix to honor redirect settings for WebSocket URLs

Browse Source
This commit is contained in:
LemoeChun
2026-07-15 17:27:16 +08:00
parent 0394bb8cde
commit 2ea3723811
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web-lib-funcs.pl
View File

@@ -14765,9 +14765,13 @@ my $webprefix = &get_webprefix();
my $trust_proxy = $miniserv{'trust_real_ip'};
my $default_ws_proto = lc($ENV{'HTTPS'}) eq 'on' ? 'wss' : 'ws';
my $ws_proto;
# Match the canonical redirect scheme when one has been configured.
if ($miniserv{'redirect_ssl'} ne '') {
$ws_proto = $miniserv{'redirect_ssl'} ? 'wss' : 'ws';
}
# Match the public browser scheme when Webmin is behind a trusted reverse
# proxy, but only allow websocket schemes into the returned URL.
if ($trust_proxy && $ENV{'HTTP_X_FORWARDED_PROTO'}) {
if (!$ws_proto && $trust_proxy && $ENV{'HTTP_X_FORWARDED_PROTO'}) {
$ws_proto = (split(/\s*,\s*/, $ENV{'HTTP_X_FORWARDED_PROTO'}))[0];
$ws_proto =~ s/^\s+|\s+$//g;
}
@@ -14796,6 +14800,17 @@ if ($http_host_conf) {
}
$http_host_conf =~ s/[\/]+$//g;
}
# Otherwise use the canonical redirect host and port when configured
if (!$http_host_conf && $miniserv{'redirect_host'}) {
my $redirect_host = $miniserv{'redirect_host'};
my $redirect_port = $miniserv{'redirect_port'};
my $port = $redirect_port &&
!($redirect_port == 80 && $ws_proto eq 'ws') &&
!($redirect_port == 443 && $ws_proto eq 'wss') ?
":".$redirect_port : "";
$redirect_host = "[".$redirect_host."]" if (&check_ip6address($redirect_host));
$http_host_conf = "$ws_proto://$redirect_host$port";
}
# Otherwise use trusted proxy headers when available
if ($trust_proxy && !defined($http_host_conf)) {
my $forwarded_host = $ENV{'HTTP_X_FORWARDED_HOST'};