<!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>[2150] sites/trunk/common/includes/wporg-sso: WPORG SSO (login.wordpress.org):</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" 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/2150">2150</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/2150","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>stephdau</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-03 15:14:47 +0000 (Thu, 03 Dec 2015)</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'>WPORG SSO (login.wordpress.org):
* Adding an `WPOrg_SSO::has_host()` method to test if we have $_SERVER['HTTP_HOST']
* Testing for `WPOrg_SSO::has_host()` before proceeding,no need to if we don;t have one (EG: cron'd processes)
* Adding a `$_SERVER['HTTP_REFERER']` test to `WPOrg_SSO::_get_safer_redirect_to()`, which now also enables SSO for our Trac instances (see <a href="http://meta.trac.wordpress.org/ticket/1422">#1422</a>) and improves it for our BB instances (see <a href="http://meta.trac.wordpress.org/ticket/1423">#1423</a>).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludeswporgssobbpluginphp">sites/trunk/common/includes/wporg-sso/bb-plugin.php</a></li>
<li><a href="#sitestrunkcommonincludeswporgssoclasswporgssophp">sites/trunk/common/includes/wporg-sso/class-wporg-sso.php</a></li>
<li><a href="#sitestrunkcommonincludeswporgssogppluginphp">sites/trunk/common/includes/wporg-sso/gp-plugin.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="sitestrunkcommonincludeswporgssobbpluginphp"></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/bb-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/wporg-sso/bb-plugin.php 2015-12-02 03:08:47 UTC (rev 2149)
+++ sites/trunk/common/includes/wporg-sso/bb-plugin.php 2015-12-03 15:14:47 UTC (rev 2150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'bb_init', array( &$this, 'redirect_all_login_or_signup_to_sso' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->has_host() ) {
+ add_action( 'bb_init', array( &$this, 'redirect_all_login_or_signup_to_sso' ) );
+ }
</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></pre></div>
<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 2015-12-02 03:08:47 UTC (rev 2149)
+++ sites/trunk/common/includes/wporg-sso/class-wporg-sso.php 2015-12-03 15:14:47 UTC (rev 2150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,8 +23,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sso_login_url = $this->sso_host_url . '/wp-login.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sso_signup_url = 'https://wordpress.org/support/register.php'; // For now
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->host = $_SERVER['HTTP_HOST'];
- $this->script = $_SERVER['SCRIPT_NAME'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_SERVER['HTTP_HOST'] ) ) {
+ $this->host = $_SERVER['HTTP_HOST'];
+ $this->script = $_SERVER['SCRIPT_NAME'];
+ }
</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">@@ -77,7 +79,17 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests if the current process has $_SERVER['HTTP_HOST'] or not (EG: cron'd processes do not).
+ *
+ * @return boolean
+ */
+ public function has_host() {
+ return ( ! empty( $this->host ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get a safe redirect URL (ie: a wordpress.org-based one) from $_REQUEST['redirect_to'] or a safe alternative.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Safe redirect URL from $_REQUEST['redirect_to']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +104,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->_is_valid_targeted_domain( $redirect_to_requested ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = $redirect_to_requested;
</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 {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
+ // We didn't get a redirect_to, but we got a referrer, use that if a valid target.
+ $redirect_to_referrer = $_SERVER['HTTP_REFERER'];
+ if ( $this->_is_valid_targeted_domain( $redirect_to_referrer ) ) {
+ $redirect_to = $redirect_to_referrer;
+ }
+ } else{
</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="sitestrunkcommonincludeswporgssogppluginphp"></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/gp-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/wporg-sso/gp-plugin.php 2015-12-02 03:08:47 UTC (rev 2149)
+++ sites/trunk/common/includes/wporg-sso/gp-plugin.php 2015-12-03 15:14:47 UTC (rev 2150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,12 +11,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Load SSO lib
</span><span class="cx" style="display: block; padding: 0 10px"> $this->instantiate_sso();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Actions
- $this->add_action( 'init' );
- // Filters
- $this->add_filter( 'gp_url', array( 'args' => 3 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $this->sso_obj->has_host() ) {
+ // Actions
+ $this->add_action( 'init' );
+ // Filters
+ $this->add_filter( 'gp_url', array( 'args' => 3 ) );
+ }
</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></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 2015-12-02 03:08:47 UTC (rev 2149)
+++ sites/trunk/common/includes/wporg-sso/wp-plugin.php 2015-12-03 15:14:47 UTC (rev 2150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'init', array( &$this, 'redirect_all_login_or_signup_to_sso' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->has_host() ) {
+ add_action( 'init', array( &$this, 'redirect_all_login_or_signup_to_sso' ) );
+ }
</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></pre>
</div>
</div>
</body>
</html>