<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28609] trunk: Forcing SSL logins now forces SSL for the entire admin, with no middle ground.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28609">28609</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-05-29 03:58:41 +0000 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Forcing SSL logins now forces SSL for the entire admin, with no middle ground.
fixes <a href="http://core.trac.wordpress.org/ticket/10267">#10267</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunktestsphpunittestsurlphp">trunk/tests/phpunit/tests/url.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/default-constants.php (28608 => 28609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/default-constants.php 2014-05-29 03:57:44 UTC (rev 28608)
+++ trunk/src/wp-includes/default-constants.php 2014-05-29 03:58:41 UTC (rev 28609)
</span><span class="lines">@@ -247,16 +247,17 @@
</span><span class="cx"> /**
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> */
</span><del>- if ( !defined('FORCE_SSL_ADMIN') )
- define('FORCE_SSL_ADMIN', false);
- force_ssl_admin(FORCE_SSL_ADMIN);
</del><ins>+ if ( !defined( 'FORCE_SSL_ADMIN' ) )
+ define( 'FORCE_SSL_ADMIN', false );
+ force_ssl_admin( FORCE_SSL_ADMIN );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @since 2.6.0
</span><ins>+ * @deprecated 4.0.0
</ins><span class="cx"> */
</span><del>- if ( !defined('FORCE_SSL_LOGIN') )
- define('FORCE_SSL_LOGIN', false);
- force_ssl_login(FORCE_SSL_LOGIN);
</del><ins>+ if ( defined( 'FORCE_SSL_LOGIN' ) && FORCE_SSL_LOGIN ) {
+ force_ssl_admin( true );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/functions.php (28608 => 28609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/functions.php 2014-05-29 03:57:44 UTC (rev 28608)
+++ trunk/src/wp-includes/functions.php 2014-05-29 03:58:41 UTC (rev 28609)
</span><span class="lines">@@ -3387,15 +3387,7 @@
</span><span class="cx"> * @return bool True if forced, false if not forced.
</span><span class="cx"> */
</span><span class="cx"> function force_ssl_login( $force = null ) {
</span><del>- static $forced = false;
-
- if ( !is_null( $force ) ) {
- $old_forced = $forced;
- $forced = $force;
- return $old_forced;
- }
-
- return $forced;
</del><ins>+ return force_ssl_admin( $force );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4305,9 +4297,6 @@
</span><span class="cx"> $current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
</span><span class="cx"> $same_domain = ( strpos( $login_url, $current_domain ) === 0 );
</span><span class="cx">
</span><del>- if ( $same_domain && force_ssl_login() && ! force_ssl_admin() )
- $same_domain = false;
-
</del><span class="cx"> /**
</span><span class="cx"> * Filter whether the authentication check originated at the same domain.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/link-template.php (28608 => 28609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/link-template.php 2014-05-29 03:57:44 UTC (rev 28608)
+++ trunk/src/wp-includes/link-template.php 2014-05-29 03:58:41 UTC (rev 28609)
</span><span class="lines">@@ -2845,15 +2845,13 @@
</span><span class="cx"> */
</span><span class="cx"> function set_url_scheme( $url, $scheme = null ) {
</span><span class="cx"> $orig_scheme = $scheme;
</span><del>- if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
- if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
- $scheme = 'https';
- elseif ( ( 'login' == $scheme ) && force_ssl_admin() )
- $scheme = 'https';
- elseif ( ( 'admin' == $scheme ) && force_ssl_admin() )
- $scheme = 'https';
- else
- $scheme = ( is_ssl() ? 'https' : 'http' );
</del><ins>+
+ if ( ! $scheme ) {
+ $scheme = is_ssl() ? 'https' : 'http';
+ } elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+ $scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
+ } elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+ $scheme = is_ssl() ? 'https' : 'http';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $url = trim( $url );
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-login.php (28608 => 28609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-login.php 2014-05-29 03:57:44 UTC (rev 28608)
+++ trunk/src/wp-login.php 2014-05-29 03:58:41 UTC (rev 28609)
</span><span class="lines">@@ -741,12 +741,6 @@
</span><span class="cx">
</span><span class="cx"> $reauth = empty($_REQUEST['reauth']) ? false : true;
</span><span class="cx">
</span><del>- // If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure
- // cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting
- // the admin via http or https.
- if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
- $secure_cookie = false;
-
</del><span class="cx"> $user = wp_signon( '', $secure_cookie );
</span><span class="cx">
</span><span class="cx"> if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsurlphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/url.php (28608 => 28609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/url.php 2014-05-29 03:57:44 UTC (rev 28608)
+++ trunk/tests/phpunit/tests/url.php 2014-05-29 03:58:41 UTC (rev 28609)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> // tests for link-template.php and related URL functions
</span><ins>+/**
+ * @group url
+ */
</ins><span class="cx"> class Tests_URL extends WP_UnitTestCase {
</span><span class="cx"> var $_old_server;
</span><span class="cx"> function setUp() {
</span><span class="lines">@@ -264,9 +267,9 @@
</span><span class="cx"> $this->assertEquals( $http_links[ $i ], set_url_scheme( $link, 'rpc' ) );
</span><span class="cx">
</span><span class="cx"> force_ssl_login( true );
</span><del>- $this->assertEquals( $http_links[ $i ], set_url_scheme( $link, 'admin' ) );
</del><ins>+ $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'admin' ) );
</ins><span class="cx"> $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'login_post' ) );
</span><del>- $this->assertEquals( $http_links[ $i ], set_url_scheme( $link, 'login' ) );
</del><ins>+ $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'login' ) );
</ins><span class="cx"> $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'rpc' ) );
</span><span class="cx">
</span><span class="cx"> $i++;
</span></span></pre>
</div>
</div>
</body>
</html>