From 7d32848c553f83891833d10e0eaf999e2dd38d7b Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 4 Sep 2019 18:19:30 +0000
Subject: [PATCH] Fix for URL sanitization in `wp_kses_bad_protocol_once()`.

Merges [45997] to the 4.7 branch.

Props irsdl, sstoqnov, whyisjake.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@46007 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/kses.php     |  1 +
 tests/phpunit/tests/kses.php | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/kses.php b/src/wp-includes/kses.php
index 0a10d6be7e..212ccc043d 100644
--- a/src/wp-includes/kses.php
+++ b/src/wp-includes/kses.php
@@ -1383,6 +1383,7 @@ function wp_kses_html_error($string) {
  * @return string Sanitized content
  */
 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]) ) {
 		$string = trim( $string2[1] );
diff --git a/tests/phpunit/tests/kses.php b/tests/phpunit/tests/kses.php
index bc62c58c6c..5e40b46d3c 100644
--- a/tests/phpunit/tests/kses.php
+++ b/tests/phpunit/tests/kses.php
@@ -137,6 +137,8 @@ EOF;
 			'javascript&#0000058alert(1)//?:',
 			'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 ) {
 			$result = wp_kses_bad_protocol( wp_kses_normalize_entities( $x ), wp_allowed_protocols() );
@@ -146,10 +148,23 @@ EOF;
 					case 12:
 						$this->assertEquals( str_replace( '&', '&amp;', $x ), $result );
 						break;
-					case 22: $this->assertEquals( 'javascript&amp;#0000058alert(1);', $result ); break;
-					case 23: $this->assertEquals( 'javascript&amp;#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&amp;#0000058alert(1);', $result );
+						break;
+					case 23:
+						$this->assertEquals( 'javascript&amp;#0000058alert(1)//?:', $result );
+						break;
+					case 24:
+						$this->assertEquals( 'feed:alert(1)', $result );
+						break;
+					case 26:
+						$this->assertEquals( 'javascript&amp;#58alert(1)', $result );
+						break;
+					case 27:
+						$this->assertEquals( 'javascript&amp;#x3ax=1;alert(1)', $result );
+						break;
+					default:
+						$this->fail( "wp_kses_bad_protocol failed on $k, $x. Result: $result" );
 				}
 			}
 		}