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

Keep old config options for proxy trust

Browse Source
This commit is contained in:
Jamie Cameron
2025-02-13 20:44:54 -08:00
parent e943bf6f5d
commit 4c1b063654
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
miniserv.pl
View File

@ -1704,7 +1704,7 @@ if ($header{'user-agent'} =~ /webmin/i ||
}
# Check for SSL authentication
my $trust_ssl = $config{'trust_real_ip'} == 2;
my $trust_ssl = $config{'trust_real_ip'} && !$config{'no_trust_ssl'};
if ($use_ssl && $verified_client ||
$trust_ssl && $header{'x-ssl-client-dn'}) {
if ($use_ssl && $verified_client) {

13
webmin/change_access.cgi
View File

@ -38,7 +38,18 @@ if ($in{"access"} == 1) { $miniserv{"allow"} = join(' ', @hosts); }
elsif ($in{"access"} == 2) { $miniserv{"deny"} = join(' ', @hosts); }
$miniserv{'libwrap'} = $in{'libwrap'};
$miniserv{'alwaysresolve'} = $in{'alwaysresolve'};
$miniserv{'trust_real_ip'} = $in{'trust'};
if ($in{'trust'} == 2) {
$miniserv{'trust_real_ip'} = 1;
$miniserv{'no_trust_ssl'} = 0;
}
elsif ($in{'trust'} == 1) {
$miniserv{'trust_real_ip'} = 1;
$miniserv{'no_trust_ssl'} = 1;
}
else {
$miniserv{'trust_real_ip'} = 0;
$miniserv{'no_trust_ssl'} = 1;
}
&put_miniserv_config(\%miniserv);
&unlock_file($ENV{'MINISERV_CONFIG'});
&show_restart_page();

4
webmin/edit_access.cgi
View File

@ -27,8 +27,10 @@ print &ui_table_row($text{'access_ip'},
print &ui_table_row($text{'access_always'},
&ui_yesno_radio("alwaysresolve", int($miniserv{'alwaysresolve'})));
$mode = $miniserv{'trust_real_ip'} && !$miniserv{'no_trust_ssl'} ? 2 :
$miniserv{'trust_real_ip'} ? 1 : 0;
print &ui_table_row(&hlink($text{'access_trust_lvl'}, "access_trust_lvl"),
&ui_radio("trust", int($miniserv{'trust_real_ip'}),
&ui_radio("trust", $mode,
[ [ 0, $text{'access_trust_lvl0'} ],
[ 1, $text{'access_trust_lvl1'} ],
[ 2, $text{'access_trust_lvl2'} ] ]));

4
webmin/postinstall.pl
View File

@ -46,8 +46,8 @@ if (!-r $first_install_file || $miniserv{'login_script'} eq $record_login_cmd) {
}
# Disable trusting SSL certs unless already enabled
if ($miniserv{'trust_real_ip'} == 1 && &get_webmin_version() <= 2.300) {
$miniserv{'trust_real_ip'} = 2;
if (!$miniserv{'trust_real_ip'} && !defined($miniserv{'no_trust_ssl'})) {
$miniserv{'no_trust_ssl'} = 1;
}
&put_miniserv_config(\%miniserv);