--- a/wp/wp-includes/kses.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/kses.php Tue Dec 15 13:49:49 2020 +0100
@@ -47,7 +47,7 @@
// Ensure that these variables are added to the global namespace
// (e.g. if using namespaces / autoload in the current PHP environment).
-global $allowedposttags, $allowedtags, $allowedentitynames;
+global $allowedposttags, $allowedtags, $allowedentitynames, $allowedxmlentitynames;
if ( ! CUSTOM_TAGS ) {
/**
@@ -230,6 +230,7 @@
'border' => true,
'height' => true,
'hspace' => true,
+ 'loading' => true,
'longdesc' => true,
'vspace' => true,
'src' => true,
@@ -397,15 +398,16 @@
),
'var' => array(),
'video' => array(
- 'autoplay' => true,
- 'controls' => true,
- 'height' => true,
- 'loop' => true,
- 'muted' => true,
- 'poster' => true,
- 'preload' => true,
- 'src' => true,
- 'width' => true,
+ 'autoplay' => true,
+ 'controls' => true,
+ 'height' => true,
+ 'loop' => true,
+ 'muted' => true,
+ 'playsinline' => true,
+ 'poster' => true,
+ 'preload' => true,
+ 'src' => true,
+ 'width' => true,
),
);
@@ -703,6 +705,18 @@
'there4',
);
+ /**
+ * @var string[] $allowedxmlentitynames Array of KSES allowed XML entitity names.
+ * @since 5.5.0
+ */
+ $allowedxmlnamedentities = array(
+ 'amp',
+ 'lt',
+ 'gt',
+ 'apos',
+ 'quot',
+ );
+
$allowedposttags = array_map( '_wp_add_global_attributes', $allowedposttags );
} else {
$allowedtags = wp_kses_array_lc( $allowedtags );
@@ -723,8 +737,9 @@
* @since 1.0.0
*
* @param string $string Text content to filter.
- * @param array[]|string $allowed_html An array of allowed HTML elements and attributes, or a
- * context name such as 'post'.
+ * @param array[]|string $allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'. See wp_kses_allowed_html()
+ * for the list of accepted context names.
* @param string[] $allowed_protocols Array of allowed URL protocols.
* @return string Filtered content containing only the allowed HTML.
*/
@@ -732,9 +747,11 @@
if ( empty( $allowed_protocols ) ) {
$allowed_protocols = wp_allowed_protocols();
}
+
$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
$string = wp_kses_normalize_entities( $string );
$string = wp_kses_hook( $string, $allowed_html, $allowed_protocols );
+
return wp_kses_split( $string, $allowed_html, $allowed_protocols );
}
@@ -775,12 +792,12 @@
// Remove quotes surrounding $value.
// Also guarantee correct quoting in $string for this one attribute.
- if ( '' == $value ) {
+ if ( '' === $value ) {
$quote = '';
} else {
$quote = $value[0];
}
- if ( '"' == $quote || "'" == $quote ) {
+ if ( '"' === $quote || "'" === $quote ) {
if ( substr( $value, -1 ) != $quote ) {
return '';
}
@@ -793,7 +810,7 @@
$value = esc_attr( $value );
// Sanitize URI values.
- if ( in_array( strtolower( $name ), $uris ) ) {
+ if ( in_array( strtolower( $name ), $uris, true ) ) {
$value = wp_kses_bad_protocol( $value, $allowed_protocols );
}
@@ -896,20 +913,24 @@
*
* @since 1.0.0
*
- * @param string $string Content to filter through KSES.
- * @param array[]|string $allowed_html List of allowed HTML elements.
- * @param string[] $allowed_protocols Array of allowed URL protocols.
+ * @param string $string Content to filter through KSES.
+ * @param array[]|string $allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'. See wp_kses_allowed_html()
+ * for the list of accepted context names.
+ * @param string[] $allowed_protocols Array of allowed URL protocols.
* @return string Filtered content through {@see 'pre_kses'} hook.
*/
function wp_kses_hook( $string, $allowed_html, $allowed_protocols ) {
/**
- * Filters content to be run through kses.
+ * Filters content to be run through KSES.
*
* @since 2.3.0
*
- * @param string $string Content to run through KSES.
- * @param array[]|string $allowed_html Allowed HTML elements.
- * @param string[] $allowed_protocols Array of allowed URL protocols.
+ * @param string $string Content to filter through KSES.
+ * @param array[]|string $allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'. See wp_kses_allowed_html()
+ * for the list of accepted context names.
+ * @param string[] $allowed_protocols Array of allowed URL protocols.
*/
return apply_filters( 'pre_kses', $string, $allowed_html, $allowed_protocols );
}
@@ -932,23 +953,28 @@
*
* @since 1.0.0
*
- * @global array $pass_allowed_html
- * @global array $pass_allowed_protocols
+ * @global array[]|string $pass_allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'.
+ * @global string[] $pass_allowed_protocols Array of allowed URL protocols.
*
- * @param string $string Content to filter.
- * @param array $allowed_html Allowed HTML elements.
- * @param string[] $allowed_protocols Array of allowed URL protocols.
+ * @param string $string Content to filter.
+ * @param array[]|string $allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'. See wp_kses_allowed_html()
+ * for the list of accepted context names.
+ * @param string[] $allowed_protocols Array of allowed URL protocols.
* @return string Content with fixed HTML tags
*/
function wp_kses_split( $string, $allowed_html, $allowed_protocols ) {
global $pass_allowed_html, $pass_allowed_protocols;
+
$pass_allowed_html = $allowed_html;
$pass_allowed_protocols = $allowed_protocols;
+
return preg_replace_callback( '%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string );
}
/**
- * Helper function listing HTML attributes containing a URL.
+ * Returns an array of HTML attribute names whose value contains a URL.
*
* This function returns a list of all HTML attributes that must contain
* a URL according to the HTML specification.
@@ -959,7 +985,7 @@
*
* @since 5.0.1
*
- * @return array HTML attributes that must include a URL.
+ * @return string[] HTML attribute names whose value contains a URL.
*/
function wp_kses_uri_attributes() {
$uri_attributes = array(
@@ -990,7 +1016,7 @@
*
* @since 5.0.1
*
- * @param array $uri_attributes HTML attributes requiring validation as a URL.
+ * @param string[] $uri_attributes HTML attribute names whose value contains a URL.
*/
$uri_attributes = apply_filters( 'wp_kses_uri_attributes', $uri_attributes );
@@ -1004,13 +1030,16 @@
* @access private
* @ignore
*
- * @global array $pass_allowed_html
- * @global array $pass_allowed_protocols
+ * @global array[]|string $pass_allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'.
+ * @global string[] $pass_allowed_protocols Array of allowed URL protocols.
*
+ * @param array $matches preg_replace regexp matches
* @return string
*/
function _wp_kses_split_callback( $match ) {
global $pass_allowed_html, $pass_allowed_protocols;
+
return wp_kses_split2( $match[0], $pass_allowed_html, $pass_allowed_protocols );
}
@@ -1030,31 +1059,33 @@
* @ignore
* @since 1.0.0
*
- * @param string $string Content to filter.
- * @param array $allowed_html Allowed HTML elements.
- * @param string[] $allowed_protocols Array of allowed URL protocols.
+ * @param string $string Content to filter.
+ * @param array[]|string $allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'. See wp_kses_allowed_html()
+ * for the list of accepted context names.
+ * @param string[] $allowed_protocols Array of allowed URL protocols.
* @return string Fixed HTML element
*/
function wp_kses_split2( $string, $allowed_html, $allowed_protocols ) {
$string = wp_kses_stripslashes( $string );
// It matched a ">" character.
- if ( substr( $string, 0, 1 ) != '<' ) {
+ if ( '<' !== substr( $string, 0, 1 ) ) {
return '>';
}
// Allow HTML comments.
- if ( '<!--' == substr( $string, 0, 4 ) ) {
+ if ( '<!--' === substr( $string, 0, 4 ) ) {
$string = str_replace( array( '<!--', '-->' ), '', $string );
- while ( $string != ( $newstring = wp_kses( $string, $allowed_html, $allowed_protocols ) ) ) {
+ while ( ( $newstring = wp_kses( $string, $allowed_html, $allowed_protocols ) ) != $string ) {
$string = $newstring;
}
- if ( $string == '' ) {
+ if ( '' === $string ) {
return '';
}
- // prevent multiple dashes in comments
+ // Prevent multiple dashes in comments.
$string = preg_replace( '/--+/', '-', $string );
- // prevent three dashes closing a comment
+ // Prevent three dashes closing a comment.
$string = preg_replace( '/-$/', '', $string );
return "<!--{$string}-->";
}
@@ -1078,7 +1109,7 @@
}
// No attributes are allowed for closing elements.
- if ( $slash != '' ) {
+ if ( '' !== $slash ) {
return "</$elem>";
}
@@ -1096,10 +1127,12 @@
*
* @since 1.0.0
*
- * @param string $element HTML element/tag.
- * @param string $attr HTML attributes from HTML element to closing HTML element tag.
- * @param array $allowed_html Allowed HTML elements.
- * @param string[] $allowed_protocols Array of allowed URL protocols.
+ * @param string $element HTML element/tag.
+ * @param string $attr HTML attributes from HTML element to closing HTML element tag.
+ * @param array[]|string $allowed_html An array of allowed HTML elements and attributes,
+ * or a context name such as 'post'. See wp_kses_allowed_html()
+ * for the list of accepted context names.
+ * @param string[] $allowed_protocols Array of allowed URL protocols.
* @return string Sanitized HTML element.
*/
function wp_kses_attr( $element, $attr, $allowed_html, $allowed_protocols ) {
@@ -1119,11 +1152,11 @@
return "<$element$xhtml_slash>";
}
- // Split it
+ // Split it.
$attrarr = wp_kses_hair( $attr, $allowed_protocols );
// Go through $attrarr, and save the allowed attributes for this element
- // in $attr2
+ // in $attr2.
$attr2 = '';
foreach ( $attrarr as $arreach ) {
if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) {
@@ -1131,7 +1164,7 @@
}
}
- // Remove any "<" or ">" characters
+ // Remove any "<" or ">" characters.
$attr2 = preg_replace( '/[<>]/', '', $attr2 );
return "<$element$attr2$xhtml_slash>";
@@ -1152,10 +1185,19 @@
* @return bool Whether or not the attribute is allowed.
*/
function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowed_html ) {
- $allowed_attr = $allowed_html[ strtolower( $element ) ];
+ $name_low = strtolower( $name );
+ $element_low = strtolower( $element );
- $name_low = strtolower( $name );
- if ( ! isset( $allowed_attr[ $name_low ] ) || '' == $allowed_attr[ $name_low ] ) {
+ if ( ! isset( $allowed_html[ $element_low ] ) ) {
+ $name = '';
+ $value = '';
+ $whole = '';
+ return false;
+ }
+
+ $allowed_attr = $allowed_html[ $element_low ];
+
+ if ( ! isset( $allowed_attr[ $name_low ] ) || '' === $allowed_attr[ $name_low ] ) {
/*
* Allow `data-*` attributes.
*
@@ -1173,16 +1215,20 @@
*/
$allowed_attr[ $match[0] ] = $allowed_attr['data-*'];
} else {
- $name = $value = $whole = '';
+ $name = '';
+ $value = '';
+ $whole = '';
return false;
}
}
- if ( 'style' == $name_low ) {
+ if ( 'style' === $name_low ) {
$new_value = safecss_filter_attr( $value );
if ( empty( $new_value ) ) {
- $name = $value = $whole = '';
+ $name = '';
+ $value = '';
+ $whole = '';
return false;
}
@@ -1191,10 +1237,12 @@
}
if ( is_array( $allowed_attr[ $name_low ] ) ) {
- // there are some checks
+ // There are some checks.
foreach ( $allowed_attr[ $name_low ] as $currkey => $currval ) {
if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) {
- $name = $value = $whole = '';
+ $name = '';
+ $value = '';
+ $whole = '';
return false;
}
}
@@ -1226,30 +1274,31 @@
$attrname = '';
$uris = wp_kses_uri_attributes();
- // Loop through the whole attribute list
+ // Loop through the whole attribute list.
while ( strlen( $attr ) != 0 ) {
$working = 0; // Was the last operation successful?
switch ( $mode ) {
case 0:
- if ( preg_match( '/^([-a-zA-Z:]+)/', $attr, $match ) ) {
+ if ( preg_match( '/^([_a-zA-Z][-_a-zA-Z0-9:.]*)/', $attr, $match ) ) {
$attrname = $match[1];
- $working = $mode = 1;
- $attr = preg_replace( '/^[-a-zA-Z:]+/', '', $attr );
+ $working = 1;
+ $mode = 1;
+ $attr = preg_replace( '/^[_a-zA-Z][-_a-zA-Z0-9:.]*/', '', $attr );
}
break;
case 1:
- if ( preg_match( '/^\s*=\s*/', $attr ) ) { // equals sign
+ if ( preg_match( '/^\s*=\s*/', $attr ) ) { // Equals sign.
$working = 1;
$mode = 2;
$attr = preg_replace( '/^\s*=\s*/', '', $attr );
break;
}
- if ( preg_match( '/^\s+/', $attr ) ) { // valueless
+ if ( preg_match( '/^\s+/', $attr ) ) { // Valueless.
$working = 1;
$mode = 0;
if ( false === array_key_exists( $attrname, $attrarr ) ) {
@@ -1269,7 +1318,7 @@
if ( preg_match( '%^"([^"]*)"(\s+|/?$)%', $attr, $match ) ) {
// "value"
$thisval = $match[1];
- if ( in_array( strtolower( $attrname ), $uris ) ) {
+ if ( in_array( strtolower( $attrname ), $uris, true ) ) {
$thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
}
@@ -1290,7 +1339,7 @@
if ( preg_match( "%^'([^']*)'(\s+|/?$)%", $attr, $match ) ) {
// 'value'
$thisval = $match[1];
- if ( in_array( strtolower( $attrname ), $uris ) ) {
+ if ( in_array( strtolower( $attrname ), $uris, true ) ) {
$thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
}
@@ -1311,7 +1360,7 @@
if ( preg_match( "%^([^\s\"']+)(\s+|/?$)%", $attr, $match ) ) {
// value
$thisval = $match[1];
- if ( in_array( strtolower( $attrname ), $uris ) ) {
+ if ( in_array( strtolower( $attrname ), $uris, true ) ) {
$thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
}
@@ -1330,17 +1379,17 @@
}
break;
- } // switch
+ } // End switch.
- if ( $working == 0 ) { // not well formed, remove and try again
+ if ( 0 == $working ) { // Not well-formed, remove and try again.
$attr = wp_kses_html_error( $attr );
$mode = 0;
}
- } // while
+ } // End while.
- if ( $mode == 1 && false === array_key_exists( $attrname, $attrarr ) ) {
- // special case, for when the attribute list ends with a valueless
- // attribute like "selected"
+ if ( 1 == $mode && false === array_key_exists( $attrname, $attrarr ) ) {
+ // Special case, for when the attribute list ends with a valueless
+ // attribute like "selected".
$attrarr[ $attrname ] = array(
'name' => $attrname,
'value' => '',
@@ -1389,7 +1438,7 @@
$xhtml_slash = '';
}
- // Split it
+ // Split it.
$attrarr = wp_kses_hair_parse( $attr );
if ( false === $attrarr ) {
return false;
@@ -1422,25 +1471,25 @@
// phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
$regex =
- '(?:'
- . '[-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.
+ '(?:'
+ . '[_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.
// phpcs:enable
// Although it is possible to reduce this procedure to a single regexp,
@@ -1476,9 +1525,11 @@
switch ( strtolower( $checkname ) ) {
case 'maxlen':
- // The maxlen check makes sure that the attribute value has a length not
- // greater than the given value. This can be used to avoid Buffer Overflows
- // in WWW clients and various Internet servers.
+ /*
+ * The maxlen check makes sure that the attribute value has a length not
+ * greater than the given value. This can be used to avoid Buffer Overflows
+ * in WWW clients and various Internet servers.
+ */
if ( strlen( $value ) > $checkvalue ) {
$ok = false;
@@ -1486,8 +1537,10 @@
break;
case 'minlen':
- // The minlen check makes sure that the attribute value has a length not
- // smaller than the given value.
+ /*
+ * The minlen check makes sure that the attribute value has a length not
+ * smaller than the given value.
+ */
if ( strlen( $value ) < $checkvalue ) {
$ok = false;
@@ -1495,11 +1548,13 @@
break;
case 'maxval':
- // The maxval check does two things: it checks that the attribute value is
- // an integer from 0 and up, without an excessive amount of zeroes or
- // whitespace (to avoid Buffer Overflows). It also checks that the attribute
- // value is not greater than the given value.
- // This check can be used to avoid Denial of Service attacks.
+ /*
+ * The maxval check does two things: it checks that the attribute value is
+ * an integer from 0 and up, without an excessive amount of zeroes or
+ * whitespace (to avoid Buffer Overflows). It also checks that the attribute
+ * value is not greater than the given value.
+ * This check can be used to avoid Denial of Service attacks.
+ */
if ( ! preg_match( '/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value ) ) {
$ok = false;
@@ -1510,8 +1565,10 @@
break;
case 'minval':
- // The minval check makes sure that the attribute value is a positive integer,
- // and that it is not smaller than the given value.
+ /*
+ * The minval check makes sure that the attribute value is a positive integer,
+ * and that it is not smaller than the given value.
+ */
if ( ! preg_match( '/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value ) ) {
$ok = false;
@@ -1522,16 +1579,18 @@
break;
case 'valueless':
- // The valueless check makes sure if the attribute has a value
- // (like `<a href="blah">`) or not (`<option selected>`). If the given value
- // is a "y" or a "Y", the attribute must not have a value.
- // If the given value is an "n" or an "N", the attribute must have a value.
+ /*
+ * The valueless check makes sure if the attribute has a value
+ * (like `<a href="blah">`) or not (`<option selected>`). If the given value
+ * is a "y" or a "Y", the attribute must not have a value.
+ * If the given value is an "n" or an "N", the attribute must have a value.
+ */
if ( strtolower( $checkvalue ) != $vless ) {
$ok = false;
}
break;
- } // switch
+ } // End switch.
return $ok;
}
@@ -1583,7 +1642,7 @@
}
$string = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string );
- if ( 'remove' == $options['slash_zero'] ) {
+ if ( 'remove' === $options['slash_zero'] ) {
$string = preg_replace( '/\\\\+0+/', '', $string );
}
@@ -1654,15 +1713,16 @@
*
* @param string $string Content to check for bad protocols.
* @param string[] $allowed_protocols Array of allowed URL protocols.
+ * @param int $count Depth of call recursion to this function.
* @return string Sanitized content.
*/
function wp_kses_bad_protocol_once( $string, $allowed_protocols, $count = 1 ) {
$string = preg_replace( '/(�*58(?![;0-9])|�*3a(?![;a-f0-9]))/i', '$1;', $string );
- $string2 = preg_split( '/:|�*58;|�*3a;/i', $string, 2 );
+ $string2 = preg_split( '/:|�*58;|�*3a;|:/i', $string, 2 );
if ( isset( $string2[1] ) && ! preg_match( '%/\?%', $string2[0] ) ) {
$string = trim( $string2[1] );
$protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
- if ( 'feed:' == $protocol ) {
+ if ( 'feed:' === $protocol ) {
if ( $count > 2 ) {
return '';
}
@@ -1681,13 +1741,14 @@
* Callback for `wp_kses_bad_protocol_once()` regular expression.
*
* This function processes URL protocols, checks to see if they're in the
- * whitelist or not, and returns different data depending on the answer.
+ * list of allowed protocols or not, and returns different data depending
+ * on the answer.
*
* @access private
* @ignore
* @since 1.0.0
*
- * @param string $string URI scheme to check against the whitelist.
+ * @param string $string URI scheme to check against the list of allowed protocols.
* @param string[] $allowed_protocols Array of allowed URL protocols.
* @return string Sanitized content.
*/
@@ -1718,17 +1779,27 @@
* This function normalizes HTML entities. It will convert `AT&T` to the correct
* `AT&T`, `:` to `:`, `&#XYZZY;` to `&#XYZZY;` and so on.
*
- * @since 1.0.0
+ * When `$context` is set to 'xml', HTML entities are converted to their code points. For
+ * example, `AT&T…&#XYZZY;` is converted to `AT&T…&#XYZZY;`.
*
- * @param string $string Content to normalize entities.
+ * @since 1.0.0
+ * @since 5.5.0 Added `$context` parameter.
+ *
+ * @param string $string Content to normalize entities.
+ * @param string $context Context for normalization. Can be either 'html' or 'xml'.
+ * Default 'html'.
* @return string Content with normalized entities.
*/
-function wp_kses_normalize_entities( $string ) {
+function wp_kses_normalize_entities( $string, $context = 'html' ) {
// Disarm all entities by converting & to &
$string = str_replace( '&', '&', $string );
- // Change back the allowed entities in our entity whitelist
- $string = preg_replace_callback( '/&([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string );
+ // Change back the allowed entities in our list of allowed entities.
+ if ( 'xml' === $context ) {
+ $string = preg_replace_callback( '/&([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_xml_named_entities', $string );
+ } else {
+ $string = preg_replace_callback( '/&([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string );
+ }
$string = preg_replace_callback( '/&#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string );
$string = preg_replace_callback( '/&#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string );
@@ -1756,7 +1827,40 @@
}
$i = $matches[1];
- return ( ! in_array( $i, $allowedentitynames ) ) ? "&$i;" : "&$i;";
+ return ( ! in_array( $i, $allowedentitynames, true ) ) ? "&$i;" : "&$i;";
+}
+
+/**
+ * Callback for `wp_kses_normalize_entities()` regular expression.
+ *
+ * This function only accepts valid named entity references, which are finite,
+ * case-sensitive, and highly scrutinized by XML validators. HTML named entity
+ * references are converted to their code points.
+ *
+ * @since 5.5.0
+ *
+ * @global array $allowedentitynames
+ * @global array $allowedxmlnamedentities
+ *
+ * @param array $matches preg_replace_callback() matches array.
+ * @return string Correctly encoded entity.
+ */
+function wp_kses_xml_named_entities( $matches ) {
+ global $allowedentitynames, $allowedxmlnamedentities;
+
+ if ( empty( $matches[1] ) ) {
+ return '';
+ }
+
+ $i = $matches[1];
+
+ if ( in_array( $i, $allowedxmlnamedentities, true ) ) {
+ return "&$i;";
+ } elseif ( in_array( $i, $allowedentitynames, true ) ) {
+ return html_entity_decode( "&$i;", ENT_HTML5 );
+ }
+
+ return "&$i;";
}
/**
@@ -1819,10 +1923,10 @@
* @return bool Whether or not the codepoint is a valid Unicode codepoint.
*/
function valid_unicode( $i ) {
- return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
- ( $i >= 0x20 && $i <= 0xd7ff ) ||
- ( $i >= 0xe000 && $i <= 0xfffd ) ||
- ( $i >= 0x10000 && $i <= 0x10ffff ) );
+ return ( 0x9 == $i || 0xa == $i || 0xd == $i ||
+ ( 0x20 <= $i && $i <= 0xd7ff ) ||
+ ( 0xe000 <= $i && $i <= 0xfffd ) ||
+ ( 0x10000 <= $i && $i <= 0x10ffff ) );
}
/**
@@ -1830,7 +1934,7 @@
*
* This function decodes numeric HTML entities (`A` and `A`).
* It doesn't do anything with named entities like `ä`, but we don't
- * need them in the URL protocol whitelisting system anyway.
+ * need them in the allowed URL protocols system anyway.
*
* @since 1.0.0
*
@@ -1975,17 +2079,17 @@
* @since 2.0.0
*/
function kses_init_filters() {
- // Normal filtering
+ // Normal filtering.
add_filter( 'title_save_pre', 'wp_filter_kses' );
- // Comment filtering
+ // Comment filtering.
if ( current_user_can( 'unfiltered_html' ) ) {
add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
} else {
add_filter( 'pre_comment_content', 'wp_filter_kses' );
}
- // Post filtering
+ // Post filtering.
add_filter( 'content_save_pre', 'wp_filter_post_kses' );
add_filter( 'excerpt_save_pre', 'wp_filter_post_kses' );
add_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );
@@ -2004,14 +2108,14 @@
* @since 2.0.6
*/
function kses_remove_filters() {
- // Normal filtering
+ // Normal filtering.
remove_filter( 'title_save_pre', 'wp_filter_kses' );
- // Comment filtering
+ // Comment filtering.
remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
remove_filter( 'pre_comment_content', 'wp_filter_kses' );
- // Post filtering
+ // Post filtering.
remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
remove_filter( 'excerpt_save_pre', 'wp_filter_post_kses' );
remove_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );
@@ -2045,7 +2149,7 @@
*/
function safecss_filter_attr( $css, $deprecated = '' ) {
if ( ! empty( $deprecated ) ) {
- _deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
+ _deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented.
}
$css = wp_kses_no_null( $css );
@@ -2063,7 +2167,10 @@
* @since 4.6.0 Added support for `list-style-type`.
* @since 5.0.0 Added support for `background-image`.
* @since 5.1.0 Added support for `text-transform`.
- * @since 5.2.0 Added support for `background-position` and `grid-template-columns`
+ * @since 5.2.0 Added support for `background-position` and `grid-template-columns`.
+ * @since 5.3.0 Added support for `grid`, `flex` and `column` layout properties.
+ * Extend `background-*` support of individual properties.
+ * @since 5.3.1 Added support for gradient backgrounds.
*
* @param string[] $attr Array of allowed CSS attributes.
*/
@@ -2074,8 +2181,12 @@
'background-color',
'background-image',
'background-position',
+ 'background-size',
+ 'background-attachment',
+ 'background-blend-mode',
'border',
+ 'border-radius',
'border-width',
'border-color',
'border-style',
@@ -2100,6 +2211,14 @@
'border-collapse',
'caption-side',
+ 'columns',
+ 'column-count',
+ 'column-fill',
+ 'column-gap',
+ 'column-rule',
+ 'column-span',
+ 'column-width',
+
'color',
'font',
'font-family',
@@ -2134,14 +2253,39 @@
'padding-left',
'padding-top',
+ 'flex',
+ 'flex-basis',
+ 'flex-direction',
+ 'flex-flow',
+ 'flex-grow',
+ 'flex-shrink',
+
+ 'grid-template-columns',
+ 'grid-auto-columns',
+ 'grid-column-start',
+ 'grid-column-end',
+ 'grid-column-gap',
+ 'grid-template-rows',
+ 'grid-auto-rows',
+ 'grid-row-start',
+ 'grid-row-end',
+ 'grid-row-gap',
+ 'grid-gap',
+
+ 'justify-content',
+ 'justify-items',
+ 'justify-self',
+ 'align-content',
+ 'align-items',
+ 'align-self',
+
'clear',
'cursor',
'direction',
'float',
+ 'list-style-type',
'overflow',
'vertical-align',
- 'list-style-type',
- 'grid-template-columns',
)
);
@@ -2163,13 +2307,22 @@
'list-style-image',
);
+ /*
+ * CSS attributes that accept gradient data types.
+ *
+ */
+ $css_gradient_data_types = array(
+ 'background',
+ 'background-image',
+ );
+
if ( empty( $allowed_attr ) ) {
return $css;
}
$css = '';
foreach ( $css_array as $css_item ) {
- if ( $css_item == '' ) {
+ if ( '' === $css_item ) {
continue;
}
@@ -2177,6 +2330,7 @@
$css_test_string = $css_item;
$found = false;
$url_attr = false;
+ $gradient_attr = false;
if ( strpos( $css_item, ':' ) === false ) {
$found = true;
@@ -2185,8 +2339,9 @@
$css_selector = trim( $parts[0] );
if ( in_array( $css_selector, $allowed_attr, true ) ) {
- $found = true;
- $url_attr = in_array( $css_selector, $css_url_data_types, true );
+ $found = true;
+ $url_attr = in_array( $css_selector, $css_url_data_types, true );
+ $gradient_attr = in_array( $css_selector, $css_gradient_data_types, true );
}
}
@@ -2205,7 +2360,7 @@
$url = trim( $url_pieces[2] );
- if ( empty( $url ) || $url !== wp_kses_bad_protocol( $url, $allowed_protocols ) ) {
+ if ( empty( $url ) || wp_kses_bad_protocol( $url, $allowed_protocols ) !== $url ) {
$found = false;
break;
} else {
@@ -2215,13 +2370,40 @@
}
}
- // Remove any CSS containing containing \ ( & } = or comments, except for url() useage checked above.
- if ( $found && ! preg_match( '%[\\\(&=}]|/\*%', $css_test_string ) ) {
- if ( $css != '' ) {
- $css .= ';';
+ if ( $found && $gradient_attr ) {
+ $css_value = trim( $parts[1] );
+ if ( preg_match( '/^(repeating-)?(linear|radial|conic)-gradient\(([^()]|rgb[a]?\([^()]*\))*\)$/', $css_value ) ) {
+ // Remove the whole `gradient` bit that was matched above from the CSS.
+ $css_test_string = str_replace( $css_value, '', $css_test_string );
}
+ }
- $css .= $css_item;
+ if ( $found ) {
+ // Check for any CSS containing \ ( & } = or comments, except for url() usage checked above.
+ $allow_css = ! preg_match( '%[\\\(&=}]|/\*%', $css_test_string );
+
+ /**
+ * Filters the check for unsafe CSS in `safecss_filter_attr`.
+ *
+ * Enables developers to determine whether a section of CSS should be allowed or discarded.
+ * By default, the value will be false if the part contains \ ( & } = or comments.
+ * Return true to allow the CSS part to be included in the output.
+ *
+ * @since 5.5.0
+ *
+ * @param bool $allow_css Whether the CSS in the test string is considered safe.
+ * @param string $css_test_string The CSS string to test.
+ */
+ $allow_css = apply_filters( 'safecss_filter_attr_allow_css', $allow_css, $css_test_string );
+
+ // Only add the CSS part if it passes the regex check.
+ if ( $allow_css ) {
+ if ( '' !== $css ) {
+ $css .= ';';
+ }
+
+ $css .= $css_item;
+ }
}
}
@@ -2229,7 +2411,7 @@
}
/**
- * Helper function to add global attributes to a tag in the allowed html list.
+ * Helper function to add global attributes to a tag in the allowed HTML list.
*
* @since 3.5.0
* @since 5.0.0 Add support for `data-*` wildcard attributes.