<!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>[44052] branches/4.8/src: Multisite: Validate activation links.</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="https://core.trac.wordpress.org/changeset/44052">44052</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44052","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-13 01:34:39 +0000 (Thu, 13 Dec 2018)</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'>Multisite: Validate activation links.
Merges <a href="https://core.trac.wordpress.org/changeset/44048">[44048]</a> to the 4.8 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches48srcwpactivatephp">branches/4.8/src/wp-activate.php</a></li>
<li><a href="#branches48srcwpadminincludesclasswpscreenphp">branches/4.8/src/wp-admin/includes/class-wp-screen.php</a></li>
<li><a href="#branches48srcwpadminpostphp">branches/4.8/src/wp-admin/post.php</a></li>
<li><a href="#branches48srcwpincludesclasswpphp">branches/4.8/src/wp-includes/class-wp.php</a></li>
<li><a href="#branches48srcwpincludesmsdeprecatedphp">branches/4.8/src/wp-includes/ms-deprecated.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches48">branches/4.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.8
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.8 2018-12-13 01:32:07 UTC (rev 44051)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.8 2018-12-13 01:34:39 UTC (rev 44052)
</ins><a id="branches48"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43988,43994,44014,44017
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:40872-40873,40879,40881,40883,40885,40892-40893,40896-40897,40901,40926-40927,40939,40941,40961,40990-40991,40995,41000,41009,41020,41022,41028,41035,41037,41047,41050,41070,41072,41086,41088,41094,41112,41115-41116,41132,41134,41136,41139,41141,41250-41251,41260,41294,41335,41386,41393,41395,41397-41398,41448,41457,41470,41483,41496,41636,41662,41870,42056,42119-42120,42220,42258-42261,42424,42433,42892-42894,44021
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:40872-40873,40879,40881,40883,40885,40892-40893,40896-40897,40901,40926-40927,40939,40941,40961,40990-40991,40995,41000,41009,41020,41022,41028,41035,41037,41047,41050,41070,41072,41086,41088,41094,41112,41115-41116,41132,41134,41136,41139,41141,41250-41251,41260,41294,41335,41386,41393,41395,41397-41398,41448,41457,41470,41483,41496,41636,41662,41870,42056,42119-42120,42220,42258-42261,42424,42433,42892-42894,44021,44048
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches48srcwpactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-activate.php 2018-12-13 01:32:07 UTC (rev 44051)
+++ branches/4.8/src/wp-activate.php 2018-12-13 01:34:39 UTC (rev 44052)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $result = null;
</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['key'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['key'] ) && isset( $_POST['key'] ) && $_GET['key'] !== $_POST['key'] ) {
+ wp_die( __( 'A key value mismatch has been detected. Please follow the link provided in your activation email.' ), __( 'An error occurred during the activation' ), 400 );
+} elseif ( ! empty( $_GET['key'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = $_GET['key'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_POST['key'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = $_POST['key'];
</span></span></pre></div>
<a id="branches48srcwpadminincludesclasswpscreenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-admin/includes/class-wp-screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-admin/includes/class-wp-screen.php 2018-12-13 01:32:07 UTC (rev 44051)
+++ branches/4.8/src/wp-admin/includes/class-wp-screen.php 2018-12-13 01:34:39 UTC (rev 44052)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +290,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $base ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'post' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['post'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['post'] ) && isset( $_POST['post_ID'] ) && (int) $_GET['post'] !== (int) $_POST['post_ID'] )
+ wp_die( __( 'A post ID mismatch has been detected.' ), __( 'Sorry, you are not allowed to edit this item.' ), 400 );
+ elseif ( isset( $_GET['post'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $_GET['post'];
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset( $_POST['post_ID'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $_POST['post_ID'];
</span></span></pre></div>
<a id="branches48srcwpadminpostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-admin/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-admin/post.php 2018-12-13 01:32:07 UTC (rev 44051)
+++ branches/4.8/src/wp-admin/post.php 2018-12-13 01:34:39 UTC (rev 44052)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_reset_vars( array( 'action' ) );
</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 ( isset( $_GET['post'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['post'] ) && isset( $_POST['post_ID'] ) && (int) $_GET['post'] !== (int) $_POST['post_ID'] )
+ wp_die( __( 'A post ID mismatch has been detected.' ), __( 'Sorry, you are not allowed to edit this item.' ), 400 );
+elseif ( isset( $_GET['post'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = $post_ID = (int) $_GET['post'];
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset( $_POST['post_ID'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $post_ID = (int) $_POST['post_ID'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +40,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post_type );
</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 ( isset( $_POST['post_type'] ) && $post && $post_type !== $_POST['post_type'] ) {
+ wp_die( __( 'A post type mismatch has been detected.' ), __( 'Sorry, you are not allowed to edit this item.' ), 400 );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['deletepost'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
</span></span></pre></div>
<a id="branches48srcwpincludesclasswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-includes/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-includes/class-wp.php 2018-12-13 01:32:07 UTC (rev 44051)
+++ branches/4.8/src/wp-includes/class-wp.php 2018-12-13 01:34:39 UTC (rev 44052)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,6 +302,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->public_query_vars as $wpvar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->extra_query_vars[$wpvar] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( isset( $_GET[ $wpvar ] ) && isset( $_POST[ $wpvar ] ) && $_GET[ $wpvar ] !== $_POST[ $wpvar ] )
+ wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset( $_POST[$wpvar] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars[$wpvar] = $_POST[$wpvar];
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset( $_GET[$wpvar] ) )
</span></span></pre></div>
<a id="branches48srcwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-includes/ms-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-includes/ms-deprecated.php 2018-12-13 01:32:07 UTC (rev 44051)
+++ branches/4.8/src/wp-includes/ms-deprecated.php 2018-12-13 01:34:39 UTC (rev 44052)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,10 +271,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.3.0' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ref = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['ref'] ) )
- $ref = $_GET['ref'];
- if ( isset( $_POST['ref'] ) )
- $ref = $_POST['ref'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['ref'] ) && isset( $_POST['ref'] ) && $_GET['ref'] !== $_POST['ref'] ) {
+ wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
+ } elseif ( isset( $_POST['ref'] ) ) {
+ $ref = $_POST[ 'ref' ];
+ } elseif ( isset( $_GET['ref'] ) ) {
+ $ref = $_GET[ 'ref' ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ref ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ref = wpmu_admin_redirect_add_updated_param( $ref );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +290,9 @@
</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"> $url = wpmu_admin_redirect_add_updated_param( $url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['redirect'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['redirect'] ) && isset( $_POST['redirect'] ) && $_GET['redirect'] !== $_POST['redirect'] ) {
+ wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
+ } elseif ( isset( $_GET['redirect'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
</span><span class="cx" style="display: block; padding: 0 10px"> $url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['redirect'] ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>