Changeset 53860

Timestamp:

08/08/2022 12:39:51 PM (4 years ago)

Author:

audrasjb

Message:

Filesystem: Rewrite FTP/FTP Sockets exists() methods to implement a more stable check.

WordPress FTP file checking was previously based upon ftp_nlist(). This function can be problematic at scale with a directory containing a large number of files. The same issue occurred using it with ftpsockets.

This changeset rewrites the FTP exists() functions to utilize a more efficient and stable check.

Props giox069, desrosj, mkox, afragen, costdev, pbiron, peterwilsoncc.
Fixes #51170.
See #53318, #39781.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-filesystem-ftpext.php (modified) (3 diffs)
• class-wp-filesystem-ftpsockets.php (modified) (2 diffs)

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

@@ -413 +413 @@
          *
          * @since 2.5.0
+         * @since 6.1.0 Rewrite using ftp_rawlist, uses 'LIST' on FTP server
+         *              takes file path or directory path as parameter.
          *
          * @param string $file Path to file or directory.
@@ -418 +420 @@
          */
         public function exists( $file ) {
-                $list = ftp_nlist( $this->link, $file );
-
-                if ( empty( $list ) && $this->is_dir( $file ) ) {
-                        return true; // File is an empty directory.
-                }
-
-                return ! empty( $list ); // Empty list = no file, so invert.
+                if ( $this->is_dir( $file ) ) {
+                        return true;
+                }
+
+                return ! empty( ftp_rawlist( $this->link, $file ) );
         }
 
@@ -511 +511 @@
          *
          * @since 2.5.0
+         * @since 6.1.0 Update for proper return values.
          *
          * @param string $file Path to file.
-         * @return int|false Size of the file in bytes on success, false on failure.
+         * @return int Size of the file in bytes on success, -1 on failure.
          */
         public function size( $file ) {

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

@@ -415 +415 @@
          *
          * @since 2.5.0
+         * @since 6.1.0 Rewrite using file size.
          *
          * @param string $file Path to file or directory.
@@ -420 +421 @@
          */
         public function exists( $file ) {
-                $list = $this->ftp->nlist( $file );
-
-                if ( empty( $list ) && $this->is_dir( $file ) ) {
-                        return true; // File is an empty directory.
-                }
-
-                return ! empty( $list ); // Empty list = no file, so invert.
-                // Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
+                if ( $this->is_dir( $file ) ) {
+                        return true;
+                }
+
+                return is_numeric( $this->size( $file ) );
         }