Changeset 42968 for trunk/tests/phpunit/tests/admin/includesCommunityEvents.php

Timestamp:

04/10/2018 11:18:04 PM (7 years ago)

Author:

iandunn

Message:

Dashboard: Strip more extraneous IP parts to prevent PHP warnings.

This iterates on earlier versions of the code, in order to handle more edge cases. An arbitrary string like or=\" will now be stripped, as well as reachability scopes like %eth0.

Props eamax, soulseekah, iandunn.
Fixes #41083.

File:

• trunk/tests/phpunit/tests/admin/includesCommunityEvents.php (modified) (3 diffs)

trunk/tests/phpunit/tests/admin/includesCommunityEvents.php

@@ -503 +503 @@
                 false,
             ),
+            // Invalid IP. Sometimes proxies add things like this, or other arbitrary strings.
+            array(
+                'or=\"[1000:0000:0000:0000:0000:0000:0000:0001',
+                false,
+            ),
+            // Invalid IP. Sometimes proxies add things like this, or other arbitrary strings.
+            array(
+                'or=\"1000:0000:0000:0000:0000:0000:0000:0001',
+                false,
+            ),
+            // Invalid IP. Sometimes proxies add things like this, or other arbitrary strings.
+            array(
+                '1000:0000:0000:0000:0000:0000:0000:0001or=\"',
+                false,
+            ),
+            // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+            array(
+                'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]:400',
+                '1000::',
+            ),
+            // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+            array(
+                'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]',
+                '1000::',
+            ),
+            // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+            array(
+                'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]400',
+                '1000::',
+            ),
+            // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+            array(
+                '[1000:0000:0000:0000:0000:0000:0000:0001]:235\"or=',
+                '1000::',
+            ),
             // IPv4, no port
             array(
@@ -570 +605 @@
             // IPv6, port, compatibility mode
             array(
-                '[::ffff:10.15.20.25]:30000',
+                '[::FFFF:10.15.20.25]:30000',
                 '::ffff:10.15.20.0',
             ),
@@ -583 +618 @@
                 '::ffff:127.0.0.0',
             ),
+            // IPv6 with reachability scope
+            array(
+                'fe80::b059:65f4:e877:c40%16',
+                'fe80::',
+            ),
+            // IPv6 with reachability scope
+            array(
+                'FE80::B059:65F4:E877:C40%eth0',
+                'fe80::',
+            ),
         );
     }