<!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>[12223] sites/trunk/common/includes/wporg-sso: Login: SSO: When performing a remote-login (ie.</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/12223">12223</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/12223","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-08 03:52:54 +0000 (Tue, 08 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: When performing a remote-login (ie. wordpress.org => buddypress.org) use the redirect_to as the SSO login destination instead of relying upon `/wp-login.php` being accessible at the root.
This opens up support for Multisite Subdirectory installs, such as WordCamp.org.</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 06:44:39 UTC (rev 12222)
+++ sites/trunk/common/includes/wporg-sso/class-wporg-sso.php 2022-11-08 03:52:54 UTC (rev 12223)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $to = wp_sanitize_redirect( $to );
</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 ( ! $this->_is_valid_targeted_domain( $to ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If it's a full URI, validate the host.
+ if ( ! str_starts_with( $to, '/' ) && ! $this->_is_valid_targeted_domain( $to ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $to = $this->_get_safer_redirect_to();
</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 2022-11-07 06:44:39 UTC (rev 12222)
+++ sites/trunk/common/includes/wporg-sso/wp-plugin.php 2022-11-08 03:52:54 UTC (rev 12223)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,6 +257,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'site_url', array( $this, 'login_post_url' ), 20, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'register_url', array( $this, 'register_url' ), 20 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Maybe do a Remote SSO login
+ $this->_maybe_perform_remote_login();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '!/wp-signup\.php$!', $_SERVER['REQUEST_URI'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Note: wp-signup.php is not a physical file, and so it's matched on it's request uri.
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're on any WP signup screen, redirect to the SSO host one,respecting the user's redirect_to request
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,16 +275,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow logout on non-dotorg hosts.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['action'] ) && empty( $_POST ) && 'logout' == $_GET['action'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! preg_match( '!wordpress\.org$!', $_SERVER['HTTP_HOST'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! preg_match( '!wordpress\.org$!', $this->host ) ) {
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remote SSO login?
- if ( isset( $_GET['action'] ) && 'remote-login' === $_GET['action'] && ! empty( $_GET['sso_token'] ) ) {
- $this->_maybe_perform_remote_login();
- }
-
</del><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">@@ -478,8 +476,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Prefer the source page, as long as it wasn't a login/admin page.
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- str_starts_with( $redirect, wp_login_url() ) &&
- ! str_contains( $redirect, '/wp-admin/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ str_starts_with( $redirect, wp_login_url() ) ||
+ str_contains( $redirect, '/wp-admin/' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = home_url('/');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,6 +521,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Logs in a user on the current domain on a remote-login action.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _maybe_perform_remote_login() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_GET['sso_token'] ) ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $remote_token = wp_unslash( $_GET['sso_token'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $remote_token ) || 3 !== substr_count( $remote_token, '|' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 'Invalid token.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,10 +553,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['redirect_to'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_safe_redirect( wp_unslash( $_GET['redirect_to'] ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ } elseif ( ! str_contains( $this->script, '/wp-login.php' ) ) {
+ // SSO login, no redirect_url, and on a not-a-login page. Remove sso arg and redirect to self.
+ $this->_safe_redirect( remove_query_arg( 'sso_token' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_safe_redirect( home_url( '/' ) );
</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><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // Invalid auth, remove the query var.
+ $this->_safe_redirect( remove_query_arg( 'sso_token' ) );
+ exit;
</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 false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,14 +600,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = $this->_generate_remote_login_hash( $user, $valid_until, $remember_me );
</span><span class="cx" style="display: block; padding: 0 10px"> $sso_token = $user->ID . '|' . $hash . '|' . $valid_until . '|' . $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">- $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
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect = add_query_arg( 'sso_token', urlencode( $sso_token ), $redirect );
</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 $redirect;
</span></span></pre>
</div>
</div>
</body>
</html>