Ticket #55966: 55966.2.diff

src/wp-includes/kses.php

@@ -2467 +2467 @@
                 }
 
                 if ( $found ) {
-                        // Allow CSS calc().
-                        $css_test_string = preg_replace( '/calc\(((?:\([^()]*\)?|[^()])*)\)/', '', $css_test_string );
+                        // Allow some CSS functions.
+                        $css_test_string = preg_replace( '/\b(?:calc|min|max|minmax|clamp)\(((?:\([^()]*\)?|[^()])*)\)/', '', $css_test_string );
+
                         // Allow CSS var().
-                        $css_test_string = preg_replace( '/\(?var\(--[a-zA-Z0-9_-]*\)/', '', $css_test_string );
+                        $css_test_string = preg_replace( '/\(?var\(--[\w\-\()[\]\,\s]*\)/', '', $css_test_string );
 
                         // Check for any CSS containing \ ( & } = or comments,
                         // except for url(), calc(), or var() usage checked above.

tests/phpunit/tests/kses.php

@@ -935 +935 @@
          * @ticket 37248
          * @ticket 42729
          * @ticket 48376
+         * @ticket 55966
          * @dataProvider data_test_safecss_filter_attr
          *
          * @param string $css      A string of CSS rules.
@@ -1120 +1121 @@
                                 'css'      => 'color: rgb( 100, 100, 100, .4 )',
                                 'expected' => '',
                         ),
+                        // Allow min().
+                        array(
+                                'width: min(50%, 400px)',
+                                'width: min(50%, 400px)',
+                        ),
+                        // Allow max().
+                        array(
+                                'width: max(50%, 40rem)',
+                                'width: max(50%, 40rem)',
+                        ),
+                        // Allow minmax().
+                        array(
+                                'width: minmax(100px, 50%)',
+                                'width: minmax(100px, 50%)',
+                        ),
+                        // Allow clamp().
+                        array(
+                                'width: clamp(100px, 50%, 100vw)',
+                                'width: clamp(100px, 50%, 100vw)',
+                        ),
+                        // Combined CSS function names.
+                        array(
+                                'width: calcmax(100px + 50%)',
+                                '',
+                        ),
+                        // Allow calc().
+                        array(
+                                'width: calc(2em + 3px)',
+                                'width: calc(2em + 3px)',
+                        ),
+                        // Allow var().
+                        array(
+                                'padding: var(--wp-var1) var(--wp-var2)',
+                                'padding: var(--wp-var1) var(--wp-var2)',
+                        ),
+                        // Allow var() with fallback (commas).
+                        array(
+                                'padding: var(--wp-var1, 10px)',
+                                'padding: var(--wp-var1, 10px)',
+                        ),
+                        // Allow var() with fallback var().
+                        array(
+                                'background-color: var(--wp-var, var(--wp-var-fallback, pink))',
+                                'background-color: var(--wp-var, var(--wp-var-fallback, pink))',
+                        ),
+                        // Allow calc() with var().
+                        array(
+                                'margin-top: calc(var(--wp-var1) * 3 + 2em)',
+                                'margin-top: calc(var(--wp-var1) * 3 + 2em)',
+                        ),
+                        // Malformed min, no closing `)`.
+                        array(
+                                'width: min(3em + 10px',
+                                '',
+                        ),
+                        // Malformed max, no closing `)`.
+                        array(
+                                'width: max(3em + 10px',
+                                '',
+                        ),
+                        // Malformed minmax, no closing `)`.
+                        array(
+                                'width: minmax(3em + 10px',
+                                '',
+                        ),
+                        // Malformed calc, no closing `)`.
+                        array(
+                                'width: calc(3em + 10px',
+                                '',
+                        ),
+                        // Malformed var, no closing `)`.
+                        array(
+                                'width: var(--wp-var1',
+                                '',
+                        ),
                 );
         }
 
@@ -1301 +1377 @@
                                 'background: red',
                         ),
 
-                        // 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)',
-                        ),
-
                         /*
                          * Invalid use cases.
                          */
@@ -1382 +1440 @@
                                 'background-image: url( "http://example.com );',
                                 '',
                         ),
-
-                        // Malformed calc, no closing `)`.
-                        array(
-                                'width: calc(3em + 10px',
-                                '',
-                        ),
-
-                        // Malformed var, no closing `)`.
-                        array(
-                                'width: var(--wp-var1',
-                                '',
-                        ),
                 );
         }