From 51780954e8c2f86d860078f2f5f71236eef74454 Mon Sep 17 00:00:00 2001 From: David Cook Date: Mon, 10 May 2021 23:33:19 +0000 Subject: [PATCH] Bug 28200: Remove unit test using abbreviated format This patch removes the unit test that uses the abbreviated format, since it's not supported in newer versions of Net::Netmask without a workaround. Test plan: 0. Set up Koha dev environment on Debian 11 1. perl t/Koha/Middleware/RealIP.t 2. Tests should pass Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Martin Renvoize Signed-off-by: Alvaro Cornejo Signed-off-by: Jonathan Druart (cherry picked from commit 06fe908a4ed842033f980e58fa62cfb2474a0055) Signed-off-by: Fridolin Somers (cherry picked from commit afa3976dada60da455252223a9e1a1ae34a9a240) Signed-off-by: Victor Grousset/tuxayo --- t/Koha/Middleware/RealIP.t | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/t/Koha/Middleware/RealIP.t b/t/Koha/Middleware/RealIP.t index c60994b189..2ec8e51b89 100644 --- a/t/Koha/Middleware/RealIP.t +++ b/t/Koha/Middleware/RealIP.t @@ -100,19 +100,13 @@ subtest "Success multiple proxies" => sub { }; subtest "Test alternative configuration styles" => sub { - plan tests => 3; + plan tests => 2; $remote_address = "2.2.2.2"; $x_forwarded_for_header = "1.1.1.1"; t::lib::Mocks::mock_config('koha_trusted_proxies', '2.2.2.0/24'); $address = Koha::Middleware::RealIP::get_real_ip( $remote_address, $x_forwarded_for_header ); is($address,'1.1.1.1',"Trust proxy (2.2.2.2) using CIDR notation, so use the X-Forwarded-For header for the remote address"); - $remote_address = "2.2.2.2"; - $x_forwarded_for_header = "1.1.1.1"; - t::lib::Mocks::mock_config('koha_trusted_proxies', '2.2.2'); - $address = Koha::Middleware::RealIP::get_real_ip( $remote_address, $x_forwarded_for_header ); - is($address,'1.1.1.1',"Trust proxy (2.2.2.2) using abbreviated notation, so use the X-Forwarded-For header for the remote address"); - $remote_address = "2.2.2.2"; $x_forwarded_for_header = "1.1.1.1"; t::lib::Mocks::mock_config('koha_trusted_proxies', '2.2.2.0:255.255.255.0'); -- 2.39.5