Changeset 62636

Timestamp:

07/05/2026 12:46:16 AM (3 months ago)

Author:

westonruter

Message:

Filesystem: Fix subdirectory recursion in WP_Filesystem_Direct::chgrp() and ::chown().

This applies the equivalent fix which had previously been done to ::chmod(). Tests are added for all three methods.

Developed in subset of ​https://github.com/WordPress/wordpress-develop/pull/11593.
Follow-up to r12997.

Fixes #65584.
See #65409, #11261.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-filesystem-direct.php (modified) (2 diffs)
• tests/phpunit/tests/filesystem/wpFilesystemDirect/base.php (modified) (1 diff)
• tests/phpunit/tests/filesystem/wpFilesystemDirect/chgrp.php (modified) (1 diff)
• tests/phpunit/tests/filesystem/wpFilesystemDirect/chmod.php (modified) (1 diff)
• tests/phpunit/tests/filesystem/wpFilesystemDirect/chown.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -140 +140 @@
                 $filelist = $this->dirlist( $file );
 
-                foreach ( $filelist as $filename ) {
-                        $this->chgrp( $file . $filename, $group, $recursive );
+                foreach ( $filelist as $file_listing ) {
+                        $this->chgrp( $file . $file_listing['name'], $group, $recursive );
                 }
 
@@ -228 +228 @@
                 $filelist = $this->dirlist( $file );
 
-                foreach ( $filelist as $filename ) {
-                        $this->chown( $file . '/' . $filename, $owner, $recursive );
+                foreach ( $filelist as $file_listing ) {
+                        $this->chown( $file . '/' . $file_listing['name'], $owner, $recursive );
                 }
 

trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/base.php

@@ -18 +18 @@
          * The file structure for tests.
          *
-         * @var array
+         * @var array<string, array{type: string, path: string, contents?: string}>
          */
         protected static $file_structure = array();

trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/chgrp.php

@@ -30 +30 @@
                 $this->assertFalse( self::$filesystem->chgrp( self::$file_structure['test_dir']['path'] . $path, 0 ) );
         }
+
+        /**
+         * Tests that recursive {@see WP_Filesystem_Direct::chgrp()} descends into subdirectories.
+         *
+         * The resulting group cannot be asserted without elevated privileges, so recursion is
+         * verified by recording the paths passed to {@see WP_Filesystem_Direct::chgrp()}. Changing each item to its current
+         * group is a permitted no-op that avoids requiring root and its "Operation not permitted" warning.
+         *
+         * @ticket 65584
+         */
+        public function test_should_recurse_into_subdirectories(): void {
+                $directory   = untrailingslashit( self::$file_structure['test_dir']['path'] );
+                $nested_file = self::$file_structure['subfile']['path'];
+
+                $spy = new class( null ) extends WP_Filesystem_Direct {
+                        /** @var string[] */
+                        public array $visited = array();
+
+                        public function chgrp( $file, $group, $recursive = false ) {
+                                $this->visited[] = $file;
+                                return parent::chgrp( $file, $group, $recursive );
+                        }
+                };
+
+                $spy->chgrp( $directory, (int) filegroup( $directory ), true );
+
+                $this->assertContains(
+                        $nested_file,
+                        $spy->visited,
+                        'chgrp() did not recurse into the nested subdirectory.'
+                );
+        }
 }

trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/chmod.php

@@ -75 +75 @@
                 );
         }
+
+        /**
+         * Tests that recursive {@see WP_Filesystem_Direct::chmod()} applies the mode to files in subdirectories.
+         *
+         * @ticket 65584
+         */
+        public function test_should_change_mode_recursively(): void {
+                if ( self::is_windows() ) {
+                        $this->markTestSkipped( 'chmod() does not support octal modes on Windows.' );
+                }
+
+                $directory   = untrailingslashit( self::$file_structure['test_dir']['path'] );
+                $nested_file = self::$file_structure['subfile']['path'];
+
+                $this->assertTrue(
+                        self::$filesystem->chmod( $directory, 0640, true ),
+                        'chmod() did not report success.'
+                );
+
+                clearstatcache();
+
+                $this->assertSame(
+                        '640',
+                        self::$filesystem->getchmod( $nested_file ),
+                        'The mode was not applied to a file in a nested subdirectory.'
+                );
+        }
 }

trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/chown.php

@@ -30 +30 @@
                 $this->assertFalse( self::$filesystem->chown( $path, fileowner( __FILE__ ) ) );
         }
+
+        /**
+         * Tests that recursive {@see WP_Filesystem_Direct::chown()} descends into subdirectories.
+         *
+         * The resulting owner cannot be asserted without elevated privileges, so recursion is
+         * verified by recording the paths passed to {@see WP_Filesystem_Direct::chown()}. Changing each item to its current
+         * owner is a permitted no-op that avoids requiring root and its "Operation not permitted" warning.
+         *
+         * @ticket 65584
+         */
+        public function test_should_recurse_into_subdirectories(): void {
+                $directory   = untrailingslashit( self::$file_structure['test_dir']['path'] );
+                $nested_file = self::$file_structure['subfile']['path'];
+
+                $spy = new class( null ) extends WP_Filesystem_Direct {
+                        /** @var string[] */
+                        public array $visited = array();
+
+                        public function chown( $file, $owner, $recursive = false ) {
+                                $this->visited[] = $file;
+                                return parent::chown( $file, $owner, $recursive );
+                        }
+                };
+
+                $spy->chown( $directory, (int) fileowner( $directory ), true );
+
+                $this->assertContains(
+                        $nested_file,
+                        $spy->visited,
+                        'chown() did not recurse into the nested subdirectory.'
+                );
+        }
 }