Changeset 43082 for branches/4.9/tests/phpunit/tests/admin/includesCommunityEvents.php

Timestamp:

05/02/2018 12:48:23 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: add helper function for anonymizing data in a standardized way.

Props jesperher, allendav, iandunn, birgire, azaozz, joemcgill.
Merges [42971] and [43081] to the 4.9 branch.
Fixes #43545.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/admin/includesCommunityEvents.php (modified) (1 diff)

branches/4.9/tests/phpunit/tests/admin/includesCommunityEvents.php

@@ -260 +260 @@
      * Test that get_unsafe_client_ip() properly anonymizes all possible address formats
      *
-     * @dataProvider data_get_unsafe_client_ip_anonymization
+     * @dataProvider data_get_unsafe_client_ip
      *
      * @ticket 41083
      */
-    public function test_get_unsafe_client_ip_anonymization( $raw_ip, $expected_result ) {
-        $_SERVER['REMOTE_ADDR'] = $raw_ip;
-        $actual_result          = WP_Community_Events::get_unsafe_client_ip();
+    public function test_get_unsafe_client_ip( $raw_ip, $expected_result ) {
+        $_SERVER['REMOTE_ADDR']    = 'this should not be used';
+        $_SERVER['HTTP_CLIENT_IP'] = $raw_ip;
+        $actual_result             = WP_Community_Events::get_unsafe_client_ip();
 
         $this->assertEquals( $expected_result, $actual_result );
     }
 
-    public function data_get_unsafe_client_ip_anonymization() {
-        return array(
-            // Invalid IP.
+    /**
+     * Provide test cases for `test_get_unsafe_client_ip()`.
+     *
+     * @return array
+     */
+    public function data_get_unsafe_client_ip() {
+        return array(
+            // Handle '::' returned from `wp_privacy_anonymize_ip()`.
             array(
-                '',    // Raw IP address
-                false, // Expected result
-            ),
-            // Invalid IP. Sometimes proxies add things like this, or other arbitrary strings.
+                'or=\"[1000:0000:0000:0000:0000:0000:0000:0001',
+                false,
+            ),
+
+            // Handle '0.0.0.0' returned from `wp_privacy_anonymize_ip()`.
             array(
                 'unknown',
                 false,
             ),
-            // IPv4, no port
+
+            // Valid IPv4.
             array(
-                '10.20.30.45',
-                '10.20.30.0',
-            ),
-            // IPv4, port
-            array(
-                '10.20.30.45:20000',
-                '10.20.30.0',
-            ),
-            // IPv6, no port
+                '198.143.164.252',
+                '198.143.164.0',
+            ),
+
+            // Valid IPv6.
             array(
                 '2a03:2880:2110:df07:face:b00c::1',
                 '2a03:2880:2110:df07::',
             ),
-            // IPv6, port
-            array(
-                '[2a03:2880:2110:df07:face:b00c::1]:20000',
-                '2a03:2880:2110:df07::',
-            ),
-            // IPv6, no port, reducible representation
-            array(
-                '0000:0000:0000:0000:0000:0000:0000:0001',
-                '::',
-            ),
-            // IPv6, no port, partially reducible representation
-            array(
-                '1000:0000:0000:0000:0000:0000:0000:0001',
-                '1000::',
-            ),
-            // IPv6, port, reducible representation
-            array(
-                '[0000:0000:0000:0000:0000:0000:0000:0001]:1234',
-                '::',
-            ),
-            // IPv6, port, partially reducible representation
-            array(
-                '[1000:0000:0000:0000:0000:0000:0000:0001]:5678',
-                '1000::',
-            ),
-            // IPv6, no port, reduced representation
-            array(
-                '::',
-                '::',
-            ),
-            // IPv6, no port, reduced representation
-            array(
-                '::1',
-                '::',
-            ),
-            // IPv6, port, reduced representation
-            array(
-                '[::]:20000',
-                '::',
-            ),
-            // IPv6, address brackets without port delimiter and number, reduced representation
-            array(
-                '[::1]',
-                '::',
-            ),
-            // IPv6, no port, compatibility mode
-            array(
-                '::ffff:10.15.20.25',
-                '::ffff:10.15.20.0',
-            ),
-            // IPv6, port, compatibility mode
-            array(
-                '[::ffff:10.15.20.25]:30000',
-                '::ffff:10.15.20.0',
-            ),
-            // IPv6, no port, compatibility mode shorthand
-            array(
-                '::127.0.0.1',
-                '::ffff:127.0.0.0',
-            ),
-            // IPv6, port, compatibility mode shorthand
-            array(
-                '[::127.0.0.1]:30000',
-                '::ffff:127.0.0.0',
-            ),
         );
     }