<!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>[12209] sites/trunk/common/includes/wporg-sso: Login: SSO: Move from using a constant `WPOrg_SSO::SSO_HOST` to using a class property to allow SSO to be tested on local environments.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12209">12209</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12209","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-07 03:14:53 +0000 (Mon, 07 Nov 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Login: SSO: Move from using a constant `WPOrg_SSO::SSO_HOST` to using a class property to allow SSO to be tested on local environments.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludeswporgssoclasswporgssophp">sites/trunk/common/includes/wporg-sso/class-wporg-sso.php</a></li>
<li><a href="#sitestrunkcommonincludeswporgssowppluginphp">sites/trunk/common/includes/wporg-sso/wp-plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkcommonincludeswporgssoclasswporgssophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/wporg-sso/class-wporg-sso.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/wporg-sso/class-wporg-sso.php 2022-11-07 03:02:46 UTC (rev 12208)
+++ sites/trunk/common/includes/wporg-sso/class-wporg-sso.php 2022-11-07 03:14:53 UTC (rev 12209)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @author stephdau
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WPOrg_SSO {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const SSO_HOST = 'login.wordpress.org';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const SUPPORT_EMAIL = 'forum-password-resets@wordpress.org';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,12 +19,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp.org'
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $sso_host_url;
- public $sso_login_url;
- public $sso_signup_url;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $sso_host = 'login.wordpress.org';
+ public $sso_host_url = '';
+ public $sso_login_url = '';
+ public $sso_signup_url = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $host;
- public $script;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $host = '';
+ public $script = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private static $instance = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor, instantiate common properties
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sso_host_url = 'https://' . self::SSO_HOST;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // On local installations, the SSO host is always the current sites domain and scheme.
+ if ( 'local' === wp_get_environment_type() ) {
+ $this->sso_host = wp_parse_url( home_url(), PHP_URL_HOST );
+ $this->sso_host_url = untrailingslashit( home_url() ); // Respect scheme, domain, and port.
+ } else {
+ $this->sso_host_url = 'https://' . $this->sso_host;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sso_login_url = $this->sso_host_url . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sso_signup_url = $this->sso_host_url . '/register';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $host = ( ! $url || ! isset( $url['host'] ) ) ? null : $url['host'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // If not on the SSO host, add login.wordpress.org, to be safe
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $host = self::SSO_HOST;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $host = $this->sso_host;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we got a host by now, it's a safe wordpress.org-based one, add it to the list of allowed redirects
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if current host is the SSO host, false if not.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_sso_host() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return self::SSO_HOST === $this->host;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->sso_host === $this->host;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,10 +152,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We didn't get a redirect_to, but we got a referrer, use that if a valid target.
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to_referrer = $_SERVER['HTTP_REFERER'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->_is_valid_targeted_domain( $redirect_to_referrer ) && self::SSO_HOST != parse_url( $redirect_to_referrer, PHP_URL_HOST ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->_is_valid_targeted_domain( $redirect_to_referrer ) && $this->sso_host != parse_url( $redirect_to_referrer, PHP_URL_HOST ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = $redirect_to_referrer;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( self::SSO_HOST !== $this->host ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $this->is_sso_host() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Otherwise, attempt to guess the parent dir of where they came from and validate that.
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to_source_parent = preg_replace( '/\/[^\/]+\.php\??.*$/', '/', "https://{$this->host}{$_SERVER['REQUEST_URI']}" );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->_is_valid_targeted_domain( $redirect_to_source_parent ) ) {
</span></span></pre></div>
<a id="sitestrunkcommonincludeswporgssowppluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/wporg-sso/wp-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/wporg-sso/wp-plugin.php 2022-11-07 03:02:46 UTC (rev 12208)
+++ sites/trunk/common/includes/wporg-sso/wp-plugin.php 2022-11-07 03:14:53 UTC (rev 12209)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'login_url', array( $this, 'login_url' ), 20, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( self::SSO_HOST === $this->host ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( $this->is_sso_host() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If on the SSO host
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! preg_match( '!/wp-login\.php$!', $this->script ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // ... but not on its login screen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,8 +375,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @example add_action( 'network_site_url', array( $this, 'login_network_site_url' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function login_network_site_url( $url, $path, $scheme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( self::SSO_HOST === $this->host && preg_match( '!/wp-login\.php$!', $this->script ) ) {
- $url = preg_replace( '!^(https?://)[^/]+(/.+)$!' , '\1'.self::SSO_HOST.'\2', $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_sso_host() && preg_match( '!/wp-login\.php$!', $this->script ) ) {
+ $url = preg_replace( '!^(https?://)[^/]+(/.+)$!' , '\1' . $this->sso_host . '\2', $url );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,8 +594,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $token_cookie = wp_generate_auth_cookie( $user_id, time() + HOUR_IN_SECONDS, 'tos_token' );
</span><span class="cx" style="display: block; padding: 0 10px"> $remember_me = (int) $this->maybe_block_auth_cookies_context_provider()['remember_me'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setcookie( self::LOGIN_TOS_COOKIE, $token_cookie, time() + HOUR_IN_SECONDS, '/', self::SSO_HOST, true, true );
- setcookie( self::LOGIN_TOS_COOKIE . '_remember', $remember_me, time() + HOUR_IN_SECONDS, '/', self::SSO_HOST, true, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setcookie( self::LOGIN_TOS_COOKIE, $token_cookie, time() + HOUR_IN_SECONDS, '/', $this->sso_host, true, true );
+ setcookie( self::LOGIN_TOS_COOKIE . '_remember', $remember_me, time() + HOUR_IN_SECONDS, '/', $this->sso_host, true, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Redirect them to the interstitial.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'login_redirect', [ $this, 'redirect_to_policy_update' ], 1000 );
</span></span></pre>
</div>
</div>
</body>
</html>