From dc11b33974c5217cc6f7023e3dfc9b34133ea37d Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 19 Sep 2017 13:39:24 +0000 Subject: [PATCH] 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.1 branch. See #13377 Built from https://develop.svn.wordpress.org/branches/4.1@41446 git-svn-id: http://core.svn.wordpress.org/branches/4.1@41279 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-wp-plugins-list-table.php | 14 +++++++------- wp-admin/includes/template.php | 2 +- wp-admin/plugin-editor.php | 14 +++++++------- wp-admin/plugins.php | 16 ++++++++-------- wp-admin/theme-editor.php | 14 ++++++++------ 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index 1ade73caac..6793bf3123 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -425,27 +425,27 @@ class WP_Plugins_List_Table extends WP_List_Table { if ( $screen->in_admin( 'network' ) ) { if ( $is_active ) { if ( current_user_can( 'manage_network_plugins' ) ) - $actions['deactivate'] = '' . __('Network Deactivate') . ''; + $actions['deactivate'] = '' . __('Network Deactivate') . ''; } else { if ( current_user_can( 'manage_network_plugins' ) ) - $actions['activate'] = '' . __('Network Activate') . ''; + $actions['activate'] = '' . __('Network Activate') . ''; if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) - $actions['delete'] = '' . __('Delete') . ''; + $actions['delete'] = '' . __('Delete') . ''; } } else { if ( $is_active ) { - $actions['deactivate'] = '' . __('Deactivate') . ''; + $actions['deactivate'] = '' . __('Deactivate') . ''; } else { - $actions['activate'] = '' . __('Activate') . ''; + $actions['activate'] = '' . __('Activate') . ''; if ( ! is_multisite() && current_user_can('delete_plugins') ) - $actions['delete'] = '' . __('Delete') . ''; + $actions['delete'] = '' . __('Delete') . ''; } // 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'] = '' . __('Edit') . ''; + $actions['edit'] = '' . __('Edit') . ''; } // end if $context $prefix = $screen->in_admin( 'network' ) ? 'network_admin_' : ''; diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 1087837cd6..5eb078a3dd 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -800,7 +800,7 @@ function page_template_dropdown( $default = '' ) { ksort( $templates ); foreach ( array_keys( $templates ) as $template ) { $selected = selected( $default, $templates[ $template ], false ); - echo "\n\t"; + echo "\n\t"; } } diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index 1c242955ba..ee32445506 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -93,9 +93,9 @@ default: wp_die( $error ); 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 + 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=$file&a=te&scrollto=$scrollto") ); + wp_redirect( self_admin_url("plugin-editor.php?file=" . urlencode( $file ) . "&a=te&scrollto=$scrollto") ); exit; } @@ -181,14 +181,14 @@ default: %s (active)'), $file); + echo sprintf(__('Editing %s (active)'), esc_html( $file ) ); else - echo sprintf(__('Browsing %s (active)'), $file); + echo sprintf(__('Browsing %s (active)'), esc_html( $file ) ); } else { if ( is_writeable($real_file) ) - echo sprintf(__('Editing %s (inactive)'), $file); + echo sprintf(__('Editing %s (inactive)'), esc_html( $file ) ); else - echo sprintf(__('Browsing %s (inactive)'), $file); + echo sprintf(__('Browsing %s (inactive)'), esc_html( $file ) ); } ?> @@ -232,7 +232,7 @@ foreach ( $plugin_files as $plugin_file ) : continue; } ?> - > + > diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index f12f9a2b4a..a12ce0bdb7 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -17,7 +17,7 @@ $pagenum = $wp_list_table->get_pagenum(); $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']) : ''; // Clean up request URI from temporary args for screen options/paging uri's to work as expected. @@ -37,10 +37,10 @@ if ( $action ) { 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; } else { @@ -67,7 +67,7 @@ if ( $action ) { 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() ) { foreach ( $plugins as $i => $plugin ) { @@ -107,9 +107,9 @@ if ( $action ) { check_admin_referer( 'bulk-plugins' ); 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(); @@ -181,7 +181,7 @@ if ( $action ) { 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() ) { $plugins = array_filter( $plugins, 'is_plugin_active_for_network' ); @@ -214,7 +214,7 @@ if ( $action ) { check_admin_referer('bulk-plugins'); //$_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") ); exit; diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index d0ecee48f4..37d5f70568 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -68,7 +68,7 @@ if ( empty( $file ) ) { $relative_file = 'style.css'; $file = $allowed_files['style.css']; } else { - $relative_file = $file; + $relative_file = wp_unslash( $file ); $file = $theme->get_stylesheet_directory() . '/' . $relative_file; } @@ -125,10 +125,12 @@ default:

(' . $file_show . ')'; +$description = esc_html( $file_description ); +if ( $file_description != $file_show ) { + $description .= ' (' . esc_html( $file_show ) . ')'; +} ?>

@@ -177,9 +179,9 @@ if ( $allowed_files ) : if ( 'style.css' == $filename ) echo "\t\n\t

" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "

\n\t
    \n"; - $file_description = get_file_description( $absolute_filename ); + $file_description = esc_html( get_file_description( $filename ) ); if ( $file_description != basename( $filename ) ) - $file_description .= '
    (' . $filename . ')'; + $file_description .= '
    (' . esc_html( $filename ) . ')'; if ( $absolute_filename == $file ) $file_description = '' . $file_description . '';