<!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>[9833] sites/trunk: Login: Registration: Move to storing the user details in cookies to provide cleaner URLs.</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/9833">9833</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/9833","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-07 02:38:43 +0000 (Thu, 07 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: Registration: Move to storing the user details in cookies to provide cleaner URLs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludeswporgssowppluginphp">sites/trunk/common/includes/wporg-sso/wp-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingcreatephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingprofilephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-profile.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 2020-05-07 02:02:11 UTC (rev 9832)
+++ sites/trunk/common/includes/wporg-sso/wp-plugin.php 2020-05-07 02:38:43 UTC (rev 9833)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,8 +160,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Extend registration paths only when registration is open.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'user' === get_site_option( 'registration', 'none' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // New "pending" registration flow.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->valid_sso_paths['pending-profile'] = '/register/create-profile/(?P<profile_user>[^/]+)/(?P<profile_key>[^/]+)';
- $this->valid_sso_paths['pending-create'] = '/register/create/(?P<confirm_user>[^/]+)/(?P<confirm_key>[^/]+)';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->valid_sso_paths['pending-profile'] = '/register/create-profile(/(?P<profile_user>[^/]+)/(?P<profile_key>[^/]+))?';
+ $this->valid_sso_paths['pending-create'] = '/register/create(/(?P<confirm_user>[^/]+)/(?P<confirm_key>[^/]+))?';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Primary registration route.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->valid_sso_paths['register'] = '/register(/(?P<user>[^/]+))?';
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingcreatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php 2020-05-07 02:02:11 UTC (rev 9832)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php 2020-05-07 02:38:43 UTC (rev 9833)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,9 +5,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package wporg-login
</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">-$activation_user = WP_WPOrg_SSO::$matched_route_params['confirm_user'] ?? false;
-$activation_key = WP_WPOrg_SSO::$matched_route_params['confirm_key'] ?? false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Clear the pending cookies, they're no longer needed.
+if ( isset( $_COOKIE['wporg_profile_user'] ) ) {
+ setcookie( 'wporg_profile_user', false, time()-DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
+ setcookie( 'wporg_profile_key', false, time()-DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Migrate to cookies.
+if ( !empty( WP_WPOrg_SSO::$matched_route_params['confirm_user'] ) ) {
+ setcookie( 'wporg_confirm_user', WP_WPOrg_SSO::$matched_route_params['confirm_user'], time()+DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
+ setcookie( 'wporg_confirm_key', WP_WPOrg_SSO::$matched_route_params['confirm_key'], time()+DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
+
+ wp_safe_redirect( '/register/create' );
+ die();
+}
+
+$activation_user = $_COOKIE['wporg_confirm_user'] ?? false;
+$activation_key = $_COOKIE['wporg_confirm_key'] ?? false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $pending_user = wporg_get_pending_user( $activation_user );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $pending_user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( home_url( '/linkexpired/register/' . urlencode( $activation_user ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +50,7 @@
</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"> if ( ! $can_access ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_safe_redirect( "/" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_safe_redirect( '/' );
</ins><span class="cx" style="display: block; padding: 0 10px"> die();
</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">@@ -60,6 +75,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $pending_user && ! $pending_user['created'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wporg_login_create_user_from_pending( $pending_user, $user_pass );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setcookie( 'wporg_confirm_user', false, time()-DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
+ setcookie( 'wporg_confirm_key', false, time()-DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
+
+ // Log the user in
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_auth_cookie( $user->ID, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingprofilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-profile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-profile.php 2020-05-07 02:02:11 UTC (rev 9832)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-profile.php 2020-05-07 02:38:43 UTC (rev 9833)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,9 +5,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package wporg-login
</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">-$profile_user = WP_WPOrg_SSO::$matched_route_params['profile_user'] ?? false;
-$profile_key = WP_WPOrg_SSO::$matched_route_params['profile_key'] ?? false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Migrate to cookies.
+if ( !empty( WP_WPOrg_SSO::$matched_route_params['profile_user'] ) ) {
+ setcookie( 'wporg_profile_user', WP_WPOrg_SSO::$matched_route_params['profile_user'], time()+DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
+ setcookie( 'wporg_profile_key', WP_WPOrg_SSO::$matched_route_params['profile_key'], time()+DAY_IN_SECONDS, '/register/', 'login.wordpress.org', true, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_safe_redirect( '/register/create-profile' );
+ die();
+}
+
+$profile_user = $_COOKIE['wporg_profile_user'] ?? false;
+$profile_key = $_COOKIE['wporg_profile_key'] ?? false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $pending_user = wporg_get_pending_user( $profile_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $can_access = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( 'https://wordpress.org/support/' );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $can_access ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_safe_redirect( home_url( '/linkexpired/' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_safe_redirect( home_url( '/linkexpired' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> die();
</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>