Changeset 24474 for trunk/wp-admin/includes/class-wp-upgrader.php

Timestamp:

06/21/2013 05:54:40 AM (13 years ago)

Author:

nacin

Message:

More robust escaping in the plugin/theme upgrader.

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (7 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -100 +100 @@
                                 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;
                         }
@@ -1145 +1145 @@
                         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);
@@ -1159 +1159 @@
                         $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) )
@@ -1200 +1203 @@
                 $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>'
                 );
@@ -1256 +1259 @@
                         $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) )
@@ -1281 +1287 @@
                         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;
@@ -1443 +1449 @@
 
                 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'] );
                 }