Context Navigation

← Previous Change
Next Change →

pluggable.php

Timestamp:

02/06/2008 09:19:47 PM (18 years ago)

Author:

ryan

Message:

Remove cookie checking from check_ajax_referer(). Check nonces instead. Props mdawaffe. fixes #5782

File:

: 1 edited

trunk/wp-includes/pluggable.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/wp-includes/pluggable.php

-              r6726
+              r6739
+ *
  * @param string $action Action nonce
+ */
+function check_admin_referer($action = -1) {
+ * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5)
+ */
+function check_admin_referer($action = -1, $query_arg = '_wpnonce' ) {
         $adminurl = strtolower(get_option('siteurl')).'/wp-admin';
         $referer = strtolower(wp_get_referer());
         if ( !wp_verify_nonce($_REQUEST['_wpnonce'], $action) &&
+        if ( !wp_verify_nonce($_REQUEST[$query_arg], $action) &&
                 !(-1 == $action && strpos($referer, $adminurl) !== false)) {
                 wp_nonce_ays($action);
 …
+ *
  * @param string $action Action nonce
+ */
+function check_ajax_referer( $action = -1 ) {
+        $nonce = $_REQUEST['_ajax_nonce'] ? $_REQUEST['_ajax_nonce'] : $_REQUEST['_wpnonce'];
+        if ( !wp_verify_nonce( $nonce, $action ) ) {
+                $current_id = '';
+                if ( ( $current = wp_get_current_user() ) && $current->ID )
+                        $current_id = $current->ID;
+                if ( !$current_id )
+                        die('-1');
+                $auth_cookie = '';
+                $cookie = explode('; ', urldecode(empty($_POST['cookie']) ? $_GET['cookie'] : $_POST['cookie'])); // AJAX scripts must pass cookie=document.cookie
+                foreach ( $cookie as $tasty ) {
+                        if ( false !== strpos($tasty, AUTH_COOKIE . '=') ) {
+                                $auth_cookie = substr(strstr($tasty, '='), 1);
+                                break;
+                        }
+                }
+                if ( empty($auth_cookie) )
+                        die('-1');
+                if ( ! $user_id = wp_validate_auth_cookie( $auth_cookie ) )
+                        die('-1');
+                if ( $current_id != $user_id )
+                        die('-1');
+        }
+ * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5)
+ */
+function check_ajax_referer( $action = -1, $query_arg = false ) {
+        if ( $query_arg )
+                $nonce = $_REQUEST[$query_arg];
+        else
+                $nonce = $_REQUEST['_ajax_nonce'] ? $_REQUEST['_ajax_nonce'] : $_REQUEST['_wpnonce'];
+        if ( !wp_verify_nonce( $nonce, $action ) )
+                die('-1');
         do_action('check_ajax_referer');
+}

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 6739 for trunk/wp-includes/pluggable.php

Legend:

trunk/wp-includes/pluggable.php

Download in other formats: