Changeset 40724

Timestamp:

05/16/2017 02:50:27 PM (8 years ago)

Author:

aaroncampbell

Message:

Add nonce for updating file system credentials.

Merges [40723] to 4.7 branch.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/file.php (modified) (3 diffs)
• src/wp-admin/js/updates.js (modified) (4 diffs)

branches/4.7/src/wp-admin/includes/file.php

@@ -1092 +1092 @@
     $credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
 
+    $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']
+        );
+    }
+
     // 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)
-    $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'] ) : '');
+    $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'] : '');
 
     // Check to see if we are setting the public/private keys for ssh
-    $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'] ) : '');
+    $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'] : '');
 
     // Sanitize the hostname, Some people might pass in odd-data:
@@ -1116 +1130 @@
     } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
         $credentials['connection_type'] = 'ftps';
-    } elseif ( ! empty( $_POST['connection_type'] ) ) {
-        $credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
+    } elseif ( ! empty( $submitted_form['connection_type'] ) ) {
+        $credentials['connection_type'] = $submitted_form['connection_type'];
     } elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP
         $credentials['connection_type'] = 'ftp';
@@ -1256 +1270 @@
 
 foreach ( (array) $extra_fields as $field ) {
-    if ( isset( $_POST[ $field ] ) )
-        echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+    if ( isset( $submitted_form[ $field ] ) )
+        echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
 }
 ?>
     <p class="request-filesystem-credentials-action-buttons">
+        <?php wp_nonce_field( 'filesystem-credentials', '_fs_nonce', false, true ); ?>
         <button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
         <?php submit_button( __( 'Proceed' ), '', 'upgrade', false ); ?>

branches/4.7/src/wp-admin/js/updates.js

@@ -95 +95 @@
      * @type {string} filesystemCredentials.ssh.publicKey      The public key. Default empty string.
      * @type {string} filesystemCredentials.ssh.privateKey     The private key. Default empty string.
+     * @type {string} filesystemCredentials.fsNonce            Filesystem credentials form nonce.
      * @type {bool}   filesystemCredentials.available          Whether filesystem credentials have been provided.
      *                                                         Default 'false'.
@@ -109 +110 @@
             privateKey: ''
         },
+        fsNonce: '',
         available: false
     };
@@ -226 +228 @@
             action:          action,
             _ajax_nonce:     wp.updates.ajaxNonce,
+            _fs_nonce:       wp.updates.filesystemCredentials.fsNonce,
             username:        wp.updates.filesystemCredentials.ftp.username,
             password:        wp.updates.filesystemCredentials.ftp.password,
@@ -1706 +1709 @@
             wp.updates.filesystemCredentials.ssh.publicKey      = $( '#public_key' ).val();
             wp.updates.filesystemCredentials.ssh.privateKey     = $( '#private_key' ).val();
+            wp.updates.filesystemCredentials.fsNonce            = $( '#_fs_nonce' ).val();
             wp.updates.filesystemCredentials.available          = true;