<!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>[40724] branches/4.7: Add nonce for updating file system credentials.</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 { 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/40724">40724</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/40724","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>aaroncampbell</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-16 14:50:27 +0000 (Tue, 16 May 2017)</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'>Add nonce for updating file system credentials.
Merges <a href="https://core.trac.wordpress.org/changeset/40723">[40723]</a> to 4.7 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpadminincludesfilephp">branches/4.7/src/wp-admin/includes/file.php</a></li>
<li><a href="#branches47srcwpadminjsupdatesjs">branches/4.7/src/wp-admin/js/updates.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</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.7 2017-05-16 14:47:08 UTC (rev 40723)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2017-05-16 14:50:27 UTC (rev 40724)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</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.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058
,40061,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40268-40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40376,40378-40382,40395-40398,40400,40405,40421,40428,40434,40458,40472,40481,40513,40536,40538-40539,40546,40604,40677,40689,40692,40704,40716
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058,
40061,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40268-40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40376,40378-40382,40395-40398,40400,40405,40421,40428,40434,40458,40472,40481,40513,40536,40538-40539,40546,40604,40677,40689,40692,40704,40716,40723
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-admin/includes/file.php 2017-05-16 14:47:08 UTC (rev 40723)
+++ branches/4.7/src/wp-admin/includes/file.php 2017-05-16 14:50:27 UTC (rev 40724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1091,14 +1091,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submitted_form = wp_unslash( $_POST );
+
+ // Verify nonce, or unset submitted form field values on failure
+ if ( ! isset( $_POST['_fs_nonce'] ) || ! wp_verify_nonce( $_POST['_fs_nonce'], 'filesystem-credentials' ) ) {
+ unset(
+ $submitted_form['hostname'],
+ $submitted_form['username'],
+ $submitted_form['password'],
+ $submitted_form['public_key'],
+ $submitted_form['private_key'],
+ $submitted_form['connection_type']
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? wp_unslash( $_POST['hostname'] ) : $credentials['hostname']);
- $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? wp_unslash( $_POST['username'] ) : $credentials['username']);
- $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? wp_unslash( $_POST['password'] ) : '');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($submitted_form['hostname']) ? $submitted_form['hostname'] : $credentials['hostname']);
+ $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($submitted_form['username']) ? $submitted_form['username'] : $credentials['username']);
+ $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($submitted_form['password']) ? $submitted_form['password'] : '');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if we are setting the public/private keys for ssh
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? wp_unslash( $_POST['public_key'] ) : '');
- $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : '');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($submitted_form['public_key']) ? $submitted_form['public_key'] : '');
+ $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($submitted_form['private_key']) ? $submitted_form['private_key'] : '');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanitize the hostname, Some people might pass in odd-data:
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1115,8 +1129,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ssh';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ftps';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! empty( $_POST['connection_type'] ) ) {
- $credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $submitted_form['connection_type'] ) ) {
+ $credentials['connection_type'] = $submitted_form['connection_type'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ftp';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1255,11 +1269,12 @@
</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"> foreach ( (array) $extra_fields as $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_POST[ $field ] ) )
- echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $submitted_form[ $field ] ) )
+ echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
</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"> <p class="request-filesystem-credentials-action-buttons">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'filesystem-credentials', '_fs_nonce', false, true ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Proceed' ), '', 'upgrade', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="branches47srcwpadminjsupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-admin/js/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-admin/js/updates.js 2017-05-16 14:47:08 UTC (rev 40723)
+++ branches/4.7/src/wp-admin/js/updates.js 2017-05-16 14:50:27 UTC (rev 40724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type {object} filesystemCredentials.ssh Holds SSH credentials.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type {string} filesystemCredentials.ssh.publicKey The public key. Default empty string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type {string} filesystemCredentials.ssh.privateKey The private key. Default empty string.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type {string} filesystemCredentials.fsNonce Filesystem credentials form nonce.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type {bool} filesystemCredentials.available Whether filesystem credentials have been provided.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'false'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,6 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> publicKey: '',
</span><span class="cx" style="display: block; padding: 0 10px"> privateKey: ''
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fsNonce: '',
</ins><span class="cx" style="display: block; padding: 0 10px"> available: false
</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">@@ -225,6 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> options.data = _.extend( data, {
</span><span class="cx" style="display: block; padding: 0 10px"> action: action,
</span><span class="cx" style="display: block; padding: 0 10px"> _ajax_nonce: wp.updates.ajaxNonce,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _fs_nonce: wp.updates.filesystemCredentials.fsNonce,
</ins><span class="cx" style="display: block; padding: 0 10px"> username: wp.updates.filesystemCredentials.ftp.username,
</span><span class="cx" style="display: block; padding: 0 10px"> password: wp.updates.filesystemCredentials.ftp.password,
</span><span class="cx" style="display: block; padding: 0 10px"> hostname: wp.updates.filesystemCredentials.ftp.hostname,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1705,6 +1708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.filesystemCredentials.ftp.connectionType = $( 'input[name="connection_type"]:checked' ).val();
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.filesystemCredentials.ssh.publicKey = $( '#public_key' ).val();
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.filesystemCredentials.ssh.privateKey = $( '#private_key' ).val();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.updates.filesystemCredentials.fsNonce = $( '#_fs_nonce' ).val();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.updates.filesystemCredentials.available = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Unlock and invoke the queue.
</span></span></pre>
</div>
</div>
</body>
</html>