Changeset 41399 for trunk/src/wp-admin/plugin-editor.php

Timestamp:

09/19/2017 10:10:35 AM (7 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.

Props kawauso, Mte90 for initial patches

Fixes #13377

File:

• trunk/src/wp-admin/plugin-editor.php (modified) (4 diffs)

trunk/src/wp-admin/plugin-editor.php

@@ -38 +38 @@
 $plugin = '';
 if ( isset( $_REQUEST['file'] ) ) {
-    $file = sanitize_text_field( $_REQUEST['file'] );
+    $file = wp_unslash( $_REQUEST['file'] );
 }
 
 if ( isset( $_REQUEST['plugin'] ) ) {
-    $plugin = sanitize_text_field( $_REQUEST['plugin'] );
+    $plugin = wp_unslash( $_REQUEST['plugin'] );
 }
 
@@ -108 +108 @@
 
         if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network( $file ) ) || ! is_plugin_active( $file ) ) {
-            activate_plugin( $plugin, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) );
+            activate_plugin( $plugin, "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&plugin=$plugin&a=te&scrollto=$scrollto") );
+        wp_redirect( self_admin_url( 'plugin-editor.php?file=' . urlencode( $file ) . '&plugin=' . urlencode( $plugin ) . "&a=te&scrollto=$scrollto" ) );
         exit;
     }
@@ -243 +243 @@
         if ( is_writeable( $real_file ) ) {
             /* translators: %s: plugin file name */
-            echo sprintf( __( 'Editing %s (active)' ), '<strong>' . $file . '</strong>' );
+            echo sprintf( __( 'Editing %s (active)' ), '<strong>' . esc_html( $file ) . '</strong>' );
         } else {
             /* translators: %s: plugin file name */
-            echo sprintf( __( 'Browsing %s (active)' ), '<strong>' . $file . '</strong>' );
+            echo sprintf( __( 'Browsing %s (active)' ), '<strong>' . esc_html( $file ) . '</strong>' );
         }
     } else {
         if ( is_writeable( $real_file ) ) {
             /* translators: %s: plugin file name */
-            echo sprintf( __( 'Editing %s (inactive)' ), '<strong>' . $file . '</strong>' );
+            echo sprintf( __( 'Editing %s (inactive)' ), '<strong>' . esc_html( $file ) . '</strong>' );
         } else {
             /* translators: %s: plugin file name */
-            echo sprintf( __( 'Browsing %s (inactive)' ), '<strong>' . $file . '</strong>' );
+            echo sprintf( __( 'Browsing %s (inactive)' ), '<strong>' . esc_html( $file ) . '</strong>' );
         }
     }
@@ -299 +299 @@
     }
 ?>
-        <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>