<!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>[9941] sites/trunk/common/includes/wporg-sso: Login: Add remote-login functionality to the SSO login code.</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/9941">9941</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/9941","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>2020-05-29 03:14:48 +0000 (Fri, 29 May 2020)</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: Add remote-login functionality to the SSO login code.

This will allow for instances of WordPress in the WordPress.org network (and using it's user tables) to login via login.wordpress.org.

See <a href="http://meta.trac.wordpress.org/ticket/5239">#5239</a>.</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 2020-05-29 01:56:01 UTC (rev 9940)
+++ sites/trunk/common/includes/wporg-sso/class-wporg-sso.php   2020-05-29 03:14:48 UTC (rev 9941)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'WPOrg_SSO' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Single Sign-On (SSO) handling for WordPress/bbPress instances under *.wordpress.org.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Single Sign-On (SSO) handling for WordPress/bbPress instances on wordpress.org.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,13 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                const VALID_HOSTS = [
+                       'wordpress.org',
+                       'bbpress.org',
+                       'buddypress.org',
+                       'wordcamp.org'
+               ];
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 public $sso_host_url;
</span><span class="cx" style="display: block; padding: 0 10px">                public $sso_login_url;
</span><span class="cx" style="display: block; padding: 0 10px">                public $sso_signup_url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,6 +82,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $login_url = add_query_arg( 'redirect_to', urlencode( $redirect_to ), $login_url );
</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">+                        if ( ! preg_match( '!wordpress\.org$!', $this->host ) ) {
+                               $login_url = add_query_arg( 'from', $this->host, $login_url );
+                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $login_url;
</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">@@ -116,10 +127,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 ) ) {
</del><ins style="background-color: #dfd; 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 ) ) {
</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">-                        } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } elseif ( self::SSO_HOST !== $this->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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,28 +142,28 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Tests if the passed host/domain, or URL, is part of the WordPress.org domain.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Tests if the passed host/domain, or URL, is part of the WordPress.org network.
</ins><span class="cx" style="display: block; padding: 0 10px">                  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param unknown $string A domain, hostname, or URL
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param unknown $host A domain, hostname, or URL
</ins><span class="cx" style="display: block; padding: 0 10px">                  * @return boolean True is ok, false if not
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                protected function _is_valid_targeted_domain( $string ) {
-                       if ( empty( $string ) || ! is_string( $string ) ) {
-                               $string = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         protected function _is_valid_targeted_domain( $host ) {
+                       if ( empty( $host ) || ! is_string( $host ) || ! strstr( $host, '.' ) ) {
+                               return false;
</ins><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 ( strstr( $string , '/' ) ) {
-                               $url = parse_url( $string );
-                               $host = ( ! empty( $url['host'] ) ) ? $url['host'] : '';
-                       } else {
-                               $host = $string;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( strstr( $host, '/' ) ) {
+                               $host = parse_url( $host, PHP_URL_HOST );
</ins><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( $host ) && strstr( $host , '.' ) ) {
-                               return ( preg_match( '/^(.+\.)?wordpress\.org$/', $host ) ) ? true : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( in_array( $host, self::VALID_HOSTS, true ) ) {
+                               return true;
</ins><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">-                        return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // If not a top-level domain, shrink it down and try again.
+                       $top_level_host = implode( '.', array_slice( explode( '.', $host ), -2 ) );
+
+                       return in_array( $top_level_host, self::VALID_HOSTS, true );
</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       2020-05-29 01:56:01 UTC (rev 9940)
+++ sites/trunk/common/includes/wporg-sso/wp-plugin.php 2020-05-29 03:14:48 UTC (rev 9941)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,6 +66,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        add_filter( 'login_url', [ $this, 'add_locale' ], 21 );
</span><span class="cx" style="display: block; padding: 0 10px">                                        add_filter( 'register_url', [ $this, 'add_locale' ], 21 );
</span><span class="cx" style="display: block; padding: 0 10px">                                        add_filter( 'lostpassword_url', [ $this, 'add_locale' ], 21 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                } else {
+                                       add_filter( 'login_redirect', [ $this, 'maybe_add_remote_login_bounce_to_post_login_url' ], 10, 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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,10 +187,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                // If we're not 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">                                        // Don't redirect the 'confirmaction' wp-login handlers to login.wordpress.org.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( isset( $_GET['action']  ) && empty( $_POST ) && 'confirmaction' == $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 if ( isset( $_GET['action'] ) && empty( $_POST ) && 'confirmaction' == $_GET['action'] ) {
</ins><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        // Allow logout on non-dotorg hosts.
+                                       if ( isset( $_GET['action'] ) && empty( $_POST ) && 'logout' == $_GET['action'] ) {
+                                               if ( ! preg_match( '!wordpress\.org$!', $_SERVER['HTTP_HOST'] ) ) {
+                                                       return;
+                                               }
+                                       }
+
+                                       // Remote SSO login?
+                                       if ( isset( $_GET['action'] ) && 'remote-login' === $_GET['action'] && ! empty( $_GET['sso_token'] ) ) {
+                                               $this->_maybe_perform_remote_login();
+                                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                         // If on a WP login screen...
</span><span class="cx" style="display: block; padding: 0 10px">                                        $redirect_to_sso_login = $this->sso_login_url;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,6 +213,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        // Pay extra attention to the post-process redirect_to
</span><span class="cx" style="display: block; padding: 0 10px">                                        $redirect_to_sso_login = add_query_arg( 'redirect_to', urlencode( $redirect_req ), $redirect_to_sso_login );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        if ( ! preg_match( '!wordpress\.org$!', $this->host ) ) {
+                                               $redirect_to_sso_login = add_query_arg( 'from', $this->host, $redirect_to_sso_login );
+                                       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        // And actually redirect to the SSO login
</span><span class="cx" style="display: block; padding: 0 10px">                                        $this->_safe_redirect( $redirect_to_sso_login, 301 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                                                // Else let the theme render, or redirect if logged in
</span><span class="cx" style="display: block; padding: 0 10px">                                                                if ( is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        $this->_redirect_to_profile();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 $this->_redirect_to_source_or_profile();
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        if ( empty( $_GET['screen'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                                                add_filter( 'login_form_defaults', array( $this, 'login_form_defaults' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,13 +275,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        // No redirect, just display robots.
</span><span class="cx" style="display: block; padding: 0 10px">                                                } else if ( is_user_logged_in() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                        // Otherwise, redirect to the their profile.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        $this->_redirect_to_profile();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 $this->_redirect_to_source_or_profile();
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 }
</span><span class="cx" style="display: block; padding: 0 10px">                                        } elseif ( ( is_admin() && is_super_admin() ) || 0 === strpos( $_SERVER['REQUEST_URI'], '/wp-json' ) || 0 === strpos( $_SERVER['REQUEST_URI'], '/xmlrpc.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                // Do nothing, allow access to wp-admin, wp-json and xmlrpc.php on login.wordpress.org
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $this->_redirect_to_profile();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $this->_redirect_to_source_or_profile();
</ins><span class="cx" style="display: block; padding: 0 10px">                                         } else {
</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, 301 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,19 +381,108 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * Redirects the user to her/his (support) profile.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Redirects the user back to where they came from (or w.org profile)
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                protected function _redirect_to_profile() {
-                       if ( ! is_user_logged_in() ) {
-                               return;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         protected function _redirect_to_source_or_profile() {
+                       $redirect = $this->_get_safer_redirect_to();
</ins><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'] ) ) {
-                               $this->_safe_redirect( $this->_get_safer_redirect_to() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( $redirect ) {
+                               $this->_safe_redirect( $this->_maybe_add_remote_login_bounce( $redirect ) );
+                       } elseif ( is_user_logged_in() ) {
+                               $this->_safe_redirect( 'https://profiles.wordpress.org/' . wp_get_current_user()->user_nicename . '/' );
</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">-                                $this->_safe_redirect( 'https://profiles.wordpress.org/' . wp_get_current_user()->user_nicename . '/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $this->_safe_redirect( 'https://wordpress.org/' );
</ins><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">+
+               /**
+                * Logs in a user on the current domain on a remote-login action.
+                */
+               protected function _maybe_perform_remote_login() {
+                       $remote_token = wp_unslash( $_GET['sso_token'] );
+                       if ( ! is_string( $remote_token ) || 3 !== substr_count( $remote_token, '|' ) ) {
+                               wp_die( 'Invalid token.' );
+                       }
+
+                       list( $user_id, $sso_hash, $valid_until, $remember_me ) = explode( '|', $remote_token, 4 );
+
+                       $remote_expiration_valid = (
+                               // +/- 5s on a 5s timeout.
+                               $valid_until >= ( time() - 5 ) &&
+                               $valid_until <= ( time() + 10 )
+                       );
+
+                       $valid_remote_hash = false;
+                       $user = get_user_by( 'id', $user_id );
+                       if ( $user ) {
+                               $valid_remote_hash = hash_equals( 
+                                       $this->_generate_remote_login_hash( $user, $valid_until, $remember_me ),
+                                       $sso_hash
+                               );
+                       }
+
+                       if ( $remote_expiration_valid && $valid_remote_hash ) {
+                               wp_set_current_user( (int) $user_id );
+                               wp_set_auth_cookie( (int) $user_id, (bool) $remember_me );
+
+                               if ( isset( $_GET['redirect_to'] ) ) {
+                                       $this->_safe_redirect( wp_unslash( $_GET['redirect_to'] ) );
+                               } else {
+                                       $this->_safe_redirect( home_url( '/' ) );
+                               }
+                               exit;
+                       }
+
+                       return false;
+               }
+
+               public function maybe_add_remote_login_bounce_to_post_login_url( $redirect, $requested, $user ) {
+                       return $this->_maybe_add_remote_login_bounce( $redirect, $user );
+               }
+
+               protected function _maybe_add_remote_login_bounce( $redirect, $user = false ) {
+                       if ( ! $user ) {
+                               $user = wp_get_current_user();
+                       }
+
+                       // If it's on a different _supported_ host, bounce through the remote-login.
+                       $redirect_host = parse_url( $redirect, PHP_URL_HOST );
+
+                       if ( $user && $this->_is_valid_targeted_domain( $redirect_host ) && ! preg_match( '!wordpress.org$!i', $redirect_host ) ) {
+
+                               // Fetch auth cookie parts to find out if the user has selected 'remember me'.
+                               $auth_cookie_parts = wp_parse_auth_cookie( '', 'secure_auth' );
+
+                               $valid_until = time() + 5; // Super short timeout.
+                               $remember_me = ! empty( $_POST['rememberme'] ) || ( $auth_cookie_parts && $auth_cookie_parts['expiration'] >= ( time() + ( 2 * DAY_IN_SECONDS ) ) );
+
+                               $hash        = $this->_generate_remote_login_hash( $user, $valid_until, $remember_me );
+                               $sso_token   = $user->ID . '|' . $hash . '|' . $valid_until . '|' . $remember_me;
+
+                               $redirect = add_query_arg(
+                                       array(
+                                               'action'      => 'remote-login',
+                                               'sso_token'   => urlencode( $sso_token ),
+                                               'redirect_to' => urlencode( $redirect ),
+                                       ),
+                                       'https://' . $redirect_host . '/wp-login.php' // Assume that wp-login exists and is accessible
+                               );
+                       }
+
+                       return $redirect;
+               }
+
+               /**
+                * Generate a hash for remote-login for non-wordpress.org domains
+                */
+               protected function _generate_remote_login_hash( $user, $valid_until, $remember_me = false ) {
+                       // re-use the same frag that Auth cookies use to invalidate sessions.
+                       $pass_frag = substr( $user->user_pass, 8, 4 );
+                       $key       = wp_hash( $user->user_login . '|' . $pass_frag . '|' . $valid_until );
+                       $hash      = hash_hmac( 'sha256', $user->user_login . '|' . $valid_until . '|' . (int) $remember_me, $key );
+
+                       return $hash;
+               }
</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">        new WP_WPOrg_SSO();
</span></span></pre>
</div>
</div>

</body>
</html>