summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Nierlein <sven@nierlein.de>2021-04-07 08:30:31 (GMT)
committerGitHub <noreply@github.com>2021-04-07 08:30:31 (GMT)
commit2e5b38cc832c3e818b43515636e04b7218e6f995 (patch)
tree158744b31a8d086396ca1780edbe5f2924d89f24
parentb820725ee18608de9c0c157f83ef160659b35207 (diff)
parent5cfc93d995cfd5cc7d1a469f3c1276c4884da2a2 (diff)
downloadmonitoring-plugins-2e5b38cc832c3e818b43515636e04b7218e6f995.tar.gz
Merge pull request #1666 from sni/check_curl_fix_header_parser
fix check_curl crash if http header contains leading spaces
-rw-r--r--plugins/check_curl.c2
-rwxr-xr-xplugins/tests/check_curl.t16
2 files changed, 14 insertions, 4 deletions
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 8f274c2..9f1eafa 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -2060,7 +2060,7 @@ get_header_value (const struct phr_header* headers, const size_t nof_headers, co
2060{ 2060{
2061 int i; 2061 int i;
2062 for( i = 0; i < nof_headers; i++ ) { 2062 for( i = 0; i < nof_headers; i++ ) {
2063 if( strncasecmp( header, headers[i].name, max( headers[i].name_len, 4 ) ) == 0 ) { 2063 if(headers[i].name != NULL && strncasecmp( header, headers[i].name, max( headers[i].name_len, 4 ) ) == 0 ) {
2064 return strndup( headers[i].value, headers[i].value_len ); 2064 return strndup( headers[i].value, headers[i].value_len );
2065 } 2065 }
2066 } 2066 }
diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t
index 1afbe4b..0caad23 100755
--- a/plugins/tests/check_curl.t
+++ b/plugins/tests/check_curl.t
@@ -21,7 +21,7 @@ use FindBin qw($Bin);
21 21
22$ENV{'LC_TIME'} = "C"; 22$ENV{'LC_TIME'} = "C";
23 23
24my $common_tests = 70; 24my $common_tests = 72;
25my $ssl_only_tests = 8; 25my $ssl_only_tests = 8;
26# Check that all dependent modules are available 26# Check that all dependent modules are available
27eval "use HTTP::Daemon 6.01;"; 27eval "use HTTP::Daemon 6.01;";
@@ -188,6 +188,12 @@ sub run_server {
188 $c->send_basic_header; 188 $c->send_basic_header;
189 $c->send_header('foo'); 189 $c->send_header('foo');
190 $c->send_crlf; 190 $c->send_crlf;
191 } elsif ($r->url->path eq "/header_broken_check") {
192 $c->send_basic_header;
193 $c->send_header('foo');
194 print $c "Test1:: broken\n";
195 print $c " Test2: leading whitespace\n";
196 $c->send_crlf;
191 } elsif ($r->url->path eq "/virtual_port") { 197 } elsif ($r->url->path eq "/virtual_port") {
192 # return sent Host header 198 # return sent Host header
193 $c->send_basic_header; 199 $c->send_basic_header;
@@ -247,7 +253,7 @@ my $cmd;
247# advanced checks with virtual hostname and virtual port 253# advanced checks with virtual hostname and virtual port
248SKIP: { 254SKIP: {
249 skip "libcurl version is smaller than $required_version", 6 unless $use_advanced_checks; 255 skip "libcurl version is smaller than $required_version", 6 unless $use_advanced_checks;
250 256
251 # http without virtual port 257 # http without virtual port
252 $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$port_http\$"; 258 $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$port_http\$";
253 $result = NPTest->testCmd( $cmd ); 259 $result = NPTest->testCmd( $cmd );
@@ -259,7 +265,7 @@ SKIP: {
259 $result = NPTest->testCmd( $cmd ); 265 $result = NPTest->testCmd( $cmd );
260 is( $result->return_code, 0, $cmd); 266 is( $result->return_code, 0, $cmd);
261 like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output ); 267 like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
262 268
263 # http with virtual port (80) 269 # http with virtual port (80)
264 $cmd = "./$plugin -H $virtual_host:80 -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host\$"; 270 $cmd = "./$plugin -H $virtual_host:80 -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host\$";
265 $result = NPTest->testCmd( $cmd ); 271 $result = NPTest->testCmd( $cmd );
@@ -321,6 +327,10 @@ sub run_common_tests {
321 is( $result->return_code, 2, "Missing header string check"); 327 is( $result->return_code, 2, "Missing header string check");
322 like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location"); 328 like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
323 329
330 $result = NPTest->testCmd( "$command -u /header_broken_check" );
331 is( $result->return_code, 0, "header_check search for string");
332 like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 138 bytes in [\d\.]+ second/', "Output correct" );
333
324 my $cmd; 334 my $cmd;
325 $cmd = "$command -u /slow"; 335 $cmd = "$command -u /slow";
326 $result = NPTest->testCmd( $cmd ); 336 $result = NPTest->testCmd( $cmd );