Changeset 52473

Timestamp:

01/06/2022 06:13:41 PM ( 2 years ago)

Author:

desrosj

Message:

Grouped backports to the 5.0 branch.

• Query: Improve sanitization within WP_Tax_Query .
• Query: Improve sanitization within WP_Meta_Query .
• Upgrade/Install: Avoid using unserialize() unnecessarily.
• Formatting: Correctly encode ASCII characters in post slugs.

Merges [52454-52457] to the 5.0 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.

Location:

branches/5.0

Files:

• . (modified) ( 1 prop )
• src/wp-admin/includes/upgrade.php (modified) ( 1 diff )
• src/wp-includes/class-wp-meta-query.php (modified) ( 1 diff )
• src/wp-includes/class-wp-tax-query.php (modified) ( 2 diffs )
• src/wp-includes/formatting.php (modified) ( 2 diffs )
• src/wp-includes/post.php (modified) ( 1 diff )

branches/5.0/src/wp-admin/includes/upgrade.php

@@ -one thousand three hundred and twenty-six +one thousand three hundred and twenty-six @@
          while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
              foreach ( $rows as $row ) {
-                 $value = $row->option_value ;
-                 if ( !@ unserialize( $value ) )
+                 $value = maybe_unserialize( $row->option_value ) ;
+                 if ( $value === $row->option_value )
                      $value = stripslashes( $value );
                  if ( $value !== $row->option_value ) {

branches/5.0/src/wp-includes/class-wp-meta-query.php

@@ -six hundred and ninety-six +six hundred and ninety-six @@
              $sibling_compare = strtoupper( $sibling['compare'] );
              if ( in_array( $clause_compare, $compatible_compares ) && in_array( $sibling_compare, $compatible_compares ) ) {
-                 $alias = $sibling['alias'] ;
+                 $alias = preg_replace( '/\W/', '_', $sibling['alias'] ) ;
                  break;
              }

branches/5.0/src/wp-includes/class-wp-tax-query.php

@@ -five hundred and twenty-eight +five hundred and twenty-eight @@
              // The sibling must both have compatible operator to share its alias.
              if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators ) ) {
-                 $alias = $sibling['alias'] ;
+                 $alias = preg_replace( '/\W/', '_', $sibling['alias'] ) ;
                  break;
              }
@@ -five hundred and fifty-seven +five hundred and fifty-seven @@
          }
 
-         $query['terms'] = array_unique( (array) $query['terms'] );
+         if ( 'slug' === $query['field'] || 'name' === $query['field'] ) {
+             $query['terms'] = array_unique( (array) $query['terms'] );
+         } else {
+             $query['terms'] = wp_parse_id_list( $query['terms'] );
+         }
 
          if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {

branches/5.0/src/wp-includes/formatting.php

@@ -one thousand and eighty-five +one thousand and eighty-five @@
   *
   * @since 1.5.0
-  *
-  * @param string $utf8_string
-  * @param int    $length Max  length of the string
+  * @since 5.8.3 Added the `encode_ascii_characters` parameter.
+  *
+  * @param string $utf8_string             String to encode.
+  * @param int    $length                  Max length of the string
+  * @param bool   $encode_ascii_characters Whether to encode ascii characters such as < " '
   * @return string String with Unicode encoded for URI.
   */
- function utf8_uri_encode( $utf8_string, $length = 0 ) {
+ function utf8_uri_encode( $utf8_string, $length = 0 , $encode_ascii_characters = false ) {
      $unicode        = '';
      $values         = array();
@@ -one thousand one hundred and five +one thousand one hundred and seven @@
 
          if ( $value < 128 ) {
-             if ( $length && ( $unicode_length >= $length ) ) {
+             $char                = chr( $value );
+             $encoded_char        = $encode_ascii_characters ?  rawurlencode( $char ) : $char;
+             $encoded_char_length = strlen( $encoded_char );
+             if ( $length && ( $unicode_length + $encoded_char_length ) > $length ) {
                  break;
              }
-             $unicode .= chr( $value ) ;
-             $unicode_length ++ ;
+             $unicode        .= $ encoded_char ;
+             $unicode_length  += $encoded_char_length ;
          } else {
              if ( count( $values ) == 0 ) {

branches/5.0/src/wp-includes/post.php

@@ -four thousand and sixty +four thousand and sixty @@
              $slug = substr( $slug, 0, $length );
          else
-             $slug = utf8_uri_encode( $decoded_slug, $length );
+             $slug = utf8_uri_encode( $decoded_slug, $length , true );
      }