Changeset 17227

Timestamp:

01/06/2011 04:08:23 AM (14 years ago)

Author:

ryan

Message:

Add some cookie filters to allow plugins more control over SSL cookie delivery. see #15330

Location:

trunk/wp-includes

Files:

• pluggable.php (modified) (4 diffs)
• user.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -672 +672 @@
         $secure = is_ssl();
 
+    $secure = apply_filters('secure_auth_cookie', $secure, $user_id);
+    $secure_logged_in_cookie = apply_filters('secure_logged_in_cookie', false, $user_id, $secure);
+
     if ( $secure ) {
         $auth_cookie_name = SECURE_AUTH_COOKIE;
@@ -690 +693 @@
         setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
         setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
-        setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, false, true);
+        setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
         if ( COOKIEPATH != SITECOOKIEPATH )
-            setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, false, true);
+            setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
     } else {
         $cookie_domain = COOKIE_DOMAIN;
@@ -699 +702 @@
         setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, $cookie_domain, $secure);
         setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, $cookie_domain, $secure);
-        setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, $cookie_domain);
+        setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, $cookie_domain, $secure_logged_in_cookie);
         if ( COOKIEPATH != SITECOOKIEPATH )
-            setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, $cookie_domain);
+            setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, $cookie_domain, $secure_logged_in_cookie);
     }
 }
@@ -764 +767 @@
 
     $secure = ( is_ssl() || force_ssl_admin() );
+
+    $secure = apply_filters('secure_auth_redirect', $secure);
 
     // If https is required and request is http, redirect

trunk/wp-includes/user.php

@@ -43 +43 @@
     if ( '' === $secure_cookie )
         $secure_cookie = is_ssl();
+
+    $secure_cookie = apply_filters('secure_signon_cookie', $secure_cookie, $credentials);
 
     global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie