Changeset 38684

Timestamp:

09/30/2016 11:24:08 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Embeds: Escape periods in oEmbed regex.

Props jrf.
Fixes #38187.

Location:

trunk

Files:

• src/wp-includes/class-oembed.php (modified) (4 diffs)
• tests/phpunit/tests/oembed.php (modified) (5 diffs)

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

@@ -61 +61 @@
             '#https?://(.+\.)?vimeo\.com/.*#i'                    => array( 'https://vimeo.com/api/oembed.{format}',                     true  ),
             '#https?://(www\.)?dailymotion\.com/.*#i'             => array( 'https://www.dailymotion.com/services/oembed',               true  ),
-            '#https?://dai.ly/.*#i'                               => array( 'https://www.dailymotion.com/services/oembed',               true  ),
+            '#https?://dai\.ly/.*#i'                              => array( 'https://www.dailymotion.com/services/oembed',               true  ),
             '#https?://(www\.)?flickr\.com/.*#i'                  => array( 'https://www.flickr.com/services/oembed/',                   true  ),
             '#https?://flic\.kr/.*#i'                             => array( 'https://www.flickr.com/services/oembed/',                   true  ),
@@ -69 +69 @@
             'http://gi*.photobucket.com/groups/*'                 => array( 'http://api.photobucket.com/oembed',                         false ),
             '#https?://(www\.)?scribd\.com/doc/.*#i'              => array( 'https://www.scribd.com/services/oembed',                    true  ),
-            '#https?://wordpress.tv/.*#i'                         => array( 'https://wordpress.tv/oembed/',                              true  ),
+            '#https?://wordpress\.tv/.*#i'                        => array( 'https://wordpress.tv/oembed/',                              true  ),
             '#https?://(.+\.)?polldaddy\.com/.*#i'                => array( 'https://polldaddy.com/oembed/',                             true  ),
             '#https?://poll\.fm/.*#i'                             => array( 'https://polldaddy.com/oembed/',                             true  ),
@@ -76 +76 @@
             '#https?://(www\.)?twitter\.com/.+?/timelines/.*#i'   => array( 'https://publish.twitter.com/oembed',                        true  ),
             '#https?://(www\.)?twitter\.com/i/moments/.*#i'       => array( 'https://publish.twitter.com/oembed',                        true  ),
-            '#https?://vine.co/v/.*#i'                            => array( 'https://vine.co/oembed.{format}',                           true  ),
+            '#https?://vine\.co/v/.*#i'                           => array( 'https://vine.co/oembed.{format}',                           true  ),
             '#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'https://soundcloud.com/oembed',                             true  ),
             '#https?://(.+?\.)?slideshare\.net/.*#i'              => array( 'https://www.slideshare.net/api/oembed/2',                   true  ),
@@ -93 +93 @@
             '#https?://cloudup\.com/.*#i'                         => array( 'https://cloudup.com/oembed',                                true  ),
             '#https?://(www\.)?reverbnation\.com/.*#i'            => array( 'https://www.reverbnation.com/oembed',                       true  ),
-            '#https?://videopress.com/v/.*#'                      => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true  ),
+            '#https?://videopress\.com/v/.*#'                     => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true  ),
             '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i' => array( 'https://www.reddit.com/oembed',                             true  ),
             '#https?://(www\.)?speakerdeck\.com/.*#i'             => array( 'https://speakerdeck.com/oembed.{format}',                   true  ),

trunk/tests/phpunit/tests/oembed.php

@@ -9 +9 @@
         'vimeo'                => '#https?://(.+\.)?vimeo\.com/.*#i',
         'dailymotion'          => '#https?://(www\.)?dailymotion\.com/.*#i',
-        'dailymotion-shorturl' => '#https?://dai.ly/.*#i',
+        'dailymotion-shorturl' => '#https?://dai\.ly/.*#i',
         'flickr'               => '#https?://(www\.)?flickr\.com/.*#i',
         'flickr-shorturl'      => '#https?://flic\.kr/.*#i',
@@ -17 +17 @@
         'photobucket-group'    => 'http://gi*.photobucket.com/groups/*',
         'scribd'               => '#https?://(www\.)?scribd\.com/doc/.*#i',
-        'wordpress-tv'         => '#https?://wordpress.tv/.*#i',
+        'wordpress-tv'         => '#https?://wordpress\.tv/.*#i',
         'polldaddy'            => '#https?://(.+\.)?polldaddy\.com/.*#i',
         'polldaddy-shorturl'   => '#https?://poll\.fm/.*#i',
@@ -24 +24 @@
         'twitter-timeline'     => '#https?://(www\.)?twitter\.com/.+?/timelines/.*#i',
         'twitter-moment'       => '#https?://(www\.)?twitter\.com/i/moments/.*#i',
-        'vine'                 => '#https?://vine.co/v/.*#i',
+        'vine'                 => '#https?://vine\.co/v/.*#i',
         'soundcloud'           => '#https?://(www\.)?soundcloud\.com/.*#i',
         'slideshare'           => '#https?://(.+?\.)?slideshare\.net/.*#i',
@@ -41 +41 @@
         'cloudup'              => '#https?://cloudup\.com/.*#i',
         'reverbnation'         => '#https?://(www\.)?reverbnation\.com/.*#i',
-        'videopress'           => '#https?://videopress.com/v/.*#',
+        'videopress'           => '#https?://videopress\.com/v/.*#',
         'reddit-comments'      => '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i',
         'speakerdeck'          => '#https?://(www\.)?speakerdeck\.com/.*#i',
@@ -813 +813 @@
     }
 
+    /**
+     * Test URLs that should not match any of the predefined providers.
+     *
+     * @group oembed
+     * @ticket 38187
+     *
+     * @dataProvider dataShouldNotMatchOembedRegex
+     */
+    public function testUrlShouldNotMatchOembedRegex( $url ) {
+
+        $this->assertSame( false, self::$oembed->get_provider( $url, array( 'discover' => false ) ) );
+
+    }
+
+    /**
+     * Data provider for testUrlShouldNotMatchOembedRegex().
+     *
+     * @return array
+     */
+    public function dataShouldNotMatchOembedRegex() {
+        $providers = self::$provider_map;
+
+        return array(
+            array( 'http://dairly/something' ),
+            array( 'https://daisly/' ),
+            array( 'http://wordpressstv/' ),
+            array( 'https://wordpressstv/somethingelse' ),
+            array( 'http://vinerco/v/andanother' ),
+            array( 'https://vineqco/v/' ),
+            array( 'http://videopressscom/v/' ),
+            array( 'https://videopresstcom/v/covered' ),
+        );
+    }
 }