<!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>[2322] sites/trunk/common/includes/wporg-sso/wp-plugin.php: WordPress.org SSO:</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/2322">2322</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/2322","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>2016-01-19 16:14:08 +0000 (Tue, 19 Jan 2016)</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'>WordPress.org SSO:
* updating WP plugin with a path router/validator for login.wordpress.org
* adding a `is_valid_wporg_sso_path` filter
See <a href="http://meta.trac.wordpress.org/ticket/1524">#1524</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="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 2016-01-19 14:57:17 UTC (rev 2321)
+++ sites/trunk/common/includes/wporg-sso/wp-plugin.php 2016-01-19 16:14:08 UTC (rev 2322)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( 'WPOrg_SSO' ) && ! class_exists( 'WP_WPOrg_SSO' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_WPOrg_SSO extends WPOrg_SSO {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * List of valid paths on login.wordpress.org
+ * @var array
+ */
+ public $valid_sso_paths = array(
+ '/',
+ '/checkemail',
+ '/loggedout',
+ '/lostpassword',
+ '/oauth',
+ );
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Constructor: add our action(s)/filter(s)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,35 +84,38 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( preg_match( '!^/(\?.*)?$!', $_SERVER['REQUEST_URI'] ) ) {
- // If at host root (/)
- if ( ! empty( $_GET['action'] ) ) {
- // If there's an action, it's really meant for wp-login.php, redirect
- $get = $_GET;
- if ( in_array( $get['action'], array( 'logout', 'loggedout' ) ) ) {
- // But make sure to show our custom screen when needed
- $get['redirect_to'] = '/?screen=loggedout';
- }
- $this->_safe_redirect( add_query_arg( $get, $this->sso_login_url . '/wp-login.php' ) );
- return;
- } else {
- // Else let the theme render, or redirect if logged in
- if ( is_user_logged_in() ) {
- $this->_redirect_to_profile();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '!^(' . implode( '|', $this->valid_sso_paths ) . ')([/?]{1,2}.*)?$!', $_SERVER['REQUEST_URI'] ) ) {
+ // If we're on the path of interest
+
+ // Add a custom filter others can apply (theme, etc).
+ add_filter( 'is_valid_wporg_sso_path' , '__return_true' );
+
+ if ( preg_match( '!^/(\?.*)?$!', $_SERVER['REQUEST_URI'] ) ) {
+ // If at host root (/)
+ if ( ! empty( $_GET['action'] ) ) {
+ // If there's an action, it's really meant for wp-login.php, redirect
+ $get = $_GET;
+ if ( in_array( $get['action'], array( 'logout', 'loggedout' ) ) ) {
+ // But make sure to show our custom screen when needed
+ $get['redirect_to'] = '/loggedout/';
+ }
+ $this->_safe_redirect( add_query_arg( $get, $this->sso_login_url . '/wp-login.php' ) );
+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_GET['screen'] ) ) {
- add_filter( 'login_form_defaults', array( &$this, 'login_form_defaults' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Else let the theme render, or redirect if logged in
+ if ( is_user_logged_in() ) {
+ $this->_redirect_to_profile();
+ } else {
+ if ( empty( $_GET['screen'] ) ) {
+ add_filter( 'login_form_defaults', array( &$this, 'login_form_defaults' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
- }
- } elseif ( preg_match( '!^/oauth([/?]{1}.*)?$!', $_SERVER['REQUEST_URI'] ) ) {
- // Let the theme render for oauth paths (/oauth, /oauth/, /oauth/*, but
- // not /notoauth or /oauthnot), or redirect if logged in
- if ( is_user_logged_in() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( is_user_logged_in() ) {
+ // Otherwise, redirect to the login screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_redirect_to_profile();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_user_logged_in() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Logged in catch all, before last fallback
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_redirect_to_profile();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +123,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Otherwise, redirect to the login screen.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_safe_redirect( $this->sso_login_url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // if on login screen, filter network_site_url to make sure our forms go to the SSO host, not wordpress.org
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_site_url', array( &$this, 'login_network_site_url' ), 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- if ( !empty( $_GET['redirect_to'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_GET['redirect_to'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_safe_redirect( wp_unslash( $_GET['redirect_to'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_safe_redirect( 'https://wordpress.org/support/profile/' . wp_get_current_user()->user_nicename );
</span></span></pre>
</div>
</div>
</body>
</html>