<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24475] branches/3.5: More robust escaping in the plugin/theme upgrader.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24475">24475</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-06-21 05:55:56 +0000 (Fri, 21 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>More robust escaping in the plugin/theme upgrader.
Merges <a href="http://core.trac.wordpress.org/changeset/24474">[24474]</a> to the 3.5 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches35wpadminincludesclasswpupgraderphp">branches/3.5/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#branches35wpadminupdatephp">branches/3.5/wp-admin/update.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches35">branches/3.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.5
</span><span class="cx">===================================================================
</span><del>--- branches/3.5 2013-06-21 05:54:40 UTC (rev 24474)
</del><ins>+++ branches/3.5 2013-06-21 05:55:56 UTC (rev 24475)
</ins><a id="branches35"></a>
<div class="propset"><h4>Property changes: branches/3.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24446,24448,24457,24459,24461,24463,24466,24468,24470,24472
</del><ins>+/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24446,24448,24457,24459,24461,24463,24466,24468,24470,24472,24474
</ins><span class="cx">\ No newline at end of property
</span><a id="branches35wpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-admin/includes/class-wp-upgrader.php (24474 => 24475)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-admin/includes/class-wp-upgrader.php 2013-06-21 05:54:40 UTC (rev 24474)
+++ branches/3.5/wp-admin/includes/class-wp-upgrader.php 2013-06-21 05:55:56 UTC (rev 24475)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> if ( ! $wp_filesystem->find_folder($dir) )
</span><del>- return new WP_Error('fs_no_folder', sprintf($this->strings['fs_no_folder'], $dir));
</del><ins>+ return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ) );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1133,7 +1133,7 @@
</span><span class="cx"> } elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
</span><span class="cx"> foreach ( $errors->get_error_messages() as $message ) {
</span><span class="cx"> if ( $errors->get_error_data() )
</span><del>- $this->feedback($message . ' ' . $errors->get_error_data() );
</del><ins>+ $this->feedback($message . ' ' . esc_html( $errors->get_error_data() ) );
</ins><span class="cx"> else
</span><span class="cx"> $this->feedback($message);
</span><span class="cx"> }
</span><span class="lines">@@ -1147,8 +1147,11 @@
</span><span class="cx"> if ( strpos($string, '%') !== false ) {
</span><span class="cx"> $args = func_get_args();
</span><span class="cx"> $args = array_splice($args, 1);
</span><del>- if ( !empty($args) )
</del><ins>+ if ( $args ) {
+ $args = array_map( 'strip_tags', $args );
+ $args = array_map( 'esc_html', $args );
</ins><span class="cx"> $string = vsprintf($string, $args);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> if ( empty($string) )
</span><span class="cx"> return;
</span><span class="lines">@@ -1188,11 +1191,11 @@
</span><span class="cx"> function after() {
</span><span class="cx"> $this->plugin = $this->upgrader->plugin_info();
</span><span class="cx"> if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
</span><del>- 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>';
</del><ins>+ 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>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $update_actions = array(
</span><del>- 'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
</del><ins>+ 'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
</ins><span class="cx"> 'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
</span><span class="cx"> );
</span><span class="cx"> if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
</span><span class="lines">@@ -1244,8 +1247,11 @@
</span><span class="cx"> if ( strpos($string, '%') !== false ) {
</span><span class="cx"> $args = func_get_args();
</span><span class="cx"> $args = array_splice($args, 1);
</span><del>- if ( !empty($args) )
</del><ins>+ if ( $args ) {
+ $args = array_map( 'strip_tags', $args );
+ $args = array_map( 'esc_html', $args );
</ins><span class="cx"> $string = vsprintf($string, $args);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> if ( empty($string) )
</span><span class="cx"> return;
</span><span class="lines">@@ -1269,7 +1275,7 @@
</span><span class="cx"> if ( is_wp_error($error) ) {
</span><span class="cx"> foreach ( $error->get_error_messages() as $emessage ) {
</span><span class="cx"> if ( $error->get_error_data() )
</span><del>- $messages[] = $emessage . ' ' . $error->get_error_data();
</del><ins>+ $messages[] = $emessage . ' ' . esc_html( $error->get_error_data() );
</ins><span class="cx"> else
</span><span class="cx"> $messages[] = $emessage;
</span><span class="cx"> }
</span><span class="lines">@@ -1430,12 +1436,12 @@
</span><span class="cx"> $from = isset($_GET['from']) ? stripslashes($_GET['from']) : 'plugins';
</span><span class="cx">
</span><span class="cx"> if ( 'import' == $from )
</span><del>- $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&from=import&plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin & Run Importer') . '</a>';
</del><ins>+ $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin & Run Importer') . '</a>';
</ins><span class="cx"> else
</span><del>- $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>';
</del><ins>+ $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
</span><del>- $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&networkwide=1&plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Network Activate') . '</a>';
</del><ins>+ $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&networkwide=1&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>';
</ins><span class="cx"> unset( $install_actions['activate_plugin'] );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1670,4 +1676,4 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="branches35wpadminupdatephp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-admin/update.php (24474 => 24475)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-admin/update.php 2013-06-21 05:54:40 UTC (rev 24474)
+++ branches/3.5/wp-admin/update.php 2013-06-21 05:55:56 UTC (rev 24475)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">
</span><span class="cx"> $nonce = 'upgrade-plugin_' . $plugin;
</span><del>- $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin;
</del><ins>+ $url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
</ins><span class="cx">
</span><span class="cx"> $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
</span><span class="cx"> $upgrader->upgrade($plugin);
</span><span class="lines">@@ -70,9 +70,9 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer('activate-plugin_' . $plugin);
</span><span class="cx"> if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
</span><del>- wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
</del><ins>+ wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
</ins><span class="cx"> activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
</span><del>- wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
</del><ins>+ wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx"> iframe_header( __('Plugin Reactivation'), true );
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
</span><span class="cx"> $nonce = 'install-plugin_' . $plugin;
</span><del>- $url = 'update.php?action=install-plugin&plugin=' . $plugin;
</del><ins>+ $url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
</ins><span class="cx"> if ( isset($_GET['from']) )
</span><span class="cx"> $url .= '&from=' . urlencode(stripslashes($_GET['from']));
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> $submenu_file = 'plugin-install.php';
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">
</span><del>- $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
</del><ins>+ $title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
</ins><span class="cx"> $nonce = 'plugin-upload';
</span><span class="cx"> $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
</span><span class="cx"> $type = 'upload'; //Install plugin type, From Web or an Upload.
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">
</span><span class="cx"> $nonce = 'upgrade-theme_' . $theme;
</span><del>- $url = 'update.php?action=upgrade-theme&theme=' . $theme;
</del><ins>+ $url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
</ins><span class="cx">
</span><span class="cx"> $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
</span><span class="cx"> $upgrader->upgrade($theme);
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
</span><span class="cx"> $nonce = 'install-theme_' . $theme;
</span><del>- $url = 'update.php?action=install-theme&theme=' . $theme;
</del><ins>+ $url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
</ins><span class="cx"> $type = 'web'; //Install theme type, From Web or an Upload.
</span><span class="cx">
</span><span class="cx"> $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">
</span><del>- $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );
</del><ins>+ $title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
</ins><span class="cx"> $nonce = 'theme-upload';
</span><span class="cx"> $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
</span><span class="cx"> $type = 'upload'; //Install plugin type, From Web or an Upload.
</span></span></pre>
</div>
</div>
</body>
</html>