use renamed trustedproxies setting in tests

Author: splitbrain

_test/tests/inc/Ip.test.php

@@ -209,14 +209,14 @@ public function proxy_is_trusted_provider(): array
      *
      * @dataProvider proxy_is_trusted_provider
      *
-     * @param string|string[] $config   The value for $conf[trustedproxy].
+     * @param string|string[] $config   The value for $conf[trustedproxies].
      * @param string          $ip       The proxy IP to test.
      * @param bool            $expected The expected result from proxyIsTrusted().
      */
     public function test_proxy_is_trusted($config, string $ip, bool $expected): void
     {
         global $conf;
-        $conf['trustedproxy'] = $config;
+        $conf['trustedproxies'] = $config;
 
         $result = Ip::proxyIsTrusted($ip);
 
@@ -312,7 +312,7 @@ public function forwarded_for_provider(): array
      *
      * @dataProvider forwarded_for_provider
      *
-     * @param string|string[] $config     The trustedproxy config value.
+     * @param string|string[] $config     The trustedproxies config value.
      * @param string          $header     The X-Forwarded-For header value.
      * @param string          $remoteAddr The TCP/IP peer address.
      * @param array           $expected   The expected result from forwardedFor().
@@ -324,7 +324,7 @@ public function test_forwarded_for($config, string $header, string $remoteAddr,
         /* @var Input $INPUT */
         global $INPUT, $conf;
 
-        $conf['trustedproxy'] = $config;
+        $conf['trustedproxies'] = $config;
         $INPUT->server->set('HTTP_X_FORWARDED_FOR', $header);
         $INPUT->server->set('REMOTE_ADDR', $remoteAddr);
 

_test/tests/inc/common_clientip.test.php

@@ -3,7 +3,7 @@
 class common_clientIP_test extends DokuWikiTest {
 
     /**
-     * @var mixed[] $configs Possible values for $conf['trustedproxy'].
+     * @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]))\.)',
@@ -110,7 +110,7 @@ public function test_client_ip_v4(string $remoteAddr, bool $useRealIp, string $r
         $conf['realip'] = $useRealIp;
 
         foreach ($this->configs as $config) {
-            $conf['trustedproxy'] = $config;
+            $conf['trustedproxies'] = $config;
             $this->assertEquals(str_replace(array_keys($addresses), array_values($addresses), $expected), clientIP($single));
         }
     }
@@ -146,7 +146,7 @@ public function test_client_ip_v6(string $remoteAddr, bool $useRealIp, string $r
         $conf['realip'] = $useRealIp;
 
         foreach ($this->configs as $config) {
-            $conf['trustedproxy'] = $config;
+            $conf['trustedproxies'] = $config;
             $this->assertEquals(str_replace(array_keys($addresses), array_values($addresses), $expected), clientIP($single));
         }
     }

inc/common.php

@@ -784,14 +784,14 @@ function checkwordblock($text = '')
  * The IP is sourced from, in order of preference:
  *
  *   - The X-Real-IP header if $conf[realip] is true.
- *   - The X-Forwarded-For header if all the proxies are trusted by $conf[trustedproxy].
+ *   - The X-Forwarded-For header if all the proxies are trusted by $conf[trustedproxies].
  *   - The TCP/IP connection remote address.
  *   - 0.0.0.0 if all else fails.
  *
  * The 'realip' config value should only be set to true if the X-Real-IP header
  * is being added by the web server, otherwise it may be spoofed by the client.
  *
- * The 'trustedproxy' setting must not allow any IP, otherwise the X-Forwarded-For
+ * The 'trustedproxies' setting must not allow any IP, otherwise the X-Forwarded-For
  * may be spoofed by the client.
  *
  * @param bool $single If set only a single IP is returned.