Changeset 6026

Timestamp:

10/13/2017 11:31:06 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: When searching for the main plugin file on upload, limit recursion depth to 1 level.

Scanning the deeper levels can grab the wrong data, e.g. if there's a sub-plugin with headers, it may be scanned instead of the main one.

Fixes #2804.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• admin/class-status-transitions.php (modified) (1 diff)
• shortcodes/class-upload-handler.php (modified) (1 diff)
• tools/class-filesystem.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php

@@ -264 +264 @@
         private function get_plugin_root( $dir ) {
                 $plugin_root  = '';
-                $plugin_files = Filesystem::list_files( $dir, true /* Recursive */, '!\.php$!i' );
+                $plugin_files = Filesystem::list_files( $dir, true /* Recursive */, '!\.php$!i', 1 /* Depth */ );
 
                 foreach ( $plugin_files as $plugin_file ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -61 +61 @@
                 $this->plugin_dir = Filesystem::unzip( $zip_file );
 
-                $plugin_files = Filesystem::list_files( $this->plugin_dir, true /* Recursive */, '!\.php$!i' );
+                $plugin_files = Filesystem::list_files( $this->plugin_dir, true /* Recursive */, '!\.php$!i', 1 /* Depth */ );
                 foreach ( $plugin_files as $plugin_file ) {
                         $plugin_data = get_plugin_data( $plugin_file, false, false ); // No markup/translation needed.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-filesystem.php

@@ -81 +81 @@
          * @param bool   $recursive Optional. Whether to recurse into subdirectories. Default: false.
          * @param string $pattern   Optional. A regular expression to match files against. Default: null.
+         * @param int    $depth     Optional. Recursion depth. Default: -1 (infinite).
          * @return array All files within the passed directory.
          */
-        public static function list_files( $directory, $recursive = false, $pattern = null ) {
+        public static function list_files( $directory, $recursive = false, $pattern = null, $depth = -1 ) {
                 if ( $recursive ) {
                         $iterator = new \RecursiveIteratorIterator(
@@ -89 +90 @@
                                 \RecursiveIteratorIterator::SELF_FIRST
                         );
+
+                        if ( $depth > -1 ) {
+                                $iterator->setMaxDepth( $depth );
+                        }
                 } else {
                         $iterator = new \DirectoryIterator( $directory );