Changeset 41445 for branches/4.2/src/wp-admin/plugins.php

Timestamp:

09/19/2017 01:31:46 PM (9 years ago)

Author:

johnbillion

Message:

General: Add missing URL-encoding and add extra hardening to plugin and template names when they're displayed in the admin area.

Merges [41434] with changes to the 4.2 branch.

See #13377

Location:

branches/4.2

Files:

• . (modified) (1 prop)
• src/wp-admin/plugins.php (modified) (6 diffs)

branches/4.2/src/wp-admin/plugins.php

@@ -18 +18 @@
 $action = $wp_list_table->current_action();
 
-$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
+$plugin = isset($_REQUEST['plugin']) ? wp_unslash( $_REQUEST['plugin'] ) : '';
 $s = isset($_REQUEST['s']) ? urlencode($_REQUEST['s']) : '';
 
@@ -40 +40 @@
                         check_admin_referer('activate-plugin_' . $plugin);
 
-                        $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );
+                        $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin() );
                         if ( is_wp_error( $result ) ) {
                                 if ( 'unexpected_output' == $result->get_error_code() ) {
-                                        $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s");
+                                        $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . urlencode( $plugin ) . "&plugin_status=$status&paged=$page&s=$s");
                                         wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
                                         exit;
@@ -70 +70 @@
                         check_admin_referer('bulk-plugins');
 
-                        $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+                        $plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
 
                         if ( is_network_admin() ) {
@@ -110 +110 @@
 
                         if ( isset( $_GET['plugins'] ) )
-                                $plugins = explode( ',', $_GET['plugins'] );
+                                $plugins = explode( ',', wp_unslash( $_GET['plugins'] ) );
                         elseif ( isset( $_POST['checked'] ) )
-                                $plugins = (array) $_POST['checked'];
+                                $plugins = (array) wp_unslash( $_POST['checked'] );
                         else
                                 $plugins = array();
@@ -184 +184 @@
                         check_admin_referer('bulk-plugins');
 
-                        $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+                        $plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
                         // Do not deactivate plugins which are already deactivated.
                         if ( is_network_admin() ) {
@@ -217 +217 @@
 
                         //$_POST = from the plugin form; $_GET = from the FTP details screen.
-                        $plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
+                        $plugins = isset( $_REQUEST['checked'] ) ? (array) wp_unslash( $_REQUEST['checked'] ) : array();
                         if ( empty( $plugins ) ) {
                                 wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );