michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-24 13:00:30 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix broken redirect when there is no way to get FQDN

Browse Source 
*Note: "$host = &get_socket_name(SOCK, $ipv6fhs{$s});" won't return FQDN if it can't be resolved (or if it isn't in /etc/hosts), breaking some redirects, most likely proxied ones that aren't using HTTPS in its config.
This commit is contained in:
Ilia Ross
2025-10-01 01:03:45 +03:00
parent 4dc64f5028
commit fc4e2751dc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
miniserv.pl
View File

@@ -1382,7 +1382,12 @@ print DEBUG "handle_request reqline=$reqline\n";
alarm(0);
if (!$use_ssl && $config{'ssl'} && $config{'ssl_enforce'}) {
# This is an http request when https must be enforced
local $urlhost = $config{'musthost'} || $host;
local $hostname = $host;
if ($hostname !~ /\./) {
my $system_hostname = &get_system_hostname();
$hostname = $system_hostname if ($system_hostname =~ /\./);
}
local $urlhost = $config{'musthost'} || $hostname;
$urlhost = "[".$urlhost."]" if (&check_ip6address($urlhost));
local $wantport = $port;
if ($wantport == 80 &&
@@ -1400,7 +1405,7 @@ if (!$use_ssl && $config{'ssl'} && $config{'ssl_enforce'}) {
&write_data("Location: $url\r\n");
&write_keep_alive(0);
&write_data("\r\n");
&log_error("Redirecting HTTP request to HTTPS for $acptip");
&log_error("Redirecting HTTP request to HTTPS using $urlhost host");
&log_request($loghost, $authuser, $reqline, 302, 0);
return 0;
}