<!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>[47891] trunk: Formatting: add a new 'safe_style_disallowed_chars' filter.</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/47891">47891</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/47891","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-02 23:44:40 +0000 (Tue, 02 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: add a new 'safe_style_disallowed_chars' filter.
Enable developers to change the regex used in `safecss_filter_attr` to limit characters in the parsed CSS.
Props paulschreiber, swissspidy, rmccue, bartekcholewa, miinasikk.
Fixes <a href="https://core.trac.wordpress.org/ticket/37134">#37134</a>.</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-02 21:02:49 UTC (rev 47890)
+++ trunk/src/wp-includes/kses.php 2020-06-02 23:44:40 UTC (rev 47891)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2301,13 +2301,24 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove any CSS containing containing \ ( & } = or comments, except for url() useage checked above.
- if ( $found && ! preg_match( '%[\\\(&=}]|/\*%', $css_test_string ) ) {
- if ( '' !== $css ) {
- $css .= ';';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $found ) {
+ /**
+ * Filters the regex limiting the list of characters not allowed in CSS rules.
+ *
+ * Default behaviour is to remove any css containing \ ( & } = or comments, except for url() usage.
+ *
+ * @since 5.5.0
+ *
+ * @param string $regex Regex pattern of disallowed characters in CSS rules. Default is '%[\\\(&=}]|/\*%'.
+ * @param string $css_test_string CSS value to test.
+ */
+ $disallowed_chars = apply_filters( 'safe_style_disallowed_chars', '%[\\\(&=}]|/\*%', $css_test_string );
+ if ( ! preg_match( $disallowed_chars, $css_test_string ) ) {
+ if ( '' !== $css ) {
+ $css .= ';';
+ }
+ $css .= $css_item;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $css .= $css_item;
</del><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>
<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-02 21:02:49 UTC (rev 47890)
+++ trunk/tests/phpunit/tests/kses.php 2020-06-02 23:44:40 UTC (rev 47891)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1002,7 +1002,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'css' => 'background: conic-gradient(at 0% 30%, red 10%, yellow 30%, #1e90ff 50%)',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => 'background: conic-gradient(at 0% 30%, red 10%, yellow 30%, #1e90ff 50%)',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Expressions are not allowed.
+ array(
+ 'css' => 'height: expression( body.scrollTop + 50 + "px" )',
+ 'expected' => '',
+ ),
+ // RGB color values are not allowed.
+ array(
+ 'css' => 'color: rgb( 100, 100, 100 )',
+ 'expected' => '',
+ ),
+ // RGBA color values are not allowed.
+ array(
+ 'css' => 'color: rgb( 100, 100, 100, .4 )',
+ 'expected' => '',
+ ),
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1247,4 +1261,83 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Filter for disallowed characters never matches thus allowing all characters.
+ */
+ function _safe_style_disallowed_chars_filter( $regex ) {
+ return '%a^%'; // Regex with no matches.
+
+ }
+ /**
+ * Testing the safecss_filter_attr() function with the safe_style_disallowed_chars filter.
+ *
+ * @ticket 37134
+ *
+ * @dataProvider data_test_safecss_filter_attr_filtered
+ *
+ * @param string $css A string of CSS rules.
+ * @param string $expected Expected string of CSS rules.
+ */
+ public function test_safecss_filter_attr_filtered( $css, $expected ) {
+ add_filter( 'safe_style_disallowed_chars', array( $this, '_safe_style_disallowed_chars_filter' ) );
+ $this->assertSame( $expected, safecss_filter_attr( $css ) );
+ remove_filter( 'safe_style_disallowed_chars', array( $this, '_safe_style_disallowed_chars_filter' ) );
+ }
+
+ /**
+ * Data Provider for test_safecss_filter_attr_filtered().
+ *
+ * @return array {
+ * @type array {
+ * @string string $css A string of CSS rules.
+ * @string string $expected Expected string of CSS rules.
+ * }
+ * }
+ */
+ public function data_test_safecss_filter_attr_filtered() {
+ return array(
+
+ // A single attribute name, with a single value.
+ array(
+ 'css' => 'margin-top: 2px',
+ 'expected' => 'margin-top: 2px',
+ ),
+ // Backslash \ can be allowed with the 'safe_style_disallowed_chars' filter.
+ array(
+ 'css' => 'margin-top: \2px',
+ 'expected' => 'margin-top: \2px',
+ ),
+ // Curly bracket } can be allowed with the 'safe_style_disallowed_chars' filter.
+ array(
+ 'css' => 'margin-bottom: 2px}',
+ 'expected' => 'margin-bottom: 2px}',
+ ),
+ // Parenthesis ) can be allowed with the 'safe_style_disallowed_chars' filter.
+ array(
+ 'css' => 'margin-bottom: 2px)',
+ 'expected' => 'margin-bottom: 2px)',
+ ),
+ // Ampersand & can be allowed with the 'safe_style_disallowed_chars' filter.
+ array(
+ 'css' => 'margin-bottom: 2px&',
+ 'expected' => 'margin-bottom: 2px&',
+ ),
+ // Expressions can be allowed with the 'safe_style_disallowed_chars' filter.
+ array(
+ 'css' => 'height: expression( body.scrollTop + 50 + "px" )',
+ 'expected' => 'height: expression( body.scrollTop + 50 + "px" )',
+ ),
+ // RGB color values can be allowed with the 'safe_style_disallowed_chars' filter.
+ array(
+ 'css' => 'color: rgb( 100, 100, 100 )',
+ 'expected' => 'color: rgb( 100, 100, 100 )',
+ ),
+ // RGBA color values can be allowed with the 'safe_style_disallowed_chars' filter.
+ array(
+ 'css' => 'color: rgb( 100, 100, 100, .4 )',
+ 'expected' => 'color: rgb( 100, 100, 100, .4 )',
+ ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>