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

Add option for max connections per class-C network

Browse Source
This commit is contained in:
Jamie Cameron
2020-12-29 15:59:43 -08:00
parent dfeef5ae12
commit f881943377
5 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
miniserv.pl
View File

@@ -788,6 +788,9 @@ while(1) {
foreach my $ip (keys %ipconnmap) {
$ipconnmap{$ip} = [ grep { $childpids{$_} } @{$ipconnmap{$ip}}];
}
foreach my $net (keys %netconnmap) {
$netconnmap{$net} = [ grep { $childpids{$_} } @{$netconnmap{$net}}];
}
# run the unblocking procedure to check if enough time has passed to
# unblock hosts that never been blocked because of password failures
@@ -887,12 +890,23 @@ while(1) {
&get_address_ip($acptaddr, $ipv6fhs{$s});
print DEBUG "peera=$peera peerp=$peerp\n";
# check the number of connections from this IP
# Check the number of connections from this IP
$ipconnmap{$peera} ||= [ ];
$ipconns = $ipconnmap{$peera};
if ($config{'maxconns_per_ip'} >= 0 &&
@$ipconns > $config{'maxconns_per_ip'}) {
print STDERR "Too many connections (",scalar(@$ipconns),") from $peera\n";
print STDERR "Too many connections (",scalar(@$ipconns),") from IP $peera\n";
close(SOCK);
next;
}
# Also check the number of connections from the network
($peernet = $peera) =~ s/\.\d+$/\.0/;
$netconnmap{$peernet} ||= [ ];
$netconns = $netconnmap{$peernet};
if ($config{'maxconns_per_net'} >= 0 &&
@$netconns > $config{'maxconns_per_net'}) {
print STDERR "Too many connections (",scalar(@$netconns),") from network $peernet\n";
close(SOCK);
next;
}
@@ -996,6 +1010,7 @@ while(1) {
}
push(@childpids, $handpid);
push(@$ipconns, $handpid);
push(@$netconns, $handpid);
if ($need_pipes) {
close($PASSINw); close($PASSOUTr);
push(@passin, $PASSINr);
@@ -4681,6 +4696,7 @@ my %vital = ("port", 80,
"password_change", "/password_change.cgi",
"maxconns", 50,
"maxconns_per_ip", 25,
"maxconns_per_net", 35,
"pam", "webmin",
"sidname", "sid",
"unauth", "^/unauthenticated/ ^/robots.txt\$ ^[A-Za-z0-9\\-/_]+\\.jar\$ ^[A-Za-z0-9\\-/_]+\\.class\$ ^[A-Za-z0-9\\-/_]+\\.gif\$ ^[A-Za-z0-9\\-/_]+\\.png\$ ^[A-Za-z0-9\\-/_]+\\.conf\$ ^[A-Za-z0-9\\-/_]+\\.ico\$ ^/robots.txt\$",

2
webmin/CHANGELOG
View File

@@ -145,3 +145,5 @@ Wildcard SSL certs can now be requested via Let's Encrypt in DNS mode, if the na
Announcements to all Webmin users can now be displayed on the System Information page.
---- Changes since 1.940 ----
The host, port and SSL mode for redirects can now be customized via miniserv.conf options.
---- Changes since 1.960 ----
Added options on the Ports and Addresses page to control the number of concurrent connections per IP, network and in total.

8
webmin/change_bind.cgi
View File

@@ -114,6 +114,14 @@ else {
&error($text{'bind_emaxconns_per_ip'});
$miniserv{'maxconns_per_ip'} = $in{'maxconns_per_ip'};
}
if ($in{'maxconns_per_net_def'}) {
delete($miniserv{'maxconns_per_net'});
}
else {
$in{'maxconns_per_net'} =~ /^\d+$/ && $in{'maxconns_per_net'} > 1 ||
&error($text{'bind_emaxconns_per_net'});
$miniserv{'maxconns_per_net'} = $in{'maxconns_per_net'};
}
&put_miniserv_config(\%miniserv);
&unlock_file($ENV{'MINISERV_CONFIG'});

3
webmin/edit_bind.cgi
View File

@@ -72,6 +72,9 @@ print &ui_table_row($text{'bind_maxconns'},
print &ui_table_row($text{'bind_maxconns_per_ip'},
&ui_opt_textbox("maxconns_per_ip", $miniserv{'maxconns_per_ip'}, 5,
$text{'default'}." (25)"));
print &ui_table_row($text{'bind_maxconns_per_net'},
&ui_opt_textbox("maxconns_per_net", $miniserv{'maxconns_per_net'}, 5,
$text{'default'}." (35)"));
print &ui_table_end();
print &ui_form_end([ [ "save", $text{'save'} ] ]);

2
webmin/lang/en
View File

@@ -65,8 +65,10 @@ bind_elsof=New port $1 is already in use by another process
bind_eonsystem=The IP address $1 is not active on this system, and so cannot be used
bind_maxconns=Maximum total concurrent connections
bind_maxconns_per_ip=Maximum concurrent connections per IP
bind_maxconns_per_net=Maximum concurrent connections per network
bind_emaxconns=Maximum concurrent connections must be a number greater than 1
bind_emaxconns_per_ip=Maximum concurrent connections per IP must be a number greater than 1
bind_emaxconns_per_net=Maximum concurrent connections per network must be a number greater than 1
log_title=Logging
log_desc=Webmin can be configured to write a log of web server hits, in the standard CLF log file format. If logging is enabled, you can also choose whether IP addresses or hostnames are recorded, and how often the log file is cleared. When enabled, logs are written to the file $1.