Make WordPress Core

Changeset 47656


Ignore:
Timestamp:
04/29/2020 04:48:42 PM (4 years ago)
Author:
whyisjake
Message:

User: Invalidate user_activation_key on password update.
Query: Ensure that only a single post can be returned on date/time based queries.
Cache API: Ensure proper escaping around the stats method in the cache API.
Formatting: Expand sanitize_file_name to have better support for utf8 characters.

Brings the changes in [47634], [47635], [47637], and [47638] to the 4.3 branch.

Props: batmoo, ehti, nickdaugherty, peterwilsoncc, sergeybiryukov, sstoqnov, westi, whyisjake, whyisjake, xknown.

Location:
branches/4.3
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/4.3

  • branches/4.3/src/wp-includes/cache.php

    r32539 r47656  
    654654        echo '<ul>';
    655655        foreach ($this->cache as $group => $cache) {
    656             echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';
     656            echo '<li><strong>Group:</strong> ' . esc_html( $group ) . ' - ( ' . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';
    657657        }
    658658        echo '</ul>';
  • branches/4.3/src/wp-includes/formatting.php

    r37814 r47656  
    13101310    $filename_raw = $filename;
    13111311    $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0));
     1312
     1313    // Check for support for utf8 in the installed PCRE library once and store the result in a static.
     1314    static $utf8_pcre = null;
     1315    if ( ! isset( $utf8_pcre ) ) {
     1316        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
     1317        $utf8_pcre = @preg_match( '/^./u', 'a' );
     1318    }
     1319
     1320    if ( ! seems_utf8( $filename ) ) {
     1321        $_ext     = pathinfo( $filename, PATHINFO_EXTENSION );
     1322        $_name    = pathinfo( $filename, PATHINFO_FILENAME );
     1323        $filename = sanitize_title_with_dashes( $_name ) . '.' . $_ext;
     1324    }
     1325
     1326    if ( $utf8_pcre ) {
     1327        $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
     1328    }
     1329
    13121330    /**
    13131331     * Filter the list of characters to remove from a filename.
     
    13191337     */
    13201338    $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
    1321     $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
    13221339    $filename = str_replace( $special_chars, '', $filename );
    13231340    $filename = str_replace( array( '%20', '+' ), '-', $filename );
  • branches/4.3/src/wp-includes/query.php

    r46499 r47656  
    16001600        } elseif ( $qv['p'] ) {
    16011601            $this->is_single = true;
    1602         } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {
    1603             // If year, month, day, hour, minute, and second are set, a single
    1604             // post is being queried.
    1605             $this->is_single = true;
    16061602        } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) {
    16071603            $this->is_page = true;
  • branches/4.3/src/wp-includes/user.php

    r34118 r47656  
    20522052
    20532053    if ( $update ) {
    2054         if ( $user_email !== $old_user_data->user_email ) {
     2054        if ( $user_email !== $old_user_data->user_email || $user_pass !== $old_user_data->user_pass ) {
    20552055            $data['user_activation_key'] = '';
    20562056        }
  • branches/4.3/tests/phpunit/tests/formatting/SanitizeFileName.php

    r37814 r47656  
    6161        $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) );
    6262    }
     63
     64    /**
     65     * @dataProvider data_wp_filenames
     66     */
     67    function test_replaces_invalid_utf8_characters( $input, $expected ) {
     68        $this->assertEquals( $expected, sanitize_file_name( $input ) );
     69    }
     70
     71    function data_wp_filenames() {
     72        return array(
     73            array( urldecode( '%B1myfile.png' ), 'myfile.png' ),
     74            array( urldecode( '%B1myfile' ), 'myfile' ),
     75            array( 'demo bar.png', 'demo-bar.png' ),
     76            array( 'demo' . json_decode( '"\u00a0"' ) . 'bar.png', 'demo-bar.png' ),
     77        );
     78    }
    6379}
  • branches/4.3/tests/phpunit/tests/user.php

    r34118 r47656  
    565565    }
    566566
    567     function test_changing_email_invalidates_password_reset_key() {
     567    public function test_changing_email_invalidates_password_reset_key() {
    568568        global $wpdb;
    569569
     
    590590            'user_nicename' => 'cat',
    591591            'user_email'    => 'foo@bar.dev',
     592        );
     593        wp_update_user( $userdata );
     594
     595        $user = get_userdata( $user->ID );
     596        $this->assertEmpty( $user->user_activation_key );
     597    }
     598
     599    public function test_changing_password_invalidates_password_reset_key() {
     600        global $wpdb;
     601
     602        $user = $this->factory->user->create_and_get();
     603        $wpdb->update( $wpdb->users, array( 'user_activation_key' => 'key' ), array( 'ID' => $user->ID ) );
     604        clean_user_cache( $user );
     605
     606        $user = get_userdata( $user->ID );
     607        $this->assertEquals( 'key', $user->user_activation_key );
     608
     609        $userdata = array(
     610            'ID'        => $user->ID,
     611            'user_pass' => 'password',
    592612        );
    593613        wp_update_user( $userdata );
Note: See TracChangeset for help on using the changeset viewer.