Changeset 58097 for trunk/tests/phpunit/tests/kses.php

Timestamp:

05/04/2024 07:23:31 PM (4 months ago)

Author:

johnbillion

Message:

Bootstrap/Load: Add support for custom ports in multisite site addresses.

This allows a Multisite network to use an address that includes a port name, such as example.com:1234, and adds support for this to the local development environment too. You can now run a Multisite installation on the local development environment, for example at localhost:8889.

This also fixes some bugs with running a single site installation on a port, and updates the testing infrastructure so that the whole test suite runs both with and without a port number.

Props djzone, scribu, nacin, ipstenu, F J Kaiser, jeremyfelt, johnjamesjacoby, spacedmonkey, PerS, Clorith, Blackbam, enrico.sorcinelli, Jules Colle, obliviousharmony, desrosj, johnbillion

Fixes #21077, #52088

File:

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

trunk/tests/phpunit/tests/kses.php

@@ -1733 +1733 @@
         return array(
             'valid value for type'                    => array(
-                '<object type="application/pdf" data="https://example.org/foo.pdf" />',
-                '<object type="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
             ),
             'invalid value for type'                  => array(
-                '<object type="application/exe" data="https://example.org/foo.exe" />',
+                '<object type="application/exe" data="https://' . WP_TESTS_DOMAIN . '/foo.exe" />',
                 '',
             ),
             'multiple type attributes, last invalid'  => array(
-                '<object type="application/pdf" type="application/exe" data="https://example.org/foo.pdf" />',
-                '<object type="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object type="application/pdf" type="application/exe" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
             ),
             'multiple type attributes, first uppercase, last invalid' => array(
-                '<object TYPE="application/pdf" type="application/exe" data="https://example.org/foo.pdf" />',
-                '<object TYPE="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object TYPE="application/pdf" type="application/exe" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
+                '<object TYPE="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
             ),
             'multiple type attributes, last upper case and invalid' => array(
-                '<object type="application/pdf" TYPE="application/exe" data="https://example.org/foo.pdf" />',
-                '<object type="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object type="application/pdf" TYPE="application/exe" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
             ),
             'multiple type attributes, first invalid' => array(
-                '<object type="application/exe" type="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object type="application/exe" type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'multiple type attributes, first upper case and invalid' => array(
-                '<object TYPE="application/exe" type="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object TYPE="application/exe" type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'multiple type attributes, first invalid, last uppercase' => array(
-                '<object type="application/exe" TYPE="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object type="application/exe" TYPE="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'multiple object tags, last invalid'      => array(
-                '<object type="application/pdf" data="https://example.org/foo.pdf" /><object type="application/exe" data="https://example.org/foo.exe" />',
-                '<object type="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" /><object type="application/exe" data="https://' . WP_TESTS_DOMAIN . '/foo.exe" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
             ),
             'multiple object tags, first invalid'     => array(
-                '<object type="application/exe" data="https://example.org/foo.exe" /><object type="application/pdf" data="https://example.org/foo.pdf" />',
-                '<object type="application/pdf" data="https://example.org/foo.pdf" />',
+                '<object type="application/exe" data="https://' . WP_TESTS_DOMAIN . '/foo.exe" /><object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
             ),
             'type attribute with partially incorrect value' => array(
-                '<object type="application/pdfa" data="https://example.org/foo.pdf" />',
+                '<object type="application/pdfa" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'type attribute with empty value'         => array(
-                '<object type="" data="https://example.org/foo.pdf" />',
+                '<object type="" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'type attribute with no value'            => array(
-                '<object type data="https://example.org/foo.pdf" />',
+                '<object type data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'no type attribute'                       => array(
-                '<object data="https://example.org/foo.pdf" />',
+                '<object data="https://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'different protocol in url'               => array(
-                '<object type="application/pdf" data="http://example.org/foo.pdf" />',
-                '<object type="application/pdf" data="http://example.org/foo.pdf" />',
+                '<object type="application/pdf" data="http://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
+                '<object type="application/pdf" data="http://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
             ),
             'query string on url'                     => array(
-                '<object type="application/pdf" data="https://example.org/foo.pdf?lol=.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf?lol=.pdf" />',
                 '',
             ),
             'fragment on url'                         => array(
-                '<object type="application/pdf" data="https://example.org/foo.pdf#lol.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.pdf#lol.pdf" />',
                 '',
             ),
             'wrong extension'                         => array(
-                '<object type="application/pdf" data="https://example.org/foo.php" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/foo.php" />',
                 '',
             ),
             'protocol-relative url'                   => array(
-                '<object type="application/pdf" data="//example.org/foo.pdf" />',
+                '<object type="application/pdf" data="//' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
             'unsupported protocol'                    => array(
-                '<object type="application/pdf" data="ftp://example.org/foo.pdf" />',
+                '<object type="application/pdf" data="ftp://' . WP_TESTS_DOMAIN . '/foo.pdf" />',
                 '',
             ),
@@ -1817 +1817 @@
             ),
             'url with port number-like path'          => array(
-                '<object type="application/pdf" data="https://example.org/cat:8888/foo.pdf" />',
-                '<object type="application/pdf" data="https://example.org/cat:8888/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/cat:8888/foo.pdf" />',
+                '<object type="application/pdf" data="https://' . WP_TESTS_DOMAIN . '/cat:8888/foo.pdf" />',
             ),
         );
@@ -1869 +1869 @@
      */
     public function wp_kses_upload_dir_filter( $param ) {
-        $url_with_port_number = is_string( $param['url'] ) ? str_replace( 'example.org', 'example.org:8888', $param['url'] ) : $param['url'];
+        // Take care to replace the entire domain, including cases where it already has a port number.
+        $parsed         = parse_url( $param['url'] );
+        $replace_domain = $parsed['host'];
+        if ( isset( $parsed['port'] ) ) {
+            $replace_domain .= ':' . $parsed['port'];
+        }
+
+        $url_with_port_number = is_string( $param['url'] ) ? str_replace( $replace_domain, 'example.org:8888', $param['url'] ) : $param['url'];
         $param['url']         = $url_with_port_number;
         return $param;