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

Fix to simplify clearing known IPs

Browse Source
This commit is contained in:
Ilia Ross
2025-02-28 11:23:05 +02:00
parent 72d16272c7
commit f6e1eca6fc
5 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usermin/change_access.cgi
View File

@ -16,7 +16,7 @@ delete($miniserv{"deny"});
if ($in{"access"} == 1) { $miniserv{"allow"} = join(' ', @hosts); }
elsif ($in{"access"} == 2) { $miniserv{"deny"} = join(' ', @hosts); }
$miniserv{"known_ips"} = $miniserv{"allow"} || $miniserv{"deny"} ||
(!$in{'noknown'} ? $miniserv{"known_ips"} : "");
(!@hosts && $in{"access"} == 0 ? "" : $miniserv{"known_ips"});
$miniserv{'libwrap'} = $in{'libwrap'};
$miniserv{'alwaysresolve'} = $in{'alwaysresolve'};
&put_usermin_miniserv_config(\%miniserv);

4
usermin/edit_access.cgi
View File

@ -22,9 +22,7 @@ print &ui_table_row($text{'access_ip'},
$access == 1 ? join("\n", split(/\s+/, $miniserv{"allow"})) :
$access == 2 ? join("\n", split(/\s+/, $miniserv{"deny"})) :
$miniserv{"known_ips"} ? join("\n", split(/\s+/, $miniserv{"known_ips"})) :
"", 6, 30).
($miniserv{"known_ips"} ?
"<br>\n".&ui_checkbox("noknown", 1, $text{'access_known'}, 0) : ""));
"", 6, 30));
print &ui_table_row($text{'access_always'},
&ui_yesno_radio("alwaysresolve", int($miniserv{'alwaysresolve'})));

4
webmin/change_access.cgi
View File

@ -7,8 +7,8 @@ require './webmin-lib.pl';
&error_setup($text{'access_err'});
$raddr = $ENV{'REMOTE_ADDR'};
@hosts = split(/\s+/, $in{"ip"});
if ($in{"access"}) {
@hosts = split(/\s+/, $in{"ip"});
push(@hosts, "LOCAL") if ($in{'local'});
if (!@hosts) { &error($text{'access_enone'}); }
foreach $h (@hosts) {
@ -37,7 +37,7 @@ delete($miniserv{"deny"});
if ($in{"access"} == 1) { $miniserv{"allow"} = join(' ', @hosts); }
elsif ($in{"access"} == 2) { $miniserv{"deny"} = join(' ', @hosts); }
$miniserv{"known_ips"} = $miniserv{"allow"} || $miniserv{"deny"} ||
(!$in{'noknown'} ? $miniserv{"known_ips"} : "");
(!@hosts && $in{"access"} == 0 ? "" : $miniserv{"known_ips"});
$miniserv{'libwrap'} = $in{'libwrap'};
$miniserv{'alwaysresolve'} = $in{'alwaysresolve'};
if ($in{'trust'} == 2) {

4
webmin/edit_access.cgi
View File

@ -25,9 +25,7 @@ print &ui_table_row($text{'access_ip'},
[ 1, $text{'access_allow'} ],
[ 2, $text{'access_deny'} ] ])."<br>\n".
&ui_textarea("ip", join("\n", @list), 6, 30)."<br>\n".
&ui_checkbox("local", 1, $text{'access_local'}, $idx >= 0).
($miniserv{"known_ips"} ?
&ui_checkbox("noknown", 1, $text{'access_known'}, 0) : ""));
&ui_checkbox("local", 1, $text{'access_local'}, $idx >= 0));
print &ui_table_row($text{'access_always'},
&ui_yesno_radio("alwaysresolve", int($miniserv{'alwaysresolve'})));

1
webmin/lang/en
View File

@ -14,7 +14,6 @@ access_title=IP Access Control
access_desc=Webmin can be configured to deny or allow access only from certain IP addresses using this form. Hostnames (like foo.bar.com) and IP networks (like 10.254.3.0 or 10.254.1.0/255.255.255.128 or 10.254.1.0/25 or 10.254.1.5-10.254.97.127 or 2001:DB8::A0BC:0001 or 2001:DB8::/32) can also be entered. You should limit access to Webmin to trusted addresses, especially if it is accessible from the Internet. Otherwise, anyone who guesses your password will have complete control of your system.
access_ip=Allowed IP addresses
access_local=Include local network in list
access_known=Clear list of known IPs
access_header=Access control options
access_all=Allow from all addresses
access_allow=Only allow from listed addresses