Ticket #33121: 33121.7.diff

src/wp-includes/kses.php

@@ -854 +854 @@
  * Determine whether an attribute is allowed.
  *
  * @since 4.2.3
+ * @since 5.0.0 Add support for `data-*` wildcard attributes.
  *
  * @param string $name The attribute name. Returns empty string when not allowed.
  * @param string $value The attribute value. Returns a filtered value.
@@ -864 +865 @@
  * @return bool Is the attribute allowed?
  */
 function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowed_html ) {
-        $allowed_attr = $allowed_html[strtolower( $element )];
+        $allowed_attr = $allowed_html[ strtolower( $element ) ];
 
         $name_low = strtolower( $name );
+
         if ( ! isset( $allowed_attr[$name_low] ) || '' == $allowed_attr[$name_low] ) {
-                $name = $value = $whole = '';
-                return false;
+                /*
+                 * Allow `data-*` attributes.
+                 *
+                 * When specifying `$allowed_html`, the attribute name should be set as
+                 * `data-*` (not to be mixed with the HTML 4.0 `data` attribute, see
+                 * https://www.w3.org/TR/html40/struct/objects.html#adef-data).
+                 *
+                 * Note: the attribute name should only contain `A-Za-z0-9_-` chars,
+                 * double hyphens `--` are not accepted by WordPress.
+                 */
+                if ( strpos( $name_low, 'data-' ) === 0 && ! empty( $allowed_attr['data-*'] ) && preg_match( '/^data(?:-[a-z0-9_]+)+$/', $name_low, $match ) ) {
+                        /*
+                         * Add the whole attribute name to the allowed attributes and set any restrictions
+                         * for the `data-*` attribute values for the current element.
+                         */
+                        $allowed_attr[ $match[0] ] = $allowed_attr['data-*'];
+                } else {
+                        $name = $value = $whole = '';
+                        return false;
+                }
         }
 
         if ( 'style' == $name_low ) {
@@ -884 +904 @@
                 $value = $new_value;
         }
 
-        if ( is_array( $allowed_attr[$name_low] ) ) {
+        if ( is_array( $allowed_attr[ $name_low ] ) ) {
                 // there are some checks
                 foreach ( $allowed_attr[$name_low] as $currkey => $currval ) {
                         if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) {
@@ -1808 +1828 @@
  * Helper function to add global attributes to a tag in the allowed html list.
  *
  * @since 3.5.0
+ * @since 5.0.0 Add support for `data-*` wildcard attributes.
  * @access private
  *
  * @param array $value An array of attributes.
@@ -1820 +1841 @@
                 'style' => true,
                 'title' => true,
                 'role' => true,
+                'data-*' => true,
         );
 
         if ( true === $value )

tests/phpunit/tests/kses.php

@@ -718 +718 @@
 
                 $this->assertEquals( "<{$element}>", wp_kses_attr( $element, $attribute, array( 'foo' => false ), array() ) );
         }
+
+        /**
+         * Data attributes are globally accepted.
+         *
+         * @ticket 33121
+         */
+        function test_wp_kses_attr_data_attribute_is_allowed() {
+                $test = '<div data-foo="foo" data-bar="bar" datainvalid="gone" data--invaild="gone"  data-also-invaild-="gone" data-two-hyphens="remains">Pens and pencils</div>';
+                $expected = '<div data-foo="foo" data-bar="bar" data-two-hyphens="remains">Pens and pencils</div>';
+
+                $this->assertEquals( $expected, wp_kses_post( $test ) );
+        }
+
+        /**
+         * Ensure wildcard attributes block unprefixed wildcard uses.
+         *
+         * @ticket 33121
+         */
+        function test_wildcard_requires_hyphen_after_prefix() {
+                $allowed_html = array(
+                        'div' => array(
+                                'data-*' => true,
+                                'on-*' => true,
+                        ),
+                );
+
+                $string = '<div datamelformed-prefix="gone" data="gone" data-="gone" onclick="alert(1)">Malformed attributes</div>';
+                $expected = '<div>Malformed attributes</div>';
+
+                $actual = wp_kses( $string, $allowed_html );
+
+                $this->assertSame( $expected, $actual );
+        }
+
+        /**
+         * Ensure wildcard allows two hyphen.
+         *
+         * @ticket 33121
+         */
+        function test_wildcard_allows_two_hyphens() {
+                $allowed_html = array(
+                        'div' => array(
+                                'data-*' => true,
+                        ),
+                );
+
+                $string = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
+                $expected = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
+
+                $actual = wp_kses( $string, $allowed_html );
+
+                $this->assertSame( $expected, $actual );
+        }
+
+        /**
+         * Ensure wildcard attributes only support valid prefixes.
+         *
+         * @dataProvider data_wildcard_attribute_prefixes
+         *
+         * @ticket 33121
+         */
+        function test_wildcard_attribute_prefixes( $wildcard_attribute, $expected ) {
+                $allowed_html = array(
+                        'div' => array(
+                                $wildcard_attribute => true,
+                        ),
+                );
+
+                $name = str_replace( '*', strtolower( __FUNCTION__ ), $wildcard_attribute );
+                $value = __FUNCTION__;
+                $whole = "{$name}=\"{$value}\"";
+
+                $actual = wp_kses_attr_check( $name, $value, $whole, 'n', 'div', $allowed_html );
+
+                $this->assertSame( $expected, $actual );
+        }
+
+        /**
+         * @return array Array of arguments for wildcard testing
+         *               [0] The prefix being tested.
+         *               [1] The outcome of `wp_kses_attr_check` for the prefix.
+         */
+        function data_wildcard_attribute_prefixes() {
+                return array(
+                        // Ends correctly
+                        array( 'data-*', true ),
+
+                        // Does not end with trialing `-`.
+                        array( 'data*', false ),
+
+                        // Multiple wildcards.
+                        array( 'd*ta-*', false ),
+                        array( 'data**', false ),
+                );
+        }
 }

tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -928 +928 @@
                         array(
                                 // Raw values.
                                 array(
-                                        'title'   => '<a href="#" target="_blank" data-unfiltered=true>link</a>',
-                                        'description' => '<a href="#" target="_blank" data-unfiltered=true>link</a>',
-                                        'caption' => '<a href="#" target="_blank" data-unfiltered=true>link</a>',
+                                        'title'   => '<a href="#" target="_blank" unfiltered=true>link</a>',
+                                        'description' => '<a href="#" target="_blank" unfiltered=true>link</a>',
+                                        'caption' => '<a href="#" target="_blank" unfiltered=true>link</a>',
                                 ),
                                 // Expected returned values.
                                 array(

tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -2913 +2913 @@
                         array(
                                 // Raw values.
                                 array(
-                                        'title'   => '<a href="#" target="_blank" data-unfiltered=true>link</a>',
-                                        'content' => '<a href="#" target="_blank" data-unfiltered=true>link</a>',
-                                        'excerpt' => '<a href="#" target="_blank" data-unfiltered=true>link</a>',
+                                        'title'   => '<a href="#" target="_blank" unfiltered=true>link</a>',
+                                        'content' => '<a href="#" target="_blank" unfiltered=true>link</a>',
+                                        'excerpt' => '<a href="#" target="_blank" unfiltered=true>link</a>',
                                 ),
                                 // Expected returned values.
                                 array(