<!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>[12759] sites/trunk/common/includes/wporg-sso/wp-plugin.php: Login: SSO: When logging out, we no longer need to logout of every network individually, logging out of login.wordpress.org will correctly terminate the session on all sites.</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/12759">12759</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/12759","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>2023-07-25 05:02:49 +0000 (Tue, 25 Jul 2023)</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 logging out, we no longer need to logout of every network individually, logging out of login.wordpress.org will correctly terminate the session on all sites.
Partially reverts <a href="http://meta.trac.wordpress.org/changeset/12239">[12239]</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 2023-07-25 04:07:53 UTC (rev 12758)
+++ sites/trunk/common/includes/wporg-sso/wp-plugin.php 2023-07-25 05:02:49 UTC (rev 12759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,11 +527,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Perform the logout on this network first.
- wp_logout();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Redirect back to the requested location.. the referer.. or failing that, the current sites front page after it's all done.
</span><span class="cx" style="display: block; padding: 0 10px"> $logout_redirect = ( wp_unslash( $_REQUEST['redirect_to'] ?? '' ) ?: wp_get_referer() ) ?: home_url( '/' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Never to wp-admin.
+ if ( str_contains( $logout_redirect, '/wp-admin/' ) ) {
+ $logout_redirect = home_url( '/' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $logout_redirect = apply_filters( 'logout_redirect', $logout_redirect, $logout_redirect, $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_logout_url = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,7 +541,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'remote-logout',
</span><span class="cx" style="display: block; padding: 0 10px"> 'redirect_to' => urlencode( $logout_redirect ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'loggedout_on[]' => urlencode( $this->_get_targetted_host( $this->host ) ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'sso_logout' => urlencode( $this->_generate_remote_token( $user ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sso_host_url . '/wp-login.php'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,60 +644,36 @@
</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">- * Log out a user from all sites and networks.
- *
- * This works by keeping track of the domains logged out on, and redirecting the user to the next
- * site in self::VALID_HOSTS. Each is only requested once, so the user should experience minimal
- * redirects.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Log out a user and destroy the session.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _maybe_perform_remote_logout() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_GET['sso_logout'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_GET['sso_logout'] ) || ! $this->is_sso_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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Validate the logout token.
</ins><span class="cx" style="display: block; padding: 0 10px"> $remote_token = wp_unslash( $_GET['sso_logout'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_token = $this->_validate_remote_token( $remote_token );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! $remote_token || ! $remote_token['valid'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $remote_token['user'];
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the matching user is logged in, log them out.
- // If they're logged in as someone else, that's problematic, but we ignore that intentionally.
- if ( is_user_logged_in() && get_current_user_id() == $user->ID ) {
- wp_logout();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Perform the logout. This will destroy the session, logging the user out of all sites.
+ wp_logout();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hosts logged out on..
- $logged_out_on = (array) $_REQUEST['loggedout_on'] ?? [];
- $logged_out_on[] = $this->_get_targetted_host( $this->host );
- $need_to_logout_on = array_diff( self::VALID_HOSTS, $logged_out_on );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Default to the logout confirmation screen, or back to the source site if possible.
+ $redirect_to = $this->sso_host_url . '/loggedout';
+ if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+ $requested_redirect_to = urldecode( wp_unslash( $_REQUEST['redirect_to'] ) );
+ $redirect_to = add_query_arg( 'redirect_to', urlencode( $requested_redirect_to ), $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">- // Logged out everywhere, send them over to the logout confirmation screen.
- if ( ! $need_to_logout_on ) {
- $final_url = $this->sso_host_url . '/loggedout';
-
- if ( ! empty( $_REQUEST['redirect_to'] ) ) {
- $final_url = add_query_arg( 'redirect_to', $_REQUEST['redirect_to'], $final_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the requested redirect_to is valid, use it.
+ if ( wp_validate_redirect( $requested_redirect_to ) ) {
+ $redirect_to = $requested_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">-
- $this->_safe_redirect( $final_url );
- exit;
</del><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">- // Redirect on to the next host in self::VALID_HOSTS to logout from.
- $logout_redirect = add_query_arg(
- array(
- 'action' => 'remote-logout',
- 'sso_logout' => urlencode( $this->_generate_remote_token( $user ) ),
- 'redirect_to' => urlencode( wp_unslash( $_REQUEST['redirect_to'] ?? '' ) ),
- 'loggedout_on' => array_values( $logged_out_on )
- ),
- 'https://' . reset( $need_to_logout_on ) . '/wp-login.php'
- );
-
- $this->_safe_redirect( $logout_redirect );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->_safe_redirect( $redirect_to );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</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>