Changeset 57501

Timestamp:

01/31/2024 12:51:39 PM (3 years ago)

Author:

swissspidy

Message:

HTTP API: Ensure cookie names are cast to strings.

Props nosilver4u, darssen, kraftbj, engahmeds3ed, barry.hughes, schlessera.
Fixes #58566.

Location:

trunk

Files:

• src/wp-includes/class-wp-http.php (modified) (1 diff)
• tests/phpunit/tests/http/http.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-http.php

@@ -468 +468 @@
                                         }
                                 );
-                                $cookie_jar[ $value->name ] = new WpOrg\Requests\Cookie( $value->name, $value->value, $attributes, array( 'host-only' => $value->host_only ) );
+                                $cookie_jar[ $value->name ] = new WpOrg\Requests\Cookie( (string) $value->name, $value->value, $attributes, array( 'host-only' => $value->host_only ) );
                         } elseif ( is_scalar( $value ) ) {
-                                $cookie_jar[ $name ] = new WpOrg\Requests\Cookie( $name, (string) $value );
+                                $cookie_jar[ $name ] = new WpOrg\Requests\Cookie( (string) $name, (string) $value );
                         }
                 }

trunk/tests/phpunit/tests/http/http.php

@@ -662 +662 @@
                 $this->assertTrue( $pre_http_request_filter_has_run, 'The pre_http_request filter is expected to run.' );
         }
+
+        /**
+         * Test that WP_Http::normalize_cookies method correctly casts integer keys to string.
+         * @ticket 58566
+         *
+         * @covers WP_Http::normalize_cookies
+         */
+        public function test_normalize_cookies_casts_integer_keys_to_string() {
+                $http = _wp_http_get_object();
+
+                $cookies = array(
+                        '1'   => 'foo',
+                        2     => 'bar',
+                        'qux' => 7,
+                );
+
+                $cookie_jar = $http->normalize_cookies( $cookies );
+
+                $this->assertInstanceOf( 'WpOrg\Requests\Cookie\Jar', $cookie_jar );
+
+                foreach ( array_keys( $cookies ) as $cookie ) {
+                        if ( is_string( $cookie ) ) {
+                                $this->assertInstanceOf( 'WpOrg\Requests\Cookie', $cookie_jar[ $cookie ] );
+                        } else {
+                                $this->assertInstanceOf( 'WpOrg\Requests\Cookie', $cookie_jar[ (string) $cookie ] );
+                        }
+                }
+        }
+
+        /**
+         * Test that WP_Http::normalize_cookies method correctly casts integer cookie names to strings.
+         * @ticket 58566
+         *
+         * @covers WP_Http::normalize_cookies
+         */
+        public function test_normalize_cookies_casts_cookie_name_integer_to_string() {
+                $http = _wp_http_get_object();
+
+                $cookies = array(
+                        'foo' => new WP_Http_Cookie(
+                                array(
+                                        'name'  => 1,
+                                        'value' => 'foo',
+                                )
+                        ),
+                );
+
+                $cookie_jar = $http->normalize_cookies( $cookies );
+
+                $this->assertInstanceOf( 'WpOrg\Requests\Cookie\Jar', $cookie_jar );
+                $this->assertInstanceOf( 'WpOrg\Requests\Cookie', $cookie_jar['1'] );
+        }
 }