Changeset 41415 for branches/4.5/src/wp-admin/plugin-editor.php

Timestamp:

09/19/2017 10:31:43 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.

Merges [41414] into the 4.5. branch

See #13377

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• src/wp-admin/plugin-editor.php (modified) (3 diffs)

branches/4.5/src/wp-admin/plugin-editor.php

@@ -97 +97 @@
 
         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
-
-        wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+            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=" . urlencode( $file ) . "&a=te&scrollto=$scrollto") );
         exit;
     }
@@ -192 +192 @@
         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>' );
         }
     }
@@ -248 +248 @@
     }
 ?>
-        <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>