PressThis: update _limit_url(), use esc_url_raw(). Fixes checking of urlencoded strings.

See #31373.
Built from https://develop.svn.wordpress.org/trunk@31737


git-svn-id: http://core.svn.wordpress.org/trunk@31718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-03-11 23:23:25 +00:00
parent 4cc85f4da2
commit ce297a7227
2 changed files with 5 additions and 11 deletions

View File

@ -342,23 +342,17 @@ class WP_Press_This {
return ''; return '';
} }
$url = $this->_limit_string( $url );
// HTTP 1.1 allows 8000 chars but the "de-facto" standard supported in all current browsers is 2048. // HTTP 1.1 allows 8000 chars but the "de-facto" standard supported in all current browsers is 2048.
if ( mb_strlen( $url ) > 2048 ) { if ( strlen( $url ) > 2048 ) {
return ''; // Return empty rather than a trunacted/invalid URL return ''; // Return empty rather than a trunacted/invalid URL
} }
// Only allow http(s) or protocol relative URLs. // Does it look like an URL?
if ( ! preg_match( '%^(https?:)?//%i', $url ) ) { if ( ! preg_match( '/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url ) ) {
return ''; return '';
} }
if ( strpos( $url, '"' ) !== false || strpos( $url, ' ' ) !== false ) { return esc_url_raw( $url, array( 'http', 'https' ) );
return '';
}
return $url;
} }
private function _limit_img( $src ) { private function _limit_img( $src ) {

View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31736'; $wp_version = '4.2-alpha-31737';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.