<!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" />
<title>[48132] trunk: Formatting: Extend `wp_kses_hair` and `wp_kses_hair_parse` to allow digits and underscores.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48132">48132</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48132","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-23 05:05:57 +0000 (Tue, 23 Jun 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Formatting: Extend `wp_kses_hair` and `wp_kses_hair_parse` to allow digits and underscores.
Fixes a lot of issues around parsing XML/HTML attributes.
Fixes <a href="https://core.trac.wordpress.org/ticket/49464">#49464</a>.
See <a href="https://core.trac.wordpress.org/ticket/34406">#34406</a>, <a href="https://core.trac.wordpress.org/ticket/48608">#48608</a>.
Props codeforest, zodiac1978, johnpgreen, dlh, ayeshrajans, johnpgreen, rilwis, travisnorthcutt, miqrogroove, chriscct7, whyisjake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php 2020-06-23 04:41:02 UTC (rev 48131)
+++ trunk/src/wp-includes/kses.php 2020-06-23 05:05:57 UTC (rev 48132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1261,11 +1261,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $mode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 0:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( preg_match( '/^([-a-zA-Z:]+)/', $attr, $match ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '/^([_a-zA-Z][-_a-zA-Z0-9:.]*)/', $attr, $match ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attrname = $match[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $working = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attr = preg_replace( '/^[-a-zA-Z:]+/', '', $attr );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attr = preg_replace( '/^[_a-zA-Z][-_a-zA-Z0-9:.]*/', '', $attr );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1451,25 +1451,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
</span><span class="cx" style="display: block; padding: 0 10px"> $regex =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '(?:'
- . '[-a-zA-Z:]+' // Attribute name.
- . '|'
- . '\[\[?[^\[\]]+\]\]?' // Shortcode in the name position implies unfiltered_html.
- . ')'
- . '(?:' // Attribute value.
- . '\s*=\s*' // All values begin with '='.
- . '(?:'
- . '"[^"]*"' // Double-quoted.
- . '|'
- . "'[^']*'" // Single-quoted.
- . '|'
- . '[^\s"\']+' // Non-quoted.
- . '(?:\s|$)' // Must have a space.
- . ')'
- . '|'
- . '(?:\s|$)' // If attribute has no value, space is required.
- . ')'
- . '\s*'; // Trailing space is optional except as mentioned above.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '(?:'
+ . '[_a-zA-Z][-_a-zA-Z0-9:.]*' // Attribute name.
+ . '|'
+ . '\[\[?[^\[\]]+\]\]?' // Shortcode in the name position implies unfiltered_html.
+ . ')'
+ . '(?:' // Attribute value.
+ . '\s*=\s*' // All values begin with '='.
+ . '(?:'
+ . '"[^"]*"' // Double-quoted.
+ . '|'
+ . "'[^']*'" // Single-quoted.
+ . '|'
+ . '[^\s"\']+' // Non-quoted.
+ . '(?:\s|$)' // Must have a space.
+ . ')'
+ . '|'
+ . '(?:\s|$)' // If attribute has no value, space is required.
+ . ')'
+ . '\s*'; // Trailing space is optional except as mentioned above.
</ins><span class="cx" style="display: block; padding: 0 10px"> // phpcs:enable
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Although it is possible to reduce this procedure to a single regexp,
</span></span></pre></div>
<a id="trunktestsphpunittestsksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/kses.php 2020-06-23 04:41:02 UTC (rev 48131)
+++ trunk/tests/phpunit/tests/kses.php 2020-06-23 05:05:57 UTC (rev 48132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -629,6 +629,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "array[1]='z'z'z'z",
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // using digit in attribute name should work
+ array(
+ 'href="https://example.com/[shortcode attr=\'value\']" data-op3-timer-seconds="0"',
+ array( 'href="https://example.com/[shortcode attr=\'value\']" ', 'data-op3-timer-seconds="0"' ),
+ ),
+ // using underscore in attribute name should work
+ array(
+ 'href="https://example.com/[shortcode attr=\'value\']" data-op_timer-seconds="0"',
+ array( 'href="https://example.com/[shortcode attr=\'value\']" ', 'data-op_timer-seconds="0"' ),
+ ),
+ // using period in attribute name should work
+ array(
+ 'href="https://example.com/[shortcode attr=\'value\']" data-op.timer-seconds="0"',
+ array( 'href="https://example.com/[shortcode attr=\'value\']" ', 'data-op.timer-seconds="0"' ),
+ ),
+ // using digit at a beginning of attribute name should return false
+ array(
+ 'href="https://example.com/[shortcode attr=\'value\']" 3data-op-timer-seconds="0"',
+ false,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>