<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17171] trunk/wp-includes: Don't be case sensitive to attribute names.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17171">17171</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-29 20:45:37 +0000 (Wed, 29 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't be case sensitive to attribute names. Handle padded entities when checking for bad protocols. Normalize entities before checking for bad protocols in esc_url(). Props Mauro Gentile, duck_, miqrogroove</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (17170 => 17171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-12-29 19:31:35 UTC (rev 17170)
+++ trunk/wp-includes/formatting.php 2010-12-29 20:45:37 UTC (rev 17171)
</span><span class="lines">@@ -2268,7 +2268,8 @@
</span><span class="cx">
</span><span class="cx"> // Replace ampersands and single quotes only when displaying.
</span><span class="cx"> if ( 'display' == $_context ) {
</span><del>- $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url);
</del><ins>+ $url = wp_kses_normalize_entities( $url );
+ $url = str_replace( '&amp;', '&#038;', $url );
</ins><span class="cx"> $url = str_replace( "'", '&#039;', $url );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (17170 => 17171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2010-12-29 19:31:35 UTC (rev 17170)
+++ trunk/wp-includes/kses.php 2010-12-29 20:45:37 UTC (rev 17171)
</span><span class="lines">@@ -1027,15 +1027,10 @@
</span><span class="cx"> * @return string Sanitized content
</span><span class="cx"> */
</span><span class="cx"> function wp_kses_bad_protocol_once($string, $allowed_protocols) {
</span><del>- global $_kses_allowed_protocols;
- $_kses_allowed_protocols = $allowed_protocols;
</del><ins>+ $string2 = preg_split( '/:|&#0*58;|&#x0*3a;/i', $string, 2 );
+ if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) )
+ $string = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols ) . trim( $string2[1] );
</ins><span class="cx">
</span><del>- $string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
- if ( isset($string2[1]) && !preg_match('%/\?%', $string2[0]) )
- $string = wp_kses_bad_protocol_once2($string2[0]) . trim($string2[1]);
- else
- $string = preg_replace_callback('/^((&[^;]*;|[\sA-Za-z0-9])*)'.'(:|&#58;|&#[Xx]3[Aa];)\s*/', 'wp_kses_bad_protocol_once2', $string);
-
</del><span class="cx"> return $string;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1048,29 +1043,19 @@
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 1.0.0
</span><span class="cx"> *
</span><del>- * @param mixed $matches string or preg_replace_callback() matches array to check for bad protocols
</del><ins>+ * @param string $string URI scheme to check against the whitelist
+ * @param string $allowed_protocols Allowed protocols
</ins><span class="cx"> * @return string Sanitized content
</span><span class="cx"> */
</span><del>-function wp_kses_bad_protocol_once2($matches) {
- global $_kses_allowed_protocols;
-
- if ( is_array($matches) ) {
- if ( empty($matches[1]) )
- return '';
-
- $string = $matches[1];
- } else {
- $string = $matches;
- }
-
</del><ins>+function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
</ins><span class="cx"> $string2 = wp_kses_decode_entities($string);
</span><span class="cx"> $string2 = preg_replace('/\s/', '', $string2);
</span><span class="cx"> $string2 = wp_kses_no_null($string2);
</span><span class="cx"> $string2 = strtolower($string2);
</span><span class="cx">
</span><span class="cx"> $allowed = false;
</span><del>- foreach ( (array) $_kses_allowed_protocols as $one_protocol)
- if (strtolower($one_protocol) == $string2) {
</del><ins>+ foreach ( (array) $allowed_protocols as $one_protocol )
+ if ( strtolower($one_protocol) == $string2 ) {
</ins><span class="cx"> $allowed = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1098,9 +1083,10 @@
</span><span class="cx"> $string = str_replace('&', '&amp;', $string);
</span><span class="cx">
</span><span class="cx"> # Change back the allowed entities in our entity whitelist
</span><ins>+
</ins><span class="cx"> $string = preg_replace_callback('/&amp;([A-Za-z]{2,8});/', 'wp_kses_named_entities', $string);
</span><del>- $string = preg_replace_callback('/&amp;#0*([0-9]{1,5});/', 'wp_kses_normalize_entities2', $string);
- $string = preg_replace_callback('/&amp;#[Xx]0*(([0-9A-Fa-f]{2}){1,2});/', 'wp_kses_normalize_entities3', $string);
</del><ins>+ $string = preg_replace_callback('/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string);
+ $string = preg_replace_callback('/&amp;#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string);
</ins><span class="cx">
</span><span class="cx"> return $string;
</span><span class="cx"> }
</span><span class="lines">@@ -1143,7 +1129,14 @@
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> $i = $matches[1];
</span><del>- return ( ($i > 65535 || ! valid_unicode($i)) ? "&amp;#$i;" : "&#$i;" );
</del><ins>+ if (valid_unicode($i)) {
+ $i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+ $i = "&#$i;";
+ } else {
+ $i = "&amp;#$i;";
+ }
+
+ return $i;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1162,7 +1155,7 @@
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> $hexchars = $matches[1];
</span><del>- return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : "&#x$hexchars;" );
</del><ins>+ return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>