Bug 24538: Handle Net::Netmask parser errors

This patch switches from the new() to new2() constructor,
which will return an undef value when it fails to parse a value.

This patch warns on parser failures, but otherwise silently drops
the invalid value, and returns objects for any valid input it can parse.
This way one mistake won't disable the whole feature.

To test:
1. Run the unit test t/Koha/Middlware/RealIP.t

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha/Middleware/RealIP.pm b/Koha/Middleware/RealIP.pm
index 22f40db..88a843d 100644 (file)
--- a/Koha/Middleware/RealIP.pm
+++ b/Koha/Middleware/RealIP.pm
@@ -106,7 +106,16 @@ sub get_trusted_proxies {
     my $proxies_conf = C4::Context->config('koha_trusted_proxies');
     return unless $proxies_conf;
     my @trusted_proxies_ip = split( / /, $proxies_conf );
-    my @trusted_proxies = map { Net::Netmask->new($_) } @trusted_proxies_ip;
+    my @trusted_proxies = ();
+    foreach my $ip (@trusted_proxies_ip){
+        my $mask = Net::Netmask->new2($ip);
+        if ($mask){
+            push(@trusted_proxies,$mask);
+        }
+        else {
+            warn "$Net::Netmask::error";
+        }
+    }
     return \@trusted_proxies;
 }