From 0cb20e833585f42e8d6a346cf4800e3cedcd12c2 Mon Sep 17 00:00:00 2001 From: Ahmet Oeztuerk Date: Tue, 17 Feb 2026 16:05:30 +0100 Subject: [PATCH] removed duplicate tests, corrected wrong comments --- plugins/tests/check_curl.t | 46 +++++--------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t index c935c251..94058d5b 100755 --- a/plugins/tests/check_curl.t +++ b/plugins/tests/check_curl.t @@ -27,7 +27,7 @@ use HTTP::Daemon::SSL; $ENV{'LC_TIME'} = "C"; -my $common_tests = 115; +my $common_tests = 111; my $ssl_only_tests = 12; # Check that all dependent modules are available eval "use HTTP::Daemon 6.01;"; @@ -415,14 +415,12 @@ SKIP: { { # Make a scope and change environment variables here, to not mess them up for other tests using environment variables - # Test: Only environment variable 'http_proxy', should be picked up local $ENV{"http_proxy"} = 'http://proxy.example.com:8080'; $cmd = "$command -u /statuscode/200 -v"; $result = NPTest->testCmd( $cmd ); like( $result->output, '/.*CURLOPT_PROXY: http://proxy.example.com:8080 */', "Correctly took 'http_proxy' environment variable: ".$result->output ); delete($ENV{"http_proxy"}); - # Test: Two environment variables, 'http_proxy' and 'HTTP_PROXY', lowercase should be used local $ENV{"http_proxy"} = 'http://taken.proxy.example:8080'; local $ENV{"HTTP_PROXY"} = 'http://discarded.proxy.example:8080'; $cmd = "$command -u /statuscode/200 -v"; @@ -431,21 +429,19 @@ SKIP: { delete(local $ENV{"http_proxy"}); delete(local $ENV{"HTTP_PROXY"}); - # Test: Two environment variables, 'http_proxy' and 'HTTP_PROXY', alongside -x argument which should override both local $ENV{"http_proxy"} = 'http://discarded1.proxy.example:8080'; local $ENV{"HTTP_PROXY"} = 'http://discarded2.proxy.example:8080'; $cmd = "$command -u /statuscode/200 -x 'http://taken.proxy.example:8080' -v"; $result = NPTest->testCmd( $cmd ); - like( $result->output, '/.*CURLOPT_PROXY: http://taken.proxy.example:8080 */', "-X proxy argument was taken over 'http_proxy' and 'HTTP_PROXY' environment variables: ".$result->output ); + like( $result->output, '/.*CURLOPT_PROXY: http://taken.proxy.example:8080 */', "Argument -x overwrote 'http_proxy' and 'HTTP_PROXY' environment variables: ".$result->output ); delete(local $ENV{"http_proxy"}); delete(local $ENV{"HTTP_PROXY"}); - # Test: Two environment variables, 'http_proxy' and 'HTTP_PROXY', alongside --proxy argument which should override both local $ENV{"http_proxy"} = 'http://discarded1.proxy.example:8080'; local $ENV{"HTTP_PROXY"} = 'http://discarded2.proxy.example:8080'; $cmd = "$command -u /statuscode/200 --proxy 'http://taken.example.com:8080' -v"; $result = NPTest->testCmd( $cmd ); - like( $result->output, '/.*CURLOPT_PROXY: http://taken.example.com:8080 */', "--proxy argument was taken over 'http_proxy' and 'HTTP_PROXY' environment variables: ".$result->output ); + like( $result->output, '/.*CURLOPT_PROXY: http://taken.example.com:8080 */', "Argument --proxy overwrote 'http_proxy' and 'HTTP_PROXY' environment variables: ".$result->output ); delete(local $ENV{"http_proxy"}); delete(local $ENV{"HTTP_PROXY"}); } @@ -476,14 +472,12 @@ SKIP: { { # Make a scope and change environment variables here, to not mess them up for other tests using environment variables - # Test: Only environment variable 'https_proxy', should be picked up local $ENV{"https_proxy"} = 'http://proxy.example.com:8080'; $cmd = "$command -u /statuscode/200 --ssl -v"; $result = NPTest->testCmd( $cmd ); like( $result->output, '/.*CURLOPT_PROXY: http://proxy.example.com:8080 */', "Correctly took 'https_proxy' environment variable: ".$result->output ); delete($ENV{"https_proxy"}); - # Test: Two environment variables, 'https_proxy' and 'HTTPS_PROXY', lowercase should be used local $ENV{"https_proxy"} = 'http://taken.proxy.example:8080'; local $ENV{"HTTPS_PROXY"} = 'http://discarded.proxy.example:8080'; $cmd = "$command -u /statuscode/200 --ssl -v"; @@ -492,16 +486,14 @@ SKIP: { delete(local $ENV{"https_proxy"}); delete(local $ENV{"HTTPS_PROXY"}); - # Test: Two environment variables, 'https_proxy' and 'HTTPS_PROXY', alongside -x argument which should override both local $ENV{"https_proxy"} = 'http://discarded1.proxy.example:8080'; local $ENV{"HTTPS_PROXY"} = 'http://discarded2.proxy.example:8080'; $cmd = "$command -u /statuscode/200 --ssl -x 'http://taken.example.com:8080' -v"; $result = NPTest->testCmd( $cmd ); like( $result->output, '/.*CURLOPT_PROXY: http://taken.example.com:8080 */', "Argument -x overwrote environment variables 'https_proxy' and 'HTTPS_PROXY': ".$result->output ); - delete(local $ENV{"http_proxy"}); - delete(local $ENV{"HTTP_PROXY"}); + delete(local $ENV{"https_proxy"}); + delete(local $ENV{"HTTPS_PROXY"}); - # Test: Two environment variables, 'http_proxy' and 'HTTP_PROXY', alongside --proxy argument which should override both local $ENV{"https_proxy"} = 'http://discarded1.proxy.example:8080'; local $ENV{"HTTPS_PROXY"} = 'http://discarded2.proxy.example:8080'; $cmd = "$command -u /statuscode/200 --ssl --proxy 'http://taken.example.com:8080' -v"; @@ -510,9 +502,6 @@ SKIP: { delete(local $ENV{"https_proxy"}); delete(local $ENV{"HTTPS_PROXY"}); } - - - } @@ -795,18 +784,15 @@ sub run_common_tests { is( $@, "", $cmd ); # curlopt proxy/noproxy parsing tests - # Make a scope and change environment variables here, to not mess them up for other tests using environment variables { - # Noproxy tests + # Make a scope and change environment variables here, to not mess them up for other tests using environment variables - # Test: Only environment variable 'no_proxy', should be picked up local $ENV{"no_proxy"} = 'internal.acme.org'; $cmd = "$command -u /statuscode/200 -v"; $result = NPTest->testCmd( $cmd ); like( $result->output, '/.* curl CURLOPT_NOPROXY: internal.acme.org */', "Correctly took 'no_proxy' environment variable: ".$result->output ); delete($ENV{"no_proxy"}); - # Test: Two environment variables, 'no_proxy' and 'NO_PROXY', lowercase should be used local $ENV{"no_proxy"} = 'taken.acme.org'; local $ENV{"NO_PROXY"} = 'discarded.acme.org'; $cmd = "$command -u /statuscode/200 -v"; @@ -816,7 +802,6 @@ sub run_common_tests { delete(local $ENV{"no_proxy"}); delete(local $ENV{"NO_PROXY"}); - # Test: Two environment variables, 'no_proxy' and 'NO_PROXY', alongside --noproxy argument which should override both local $ENV{"no_proxy"} = 'taken.acme.org'; local $ENV{"NO_PROXY"} = 'discarded.acme.org'; $cmd = "$command -u /statuscode/200 --noproxy 'taken.acme.org' -v"; @@ -826,53 +811,34 @@ sub run_common_tests { delete(local $ENV{"no_proxy"}); delete(local $ENV{"NO_PROXY"}); - # Test: Noproxy given as many domains, separated by commas $cmd = "$command -u /statuscode/200 --noproxy 'internal1.acme.org,internal2.acme.org,internal3.acme.org' -v"; $result = NPTest->testCmd( $cmd ); is( $result->return_code, 0, $cmd); like( $result->output, '/.*CURLOPT_NOPROXY: internal1.acme.org,internal2.acme.org,internal3.acme.org*/', "Argument --noproxy read multiple noproxy domains: ".$result->output ); - # Test: Noproxy given as various IPv4 addresses / CIDR domains $cmd = "$command -u /statuscode/200 --noproxy '10.11.12.13,256.256.256.256,0.0.0.0,192.156.0.0/22,10.0.0.0/4' -v"; $result = NPTest->testCmd( $cmd ); is( $result->return_code, 0, $cmd); like( $result->output, '/.*CURLOPT_NOPROXY: 10.11.12.13,256.256.256.256,0.0.0.0,192.156.0.0/22,10.0.0.0/4*/', "Argument --noproxy took multiple noproxy domains: ".$result->output ); - # Test: Noproxy given as various IPv6 addresses / CIDR domains $cmd = "$command -u /statuscode/200 --noproxy '0123:4567:89AB:CDEF:0123:4567:89AB:CDEF,0123::CDEF,0123:4567/96,[::1],::1,[1234::5678:ABCD/4]' -v"; $result = NPTest->testCmd( $cmd ); is( $result->return_code, 0, $cmd); like( $result->output, '/.*CURLOPT_NOPROXY: 0123:4567:89AB:CDEF:0123:4567:89AB:CDEF,0123::CDEF,0123:4567\/96,\[::1\],::1,\[1234::5678:ABCD\/4\].*/', "Argument --noproxy took multiple noproxy domains: ".$result->output ); - # Test: Invalid IP addresses, check for nonzero return code $cmd = "$command -u /statuscode/200 --noproxy '300.400.500.600,1.2.3,XYZD:0123::,1:2:3:4:5:6:7,1::2::3,1.1.1.1/64,::/256' -v"; $result = NPTest->testCmd( $cmd ); is( $result->return_code, 0, $cmd); - # Test: Test if noproxy argument picks up special '*' as noproxy $cmd = "$command -u /statuscode/200 --proxy http://proxy.example.com:8080 --noproxy '*' -v"; $result = NPTest->testCmd( $cmd ); is( $result->return_code, 0, $cmd); like( $result->output, '/.*proxy_resolves_hostname: 0.*/', "Proxy will not be used due to '*' in noproxy: ".$result->output ); - # Test: Test if a direct match with the hostname - $cmd = "$command -u /statuscode/200 --proxy http://proxy.example.com:8080 --noproxy '*' -v"; - $result = NPTest->testCmd( $cmd ); - is( $result->return_code, 0, $cmd); - like( $result->output, '/.*proxy_resolves_hostname: 0.*/', "Proxy will not be used due to '*' in noproxy: ".$result->output ); - - # Test: Test if a direct match with the hostname $cmd = "$command -u /statuscode/200 --proxy http://proxy.example.com:8080 --noproxy '127.0.0.1' -v"; $result = NPTest->testCmd( $cmd ); is( $result->return_code, 0, $cmd); like( $result->output, '/.*proxy_resolves_hostname: 0.*/', "Proxy will not be used due to '127.0.0.1' in noproxy: ".$result->output ); - - # Test: Test if a direct match with the IP - $cmd = "$command -u /statuscode/200 --proxy http://proxy.example.com:8080 --noproxy '127.0.0.1' -v"; - $result = NPTest->testCmd( $cmd ); - is( $result->return_code, 0, $cmd); - like( $result->output, '/.*proxy_resolves_hostname: 0.*/', "Proxy will not be used due to '127.0.0.1' in noproxy: ".$result->output ); - } }