Changeset 41449

Timestamp:

09/19/2017 01:43:28 PM (6 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 3.9 branch.

See #13377

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)
• src/wp-admin/includes/template.php (modified) (1 diff)
• src/wp-admin/plugin-editor.php (modified) (3 diffs)
• src/wp-admin/plugins.php (modified) (6 diffs)
• src/wp-admin/theme-editor.php (modified) (3 diffs)

branches/3.9/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -377 +377 @@
                 if ( $is_active ) {
                     if ( current_user_can( 'manage_network_plugins' ) )
-                        $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
+                        $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
                 } else {
                     if ( current_user_can( 'manage_network_plugins' ) )
-                        $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
+                        $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
                     if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) )
-                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                 }
             } else {
                 if ( $is_active ) {
-                    $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
+                    $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
                 } else {
-                    $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
+                    $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
 
                     if ( ! is_multisite() && current_user_can('delete_plugins') )
-                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                 } // end if $is_active
              } // end if $screen->in_admin( 'network' )
 
             if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
-                $actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . esc_attr__('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
+                $actions['edit'] = '<a href="plugin-editor.php?file=' . urlencode( $plugin_file ) . '" title="' . esc_attr__('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
         } // end if $context
 

branches/3.9/src/wp-admin/includes/template.php

@@ -750 +750 @@
     foreach ( array_keys( $templates ) as $template ) {
         $selected = selected( $default, $templates[ $template ], false );
-        echo "\n\t<option value='" . $templates[ $template ] . "' $selected>$template</option>";
+        echo "\n\t<option value='" . esc_attr( $templates[ $template ] ) . "' $selected>" . esc_html( $template ) . "</option>";
     }
 }

branches/3.9/src/wp-admin/plugin-editor.php

@@ -96 +96 @@
 
         if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
-            activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
-
-        wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+            activate_plugin($file, "plugin-editor.php?file=" . urlencode( $file ) . "&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
+
+        wp_redirect( self_admin_url("plugin-editor.php?file=" . urlencode( $file ) . "&a=te&scrollto=$scrollto") );
         exit;
     }
@@ -184 +184 @@
     if ( is_plugin_active($plugin) ) {
         if ( is_writeable($real_file) )
-            echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
+            echo sprintf(__('Editing <strong>%s</strong> (active)'), esc_html( $file ) );
         else
-            echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
+            echo sprintf(__('Browsing <strong>%s</strong> (active)'), esc_html( $file ) );
     } else {
         if ( is_writeable($real_file) )
-            echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
+            echo sprintf(__('Editing <strong>%s</strong> (inactive)'), esc_html( $file ) );
         else
-            echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
+            echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), esc_html( $file ) );
     }
     ?></big>
@@ -235 +235 @@
     }
 ?>
-        <li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&amp;plugin=<?php echo urlencode( $plugin ) ?>"><?php echo $plugin_file ?></a></li>
+        <li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&amp;plugin=<?php echo urlencode( $plugin ) ?>"><?php echo esc_html( $plugin_file ); ?></a></li>
 <?php endforeach; ?>
     </ul>

branches/3.9/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']) : '';
 
@@ -38 +38 @@
             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;
@@ -68 +68 @@
             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() ) {
@@ -108 +108 @@
 
             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();
@@ -182 +182 @@
             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() ) {
@@ -214 +214 @@
 
             //$_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") );

branches/3.9/src/wp-admin/theme-editor.php

@@ -69 +69 @@
     $file = $allowed_files['style.css'];
 } else {
-    $relative_file = $file;
+    $relative_file = wp_unslash( $file );
     $file = $theme->get_stylesheet_directory() . '/' . $relative_file;
 }
@@ -128 +128 @@
 <?php endif;
 
-$description = get_file_description( $file );
+$file_description = get_file_description( $relative_file );
 $file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
-    $description .= ' <span>(' . $file_show . ')</span>';
+$description = esc_html( $file_description );
+if ( $file_description != $file_show ) {
+    $description .= ' <span>(' . esc_html( $file_show ) . ')</span>';
+}
 ?>
 <div class="wrap">
@@ -180 +182 @@
             echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
 
-        $file_description = get_file_description( $absolute_filename );
+        $file_description = esc_html( get_file_description( $filename ) );
         if ( $file_description != basename( $filename ) )
-            $file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
+            $file_description .= '<br /><span class="nonessential">(' . esc_html( $filename ) . ')</span>';
 
         if ( $absolute_filename == $file )