Ticket #26706: 26706.2.diff

src/wp-includes/default-filters.php

@@ -301 +301 @@
 add_filter( 'authenticate', 'wp_authenticate_username_password',  20, 3 );
 add_filter( 'authenticate', 'wp_authenticate_spam_check',         99    );
 
+// Default user checking filters
+add_filter( 'determine_current_user', 'wp_validate_auth_cookie' );
+add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 );
+
 unset($filter, $action);

src/wp-includes/pluggable.php

@@ -97 +97 @@
                 return false;
         }
 
-        if ( ! $user = wp_validate_auth_cookie() ) {
-                 if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[LOGGED_IN_COOKIE] ) || !$user = wp_validate_auth_cookie( $_COOKIE[LOGGED_IN_COOKIE], 'logged_in' ) ) {
-                        wp_set_current_user( 0 );
-                        return false;
-                 }
+        /**
+         * Determine the current user based on request data.
+         *
+         * The default filters use this to determine the current user from the
+         * request's cookies, if available.
+         *
+         * @since 3.9.0
+         *
+         * @param int|boolean $user_id User ID if determined, or false otherwise.
+         */
+        $user_id = apply_filters( 'determine_current_user', false );
+        if ( ! $user_id ) {
+                wp_set_current_user( 0 );
+                return false;
         }
 
-        wp_set_current_user( $user );
+        wp_set_current_user( $user_id );
 }
 endif;
 

src/wp-includes/user.php

@@ -220 +220 @@
 }
 
 /**
+ * Validates logged in cookie.
+ *
+ * Checks the logged_in cookie if the previous auth cookie could not be
+ * validated and parsed.
+ *
+ * This is a callback for the determine_current_user filter, rather than API.
+ *
+ * @since 3.9.0
+ *
+ * @param mixed $user The user ID (or null) as received from the determine_current_user filter.
+ * @return int|boolean User ID if validated, or false otherwise.
+ */
+function wp_validate_logged_in_cookie( $user_id ) {
+        if ( $user_id ) {
+                return $user_id;
+        }
+
+        if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[LOGGED_IN_COOKIE] ) ) {
+                return false;
+        }
+
+        return wp_validate_auth_cookie( $_COOKIE[LOGGED_IN_COOKIE], 'logged_in' );
+}
+
+/**
  * Number of posts user has written.
  *
  * @since 3.0.0