Changeset 47947

Timestamp:

06/10/2020 04:34:18 PM (6 years ago)

Author:

whyisjake

Message:

Embeds: Ensure that the title attribute is set correctly on embeds.

Props xknown.

Location:

trunk

Files:

• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/embed.php (modified) (2 diffs)
• tests/phpunit/tests/oembed/filterResult.php (modified) (1 diff)

trunk/src/wp-includes/default-filters.php

@@ -583 +583 @@
 add_filter( 'the_excerpt_embed', 'wp_embed_excerpt_attachment' );
 
+add_filter( 'oembed_dataparse', 'wp_filter_oembed_iframe_title_attribute', 5, 3 );
 add_filter( 'oembed_dataparse', 'wp_filter_oembed_result', 10, 3 );
-add_filter( 'oembed_dataparse', 'wp_filter_oembed_iframe_title_attribute', 20, 3 );
 add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );
 add_filter( 'pre_oembed_result', 'wp_filter_pre_oembed_result', 10, 3 );

trunk/src/wp-includes/embed.php

@@ -807 +807 @@
         $title = ! empty( $data->title ) ? $data->title : '';
 
-        $pattern        = '`<iframe[^>]*?title=(\\\\\'|\\\\"|[\'"])([^>]*?)\1`i';
-        $has_title_attr = preg_match( $pattern, $result, $matches );
-
-        if ( $has_title_attr && ! empty( $matches[2] ) ) {
-                $title = $matches[2];
+        $pattern = '`<iframe([^>]*)>`i';
+        if ( preg_match( $pattern, $result, $matches ) ) {
+                $attrs = wp_kses_hair( $matches[1], wp_allowed_protocols() );
+
+                foreach ( $attrs as $attr => $item ) {
+                        $lower_attr = strtolower( $attr );
+                        if ( $lower_attr === $attr ) {
+                                continue;
+                        }
+                        if ( ! isset( $attrs[ $lower_attr ] ) ) {
+                                $attrs[ $lower_attr ] = $item;
+                                unset( $attrs[ $attr ] );
+                        }
+                }
+        }
+
+        if ( ! empty( $attrs['title']['value'] ) ) {
+                $title = $attrs['title']['value'];
         }
 
@@ -830 +843 @@
         }
 
-        if ( $has_title_attr ) {
-                // Remove the old title, $matches[1]: quote, $matches[2]: title attribute value.
-                $result = str_replace( ' title=' . $matches[1] . $matches[2] . $matches[1], '', $result );
-        }
-
+        if ( isset( $attrs['title'] ) ) {
+                unset( $attrs['title'] );
+                $attr_string = join( ' ', wp_list_pluck( $attrs, 'whole' ) );
+                $result      = str_replace( $matches[0], '<iframe ' . trim( $attr_string ) . '>', $result );
+        }
         return str_ireplace( '<iframe ', sprintf( '<iframe title="%s" ', esc_attr( $title ) ), $result );
 }

trunk/tests/phpunit/tests/oembed/filterResult.php

@@ -94 +94 @@
         }
 
+        public function _data_oembed_test_strings() {
+                return array(
+                        array(
+                                '<blockquote></blockquote><iframe title=""></iframe>',
+                                '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola"></iframe>',
+                        ),
+                        array(
+                                '<blockquote class="foo" id="bar"><strong><a href="" target=""></a></strong></blockquote><iframe width=123></iframe>',
+                                '<blockquote class="wp-embedded-content"><a href=""></a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola" width="123"></iframe>',
+                        ),
+                        array(
+                                '<blockquote><iframe width="100"></iframe></blockquote><iframe stitle="aaaa"></iframe>',
+                                '<blockquote class="wp-embedded-content"><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola" width="100"></iframe></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola"></iframe>',
+                        ),
+                        array(
+                                "<blockquote><iframe title=' width=\"'></iframe></blockquote><iframe title='' height=' title=' width=\"'' heigt='123'\"></iframe>",
+                                '<blockquote class="wp-embedded-content"><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title=" width=&quot;"></iframe></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title=" width=&quot;" height=\' title=\' width="\'\' heigt=\'123\'"></iframe>',
+                        ),
+                );
+        }
+
+        /**
+         * @dataProvider _data_oembed_test_strings
+         */
+        public function test_wp_filter_pre_oembed_custom_result( $html, $expected ) {
+                $data   = (object) array(
+                        'type'  => 'rich',
+                        'title' => 'Hola',
+                        'html'  => $html,
+                );
+                $actual = _wp_oembed_get_object()->data2html( $data, 'https://untrusted.localhost' );
+                $this->assertEquals( $expected, $actual );
+        }
+
         /**
          * @group feed