Make WordPress Core

Changeset 47659


Ignore:
Timestamp:
04/29/2020 04:53:40 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.0 branch.

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

Location:
branches/4.0
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/4.0/src/wp-includes/cache.php

    r29454 r47659  
    640640        echo '<ul>';
    641641        foreach ($this->cache as $group => $cache) {
    642             echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';
     642            echo '<li><strong>Group:</strong> ' . esc_html( $group ) . ' - ( ' . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';
    643643        }
    644644        echo '</ul>';
  • branches/4.0/src/wp-includes/formatting.php

    r37819 r47659  
    11621162    $filename_raw = $filename;
    11631163    $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0));
     1164
     1165    // Check for support for utf8 in the installed PCRE library once and store the result in a static.
     1166    static $utf8_pcre = null;
     1167    if ( ! isset( $utf8_pcre ) ) {
     1168        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
     1169        $utf8_pcre = @preg_match( '/^./u', 'a' );
     1170    }
     1171
     1172    if ( ! seems_utf8( $filename ) ) {
     1173        $_ext     = pathinfo( $filename, PATHINFO_EXTENSION );
     1174        $_name    = pathinfo( $filename, PATHINFO_FILENAME );
     1175        $filename = sanitize_title_with_dashes( $_name ) . '.' . $_ext;
     1176    }
     1177
     1178    if ( $utf8_pcre ) {
     1179        $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
     1180    }
     1181
    11641182    /**
    11651183     * Filter the list of characters to remove from a filename.
     
    11711189     */
    11721190    $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
    1173     $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
    11741191    $filename = str_replace($special_chars, '', $filename);
    11751192    $filename = str_replace( array( '%20', '+' ), '-', $filename );
  • branches/4.0/src/wp-includes/query.php

    r46502 r47659  
    15921592        } elseif ( $qv['p'] ) {
    15931593            $this->is_single = true;
    1594         } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {
    1595             // If year, month, day, hour, minute, and second are set, a single
    1596             // post is being queried.
    1597             $this->is_single = true;
    15981594        } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) {
    15991595            $this->is_page = true;
  • branches/4.0/src/wp-includes/user.php

    r30431 r47659  
    18191819
    18201820    if ( $update ) {
    1821         if ( $user_email !== $old_user_data->user_email ) {
     1821        if ( $user_email !== $old_user_data->user_email || $user_pass !== $old_user_data->user_pass ) {
    18221822            $data['user_activation_key'] = '';
    18231823        }
  • branches/4.0/tests/phpunit/tests/formatting/SanitizeFileName.php

    r37819 r47659  
    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.0/tests/phpunit/tests/user.php

    r40455 r47659  
    616616    }
    617617
    618     function test_changing_email_invalidates_password_reset_key() {
     618    public function test_changing_email_invalidates_password_reset_key() {
    619619        global $wpdb;
    620620
     
    647647        $this->assertEmpty( $user->user_activation_key );
    648648    }
     649
     650    public function test_changing_password_invalidates_password_reset_key() {
     651        global $wpdb;
     652
     653        $user = $this->factory->user->create_and_get();
     654        $wpdb->update( $wpdb->users, array( 'user_activation_key' => 'key' ), array( 'ID' => $user->ID ) );
     655        clean_user_cache( $user );
     656
     657        $user = get_userdata( $user->ID );
     658        $this->assertEquals( 'key', $user->user_activation_key );
     659
     660        $userdata = array(
     661            'ID'        => $user->ID,
     662            'user_pass' => 'password',
     663        );
     664        wp_update_user( $userdata );
     665
     666        $user = get_userdata( $user->ID );
     667        $this->assertEmpty( $user->user_activation_key );
     668    }
     669
    649670}
Note: See TracChangeset for help on using the changeset viewer.