michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-04 23:20:40 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix redirect built for themes when used with webprefix

Browse Source
This commit is contained in:
Ilia Rostovtsev
2021-12-02 22:23:29 +03:00
parent 0126e3cc20
commit bfcf37d077
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
web-lib-funcs.pl
View File

@@ -5249,39 +5249,41 @@ if ($ENV{'HTTP_X_REQUESTED_WITH'} ne "XMLHttpRequest" &&
$ENV{'REQUEST_URI'} !~ /pjax/ &&
$ENV{'REQUEST_URI'} !~ /link.cgi\/\d+/ &&
$ENV{'REQUEST_URI'} =~ /xnavigation=1/) {
# Store requested URI if safe
if ($main::session_id && $remote_user) {
my %var;
my $key = 'goto';
my $xnav = "xnavigation=1";
my $url = "@{[&get_webprefix()]}$ENV{'REQUEST_URI'}";
my $salt = substr(encode_base64($main::session_id), 0, 16);
$url =~ s/[?|&]$xnav//g;
$salt =~ tr/A-Za-z0-9//cd;
my $urlbase = &get_webprefix();
# Store request URI, if safe
if ($main::session_id && $remote_user) {
my %var;
my $key = 'goto';
my $xnav = "xnavigation=1";
my $url = "$urlbase$ENV{'REQUEST_URI'}";
my $salt = substr(encode_base64($main::session_id), 0, 16);
$url =~ s/[?|&]$xnav//g;
$salt =~ tr/A-Za-z0-9//cd;
if (!$trust) {
my @parent_dir = split('/', $url);
$url = &get_webprefix() ? $parent_dir[2] : $parent_dir[1];
if ($url =~ /.cgi/) {
$url = "/";
}
else {
$url = "/" . $url . "/";
}
}
# Append random string to stored file name, to process multiple, simultaneous requests
my $url_salt = int(rand() * 10000000);
$var{$key} = $url;
if (!$trust) {
my @parent_dir = split('/', $url);
$url = &get_webprefix() ? $parent_dir[2] : $parent_dir[1];
# Redirect to root in case of no module, i.e. /sysinfo.cgi
if ($url =~ /\.cgi/) {
$url = "/";
}
# Redirect to module's root, i.e. /apache/
else {
$url = "/" . $url . "/";
}
}
# Append random string to stored file name, to process multiple, simultaneous requests
my $url_salt = int(rand() * 10000000);
$var{$key} = $url;
# Write follow URL only once
if (!$main::redirect_built) {
$main::ignore_errors = 1;
&write_file(tempname('.theme_' . $salt . '_' . $url_salt . '_' . get_product_name() . '_' . $key . '_' . $remote_user), \%var);
$main::ignore_errors = 0;
}
$main::redirect_built++;
}
&redirect("/");
# Write URL for the theme to read and open
if (!$main::redirect_built++) {
$main::ignore_errors = 1;
&write_file(tempname('.theme_' . $salt . '_' . $url_salt . '_' . get_product_name() . '_' . $key . '_' . $remote_user), \%var);
$main::ignore_errors = 0;
}
}
&redirect("$urlbase/");
}
if (!$trust) {
# Looks like a link from elsewhere .. show an error