VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IPv6 URL redirects https://sourceforge.net/tracker/?func=detail&atid=117457&aid=3565339&group_id=17457

Browse Source
This commit is contained in:
Jamie Cameron
2012-09-06 15:55:51 -07:00
parent 36f388bd92
commit 09abf15596
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
miniserv.pl
View File

@ -1393,7 +1393,10 @@ elsif ($header{'x-real-ip'}) {
$loghost = $header{'x-real-ip'};
}
if (defined($header{'host'})) {
if ($header{'host'} =~ /^([^:]+):([0-9]+)$/) {
if ($header{'host'} =~ /^\[(.+)\]:([0-9]+)$/) {
($host, $port) = ($1, $2);
}
elsif ($header{'host'} =~ /^([^:]+):([0-9]+)$/) {
($host, $port) = ($1, $2);
}
else {
@ -1404,6 +1407,10 @@ if (defined($header{'host'})) {
&http_error(400, "Invalid HTTP hostname");
}
}
$portstr = $port == 80 && !$ssl ? "" :
$port == 443 && $ssl ? "" : ":$port";
$hostport = &check_ip6address($host) ? "[".$host."]".$portstr
: $host.$portstr;
undef(%in);
if ($page =~ /^([^\?]+)\?(.*)$/) {
# There is some query string information
@ -1527,10 +1534,8 @@ if (defined($redir)) {
&write_data("Date: $datestr\r\n");
&write_data("Server: $config{'server'}\r\n");
local $ssl = $use_ssl || $config{'inetd_ssl'};
$portstr = $port == 80 && !$ssl ? "" :
$port == 443 && $ssl ? "" : ":$port";
$prot = $ssl ? "https" : "http";
&write_data("Location: $prot://$host$portstr$redir\r\n");
&write_data("Location: $prot://$hostport$redir\r\n");
&write_keep_alive(0);
&write_data("\r\n");
return 0;
@ -2126,7 +2131,7 @@ if (-d _) {
&write_data("Date: $datestr\r\n");
&write_data("Server: $config{server}\r\n");
$prot = $ssl ? "https" : "http";
&write_data("Location: $prot://$host$portstr$page/\r\n");
&write_data("Location: $prot://$hostport$page/\r\n");
&write_keep_alive(0);
&write_data("\r\n");
&log_request($loghost, $authuser, $reqline, 302, 0);
@ -3936,7 +3941,7 @@ if ($ok && (!$expired ||
else {
&write_data("Set-Cookie: $sidname=$sid; path=/$sec\r\n");
}
&write_data("Location: $prot://$host$portstr$in{'page'}\r\n");
&write_data("Location: $prot://$hostport$in{'page'}\r\n");
&write_keep_alive(0);
&write_data("\r\n");
&log_request($loghost, $authuser, $reqline, 302, 0);