Changeset 24475

Timestamp:

06/21/2013 05:55:56 AM (13 years ago)

Author:

nacin

Message:

More robust escaping in the plugin/theme upgrader.

Merges [24474] to the 3.5 branch.

Location:

branches/3.5

Files:

• . (modified) (1 prop)
• wp-admin/includes/class-wp-upgrader.php (modified) (7 diffs)
• wp-admin/update.php (modified) (7 diffs)

branches/3.5/wp-admin/includes/class-wp-upgrader.php

@@ -99 +99 @@
                                 default:
                                         if ( ! $wp_filesystem->find_folder($dir) )
-                                                return new WP_Error('fs_no_folder', sprintf($this->strings['fs_no_folder'], $dir));
+                                                return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ) );
                                         break;
                         }
@@ -1134 +1134 @@
                         foreach ( $errors->get_error_messages() as $message ) {
                                 if ( $errors->get_error_data() )
-                                        $this->feedback($message . ' ' . $errors->get_error_data() );
+                                        $this->feedback($message . ' ' . esc_html( $errors->get_error_data() ) );
                                 else
                                         $this->feedback($message);
@@ -1148 +1148 @@
                         $args = func_get_args();
                         $args = array_splice($args, 1);
-                        if ( !empty($args) )
+                        if ( $args ) {
+                                $args = array_map( 'strip_tags', $args );
+                                $args = array_map( 'esc_html', $args );
                                 $string = vsprintf($string, $args);
+                        }
                 }
                 if ( empty($string) )
@@ -1189 +1192 @@
                 $this->plugin = $this->upgrader->plugin_info();
                 if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
-                        echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
+                        echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) .'"></iframe>';
                 }
 
                 $update_actions =  array(
-                        'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
+                        'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
                         'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
                 );
@@ -1245 +1248 @@
                         $args = func_get_args();
                         $args = array_splice($args, 1);
-                        if ( !empty($args) )
+                        if ( $args ) {
+                                $args = array_map( 'strip_tags', $args );
+                                $args = array_map( 'esc_html', $args );
                                 $string = vsprintf($string, $args);
+                        }
                 }
                 if ( empty($string) )
@@ -1270 +1276 @@
                         foreach ( $error->get_error_messages() as $emessage ) {
                                 if ( $error->get_error_data() )
-                                        $messages[] = $emessage . ' ' . $error->get_error_data();
+                                        $messages[] = $emessage . ' ' . esc_html( $error->get_error_data() );
                                 else
                                         $messages[] = $emessage;
@@ -1431 +1437 @@
 
                 if ( 'import' == $from )
-                        $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;from=import&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin &amp; Run Importer') . '</a>';
+                        $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin &amp; Run Importer') . '</a>';
                 else
-                        $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>';
+                        $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>';
 
                 if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-                        $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Network Activate') . '</a>';
+                        $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Network Activate') . '</a>';
                         unset( $install_actions['activate_plugin'] );
                 }

branches/3.5/wp-admin/update.php

@@ -58 +58 @@
 
                 $nonce = 'upgrade-plugin_' . $plugin;
-                $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin;
+                $url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
 
                 $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
@@ -71 +71 @@
                 check_admin_referer('activate-plugin_' . $plugin);
                 if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-                        wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
+                        wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
                         activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
-                        wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
+                        wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
                         die();
                 }
@@ -108 +108 @@
                 $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
                 $nonce = 'install-plugin_' . $plugin;
-                $url = 'update.php?action=install-plugin&plugin=' . $plugin;
+                $url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
                 if ( isset($_GET['from']) )
                         $url .= '&from=' . urlencode(stripslashes($_GET['from']));
@@ -133 +133 @@
                 require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-                $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
+                $title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
                 $nonce = 'plugin-upload';
                 $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
@@ -161 +161 @@
 
                 $nonce = 'upgrade-theme_' . $theme;
-                $url = 'update.php?action=upgrade-theme&theme=' . $theme;
+                $url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
 
                 $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
@@ -214 +214 @@
                 $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
                 $nonce = 'install-theme_' . $theme;
-                $url = 'update.php?action=install-theme&theme=' . $theme;
+                $url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
                 $type = 'web'; //Install theme type, From Web or an Upload.
 
@@ -239 +239 @@
                 require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-                $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );
+                $title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
                 $nonce = 'theme-upload';
                 $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');