Changeset 37146

Timestamp:

03/30/2016 06:40:18 PM (10 years ago)

Author:

jorbin

Message:

Add Nonce to updating wporg_favorites user meta field

Merges [37145] to the 4.4 branch

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• src/wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (1 diff)
• src/wp-admin/includes/plugin-install.php (modified) (2 diffs)
• src/wp-admin/js/theme.js (modified) (2 diffs)
• src/wp-admin/theme-install.php (modified) (2 diffs)

branches/4.4/src/wp-admin/includes/ajax-actions.php

@@ -2753 +2753 @@
 
         if ( ! $post = get_post( (int) $_REQUEST['post_id'] ) )
-                wp_send_json_error();
+                wp_send_json_error(111);
 
         if ( ! current_user_can( 'read_post', $post->ID ) )
-                wp_send_json_error();
+                wp_send_json_error(222);
 
         // Really just pre-loading the cache here.
         if ( ! $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) ) )
-                wp_send_json_error();
+                wp_send_json_error(333);
 
         $return = array();
@@ -3311 +3311 @@
         }
 
+        check_ajax_referer( 'save_wporg_username_' . get_current_user_id() );
+
         $username = isset( $_REQUEST['username'] ) ? wp_unslash( $_REQUEST['username'] ) : false;
 

branches/4.4/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -171 +171 @@
 
                         case 'favorites':
-                                $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-                                update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+                                $action = 'save_wporg_username_' . get_current_user_id();
+                                if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
+                                        $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+                                        update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+                                } else {
+                                        $user = get_user_option( 'wporg_favorites' );
+                                }
                                 if ( $user )
                                         $args['user'] = $user;

branches/4.4/src/wp-admin/includes/plugin-install.php

@@ -301 +301 @@
  */
 function install_plugins_favorites_form() {
-        $user = ! empty( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+        $user   = get_user_option( 'wporg_favorites' );
+        $action = 'save_wporg_username_' . get_current_user_id();
         ?>
         <p class="install-help"><?php _e( 'If you have marked plugins as favorites on WordPress.org, you can browse them here.' ); ?></p>
@@ -310 +311 @@
                         <input type="search" id="user" name="user" value="<?php echo esc_attr( $user ); ?>" />
                         <input type="submit" class="button" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+                        <input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" /> 
                 </p>
         </form>

branches/4.4/src/wp-admin/js/theme.js

@@ -1521 +1521 @@
         saveUsername: function ( event ) {
                 var username = $( '#wporg-username-input' ).val(),
+                        nonce = $( '#wporg-username-nonce' ).val(),
                         request = { browse: 'favorites', user: username },
                         that = this;
@@ -1535 +1536 @@
                 return wp.ajax.send( 'save-wporg-username', {
                         data: {
+                                _wpnonce: nonce,
                                 username: username
                         },

branches/4.4/src/wp-admin/theme-install.php

@@ -149 +149 @@
                 <div class="favorites-form">
                         <?php
-                        $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-                        update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+                        $action = 'save_wporg_username_' . get_current_user_id();
+                        if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
+                                $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+                                update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+                        } else {
+                                $user = get_user_option( 'wporg_favorites' );
+                        }
                         ?>
                         <p class="install-help"><?php _e( 'If you have marked themes as favorites on WordPress.org, you can browse them here.' ); ?></p>
@@ -156 +161 @@
                         <p>
                                 <label for="user"><?php _e( 'Your WordPress.org username:' ); ?></label>
+                                <input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" />
                                 <input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
                                 <input type="button" class="button button-secondary favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />