Fix Ip tests

We no longer use the old regexp based config, so the tests failed.

Author: splitbrain

_test/tests/inc/Ip.test.php

@@ -147,9 +147,6 @@ public function test_ip_matches(string $ip, string $ipOrRange, bool $expected):
      */
     public function proxy_is_trusted_provider(): array
     {
-        // The default value that shipped with the config.
-        $legacyDefault = '^(::1|[fF][eE]80:|127\.|10\.|192\.168\.|172\.((1[6-9])|(2[0-9])|(3[0-1]))\.)';
-
         // The new default configuration value.
         $default = ['::1', 'fe80::/10', '127.0.0.0/8', '10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16'];
 
@@ -160,20 +157,6 @@ public function proxy_is_trusted_provider(): array
             // Empty configuration.
             ['', '127.0.0.1', false],
 
-            // Legacy configuration with a regular expression.
-            [$legacyDefault, '127.0.0.1', true],
-            [$legacyDefault, '127.1.2.3', true],
-            [$legacyDefault, '10.1.2.3', true],
-            [$legacyDefault, '11.1.2.3', false],
-            [$legacyDefault, '172.16.0.1', true],
-            [$legacyDefault, '172.160.0.1', false],
-            [$legacyDefault, '172.31.255.255', true],
-            [$legacyDefault, '172.32.0.0', false],
-            [$legacyDefault, '172.200.0.0', false],
-            [$legacyDefault, '192.168.2.3', true],
-            [$legacyDefault, '192.169.1.2', false],
-            [$legacyDefault, '::1', true],
-
             // Configuration with an array of  IPs/CIDRs.
             [$default, '127.0.0.1', true],
             [$default, '127.1.2.3', true],
@@ -230,9 +213,6 @@ public function test_proxy_is_trusted($config, string $ip, bool $expected): void
      */
     public function forwarded_for_provider(): array
     {
-        // The default value that shipped with the config.
-        $legacyDefault = '^(::1|[fF][eE]80:|127\.|10\.|192\.168\.|172\.((1[6-9])|(2[0-9])|(3[0-1]))\.)';
-
         // The new default configuration value.
         $default = ['::1', 'fe80::/10', '127.0.0.0/8', '10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16'];
 
@@ -241,27 +221,9 @@ public function forwarded_for_provider(): array
 
         $tests = [
             // Empty config value should always return empty array.
-            ['', '', '127.0.0.1', []],
-            ['', '127.0.0.1', '127.0.0.1', []],
             [[], '', '127.0.0.1', []],
             [[], '127.0.0.1', '127.0.0.1', []],
 
-            // The old default configuration.
-            [$legacyDefault, '', '127.0.0.1', []],
-            [$legacyDefault, '1.2.3.4', '127.0.0.1', ['1.2.3.4', '127.0.0.1']],
-            [$legacyDefault, '1.2.3.4', '192.168.1.1', ['1.2.3.4', '192.168.1.1']],
-            [$legacyDefault, '1.2.3.4,172.16.0.1', '192.168.1.1', ['1.2.3.4', '172.16.0.1', '192.168.1.1']],
-            [$legacyDefault, '1.2.3.4,172.16.0.1', '::1', ['1.2.3.4', '172.16.0.1', '::1']],
-
-            // Directly from an untrusted proxy.
-            [$legacyDefault, '', '127.0.0.1', []],
-            [$legacyDefault, '1.2.3.4', '11.22.33.44', []],
-            [$legacyDefault, '::1', '11.22.33.44', []],
-
-            // From a trusted proxy, but via an untrusted proxy.
-            [$legacyDefault, '1.2.3.4,11.22.33.44,172.16.0.1', '192.168.1.1', []],
-            [$legacyDefault, '1.2.3.4,::2,172.16.0.1', '::1', []],
-
             // The new default configuration.
             [$default, '', '127.0.0.1', []],
             [$default, '1.2.3.4', '127.0.0.1', ['1.2.3.4', '127.0.0.1']],

_test/tests/inc/common_clientip.test.php

@@ -6,7 +6,6 @@ class common_clientIP_test extends DokuWikiTest {
      * @var mixed[] $configs Possible values for $conf['trustedproxies'].
      */
     private $configs = [
-        '^(::1|[fF][eE]80:|127\.|10\.|192\.168\.|172\.((1[6-9])|(2[0-9])|(3[0-1]))\.)',
         ['::1', 'fe80::/10', '127.0.0.0/8', '10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16'],
     ];
 

inc/Ip.php

@@ -151,14 +151,13 @@ public static function proxyIsTrusted(string $ip): bool
             return false;
         }
 
-        foreach ((array) $conf['trustedproxies'] as $trusted) {
+        foreach ((array)$conf['trustedproxies'] as $trusted) {
             if (Ip::ipMatches($ip, $trusted)) {
-                return true;
+                return true; // The given IP matches one of the trusted proxies.
             }
         }
 
-        Logger::error('Invalid value for $conf[trustedproxies]');
-        return false;
+        return false; // none of the proxies matched
     }
 
     /**
@@ -184,7 +183,7 @@ public static function forwardedFor(): array
 
         $forwardedFor = $INPUT->server->str('HTTP_X_FORWARDED_FOR');
 
-        if (empty($conf['trustedproxy']) || !$forwardedFor) {
+        if (empty($conf['trustedproxies']) || !$forwardedFor) {
             return [];
         }