Changeset 46023

Timestamp:

09/04/2019 06:42:14 PM (5 years ago)

Author:

desrosj

Message:

Fix for URL sanitization in wp_kses_bad_protocol_once().

Merges [45997] to the 3.7 branch.

Props irsdl, sstoqnov, whyisjake.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/kses.php (modified) (1 diff)
• tests/phpunit/tests/kses.php (modified) (2 diffs)

branches/3.7/src/wp-includes/kses.php

@@ -1307 +1307 @@
  */
 function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) {
+    $string  = preg_replace( '/(&#0*58(?![;0-9])|&#x0*3a(?![;a-f0-9]))/i', '$1;', $string );
     $string2 = preg_split( '/:|&#0*58;|&#x0*3a;/i', $string, 2 );
     if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) ) {

branches/3.7/tests/phpunit/tests/kses.php

@@ -138 +138 @@
             'feed:javascript:alert(1)',
             'feed:javascript:feed:javascript:feed:javascript:alert(1)',
+            'javascript&#58alert(1)',
+            'javascript&#x3ax=1;alert(1)',
         );
         foreach ( $bad as $k => $x ) {
@@ -147 +149 @@
                         $this->assertEquals( str_replace( '&', '&', $x ), $result );
                         break;
-                    case 22: $this->assertEquals( 'javascript&#0000058alert(1);', $result ); break;
-                    case 23: $this->assertEquals( 'javascript&#0000058alert(1)//?:', $result ); break;
-                    case 24: $this->assertEquals( 'feed:alert(1)', $result ); break;
-                    default: $this->fail( "wp_kses_bad_protocol failed on $x. Result: $result" );
+                    case 22:
+                        $this->assertEquals( 'javascript&#0000058alert(1);', $result );
+                        break;
+                    case 23:
+                        $this->assertEquals( 'javascript&#0000058alert(1)//?:', $result );
+                        break;
+                    case 24:
+                        $this->assertEquals( 'feed:alert(1)', $result );
+                        break;
+                    case 26:
+                        $this->assertEquals( 'javascript&#58alert(1)', $result );
+                        break;
+                    case 27:
+                        $this->assertEquals( 'javascript&#x3ax=1;alert(1)', $result );
+                        break;
+                    default:
+                        $this->fail( "wp_kses_bad_protocol failed on $k, $x. Result: $result" );
                 }
             }