<!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>[54092] trunk: KSES: Allow `min()`, `max()`, `minmax()`, and `clamp()` values to be used in inline CSS.</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/54092">54092</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/54092","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-07 14:38:59 +0000 (Wed, 07 Sep 2022)</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'>KSES: Allow `min()`, `max()`, `minmax()`, and `clamp()` values to be used in inline CSS.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/50923">[50923]</a>.
Props johnregan3, uxl, isabel_brison, andrewserong, ramonopoly, noisysocks, joyously.
See <a href="https://core.trac.wordpress.org/ticket/55966">#55966</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 2022-09-07 14:05:41 UTC (rev 54091)
+++ trunk/src/wp-includes/kses.php 2022-09-07 14:38:59 UTC (rev 54092)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2228,6 +2228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.1 Added support for gradient backgrounds.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.7.1 Added support for `object-position`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0 Added support for `calc()` and `var()` values.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.1.0 Added support for `min()`, `max()`, `minmax()`, and `clamp()` values.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $css A string of CSS rules.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $deprecated Not used.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2467,10 +2468,11 @@
</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"> if ( $found ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Allow CSS calc().
- $css_test_string = preg_replace( '/calc\(((?:\([^()]*\)?|[^()])*)\)/', '', $css_test_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow some CSS functions.
+ $css_test_string = preg_replace( '/\b(?:calc|min|max|minmax|clamp)\(((?:\([^()]*\)?|[^()])*)\)/', '', $css_test_string );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Allow CSS var().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $css_test_string = preg_replace( '/\(?var\(--[a-zA-Z0-9_-]*\)/', '', $css_test_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $css_test_string = preg_replace( '/\(?var\(--[\w\-\()[\]\,\s]*\)/', '', $css_test_string );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for any CSS containing \ ( & } = or comments,
</span><span class="cx" style="display: block; padding: 0 10px"> // except for url(), calc(), or var() usage checked above.
</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 2022-09-07 14:05:41 UTC (rev 54091)
+++ trunk/tests/phpunit/tests/kses.php 2022-09-07 14:38:59 UTC (rev 54092)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,6 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37248
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42729
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 48376
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 55966
</ins><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_test_safecss_filter_attr
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $css A string of CSS rules.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,6 +1121,81 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'css' => 'color: rgb( 100, 100, 100, .4 )',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow min().
+ array(
+ 'css' => 'width: min(50%, 400px)',
+ 'expected' => 'width: min(50%, 400px)',
+ ),
+ // Allow max().
+ array(
+ 'css' => 'width: max(50%, 40rem)',
+ 'expected' => 'width: max(50%, 40rem)',
+ ),
+ // Allow minmax().
+ array(
+ 'css' => 'width: minmax(100px, 50%)',
+ 'expected' => 'width: minmax(100px, 50%)',
+ ),
+ // Allow clamp().
+ array(
+ 'css' => 'width: clamp(100px, 50%, 100vw)',
+ 'expected' => 'width: clamp(100px, 50%, 100vw)',
+ ),
+ // Combined CSS function names.
+ array(
+ 'css' => 'width: calcmax(100px + 50%)',
+ 'expected' => '',
+ ),
+ // Allow calc().
+ array(
+ 'css' => 'width: calc(2em + 3px)',
+ 'expected' => 'width: calc(2em + 3px)',
+ ),
+ // Allow var().
+ array(
+ 'css' => 'padding: var(--wp-var1) var(--wp-var2)',
+ 'expected' => 'padding: var(--wp-var1) var(--wp-var2)',
+ ),
+ // Allow var() with fallback (commas).
+ array(
+ 'css' => 'padding: var(--wp-var1, 10px)',
+ 'expected' => 'padding: var(--wp-var1, 10px)',
+ ),
+ // Allow var() with fallback var().
+ array(
+ 'css' => 'background-color: var(--wp-var, var(--wp-var-fallback, pink))',
+ 'expected' => 'background-color: var(--wp-var, var(--wp-var-fallback, pink))',
+ ),
+ // Allow calc() with var().
+ array(
+ 'css' => 'margin-top: calc(var(--wp-var1) * 3 + 2em)',
+ 'expected' => 'margin-top: calc(var(--wp-var1) * 3 + 2em)',
+ ),
+ // Malformed min, no closing `)`.
+ array(
+ 'css' => 'width: min(3em + 10px',
+ 'expected' => '',
+ ),
+ // Malformed max, no closing `)`.
+ array(
+ 'css' => 'width: max(3em + 10px',
+ 'expected' => '',
+ ),
+ // Malformed minmax, no closing `)`.
+ array(
+ 'css' => 'width: minmax(3em + 10px',
+ 'expected' => '',
+ ),
+ // Malformed calc, no closing `)`.
+ array(
+ 'css' => 'width: calc(3em + 10px',
+ 'expected' => '',
+ ),
+ // Malformed var, no closing `)`.
+ array(
+ 'css' => 'width: var(--wp-var1',
+ '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">@@ -1301,24 +1377,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'background: red',
</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">- // CSS calc().
- array(
- 'width: calc(2em + 3px)',
- 'width: calc(2em + 3px)',
- ),
-
- // CSS variable.
- array(
- 'padding: var(--wp-var1) var(--wp-var2)',
- 'padding: var(--wp-var1) var(--wp-var2)',
- ),
-
- // CSS calc() with var().
- array(
- 'margin-top: calc(var(--wp-var1) * 3 + 2em)',
- 'margin-top: calc(var(--wp-var1) * 3 + 2em)',
- ),
-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Invalid use cases.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1382,18 +1440,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'background-image: url( "http://example.com );',
</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">-
- // Malformed calc, no closing `)`.
- array(
- 'width: calc(3em + 10px',
- '',
- ),
-
- // Malformed var, no closing `)`.
- array(
- 'width: var(--wp-var1',
- '',
- ),
</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>
</div>
</body>
</html>