VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-20 16:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow HTTP codes to be selected https://github.com/webmin/webmin/issues/1564

Browse Source
This commit is contained in:
Jamie Cameron
2021-12-14 10:58:24 -08:00
parent 01fcf9648f
commit 3542519fe2
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
status/http-monitor.pl
View File

@ -1,6 +1,11 @@
# http-monitor.pl
# Monitor a remote HTTP server
sub default_http_codes
{
return (200, 301, 302, 303, 307, 308);
}
sub get_http_status
{
local ($o) = @_;
@ -31,7 +36,15 @@ eval {
}
&write_http_connection($con, "\r\n");
local $line = &read_http_connection($con);
$up = $line =~ /^HTTP\/1\..\s+(200|301|302|303|307|308)\s+/ ? 1 : 0;
local @codes = $o->{'codes'} ? split(/\s+/, $o->{'codes'})
: &default_http_codes();
local $cre = join("|", @codes);
if ($line =~ /^HTTP\/1\..\s+($cre)\s+/) {
$up = 1;
}
else {
$desc = "Bad HTTP status line : $line";
}
if ($re && $up) {
# Read the headers
local %header;
@ -57,9 +70,6 @@ eval {
};
};
}
elsif (!$up) {
$desc = $line;
}
&close_http_connection($con);
alarm(0);
@ -116,6 +126,10 @@ print &ui_table_row($text{'http_login'},
print &ui_table_row($text{'http_regexp'},
&ui_opt_textbox("regexp", $o->{'regexp'}, 50, $text{'http_none2'}),
3);
print &ui_table_row($text{'http_codes'},
&ui_opt_textbox("codes", $o->{'codes'}, 50,
&text('http_codes_def', join(' ', &default_http_codes()))), 3);
}
sub parse_http_dialog
@ -160,5 +174,17 @@ else {
$o->{'regexp'} = $in{'regexp'};
$in{'method'} eq 'HEAD' && &error($text{'http_ehead'});
}
if ($in{'codes_def'}) {
delete($o->{'codes'});
}
else {
my @codes = split(/\s+/, $in{'codes'});
@codes || &error($text{'http_ecodes'});
foreach my $c (@codes) {
$c =~ /^[0-9]{3}$/ || &error($text{'http_ecodes3'});
}
$o->{'codes'} = join(" ", @codes);
}
}

4
status/lang/en
View File

@ -216,6 +216,10 @@ http_regexp=Page must match regexp
http_eregexp=No regular expression for page to match entered
http_none2=Don't match
http_ehead=The HEAD request method cannot be used when checking for a regular expression
http_codes=Acceptable HTTP status codes
http_codes_def=Default ($1)
http_ecodes=No HTTP codes to accept entered
http_ecodes3=HTTP code must be a three-digit number
ping_host=Host to ping
ping_wait=Time to wait for response