Changeset 54816

Timestamp:

11/11/2022 04:02:41 PM (2 years ago)

Author:

desrosj

Message:

Filesystem: Return FTP/FTP Sockets exists() methods to a previous state.

This partially reverts [53860] and [53862], which refactored the exists() method to rely on ftp_rawlist() instead of ftp_nlist().

[53860] makes a similar attempt to the ones made in [33648] and [34733] (which were also reverted in [35944]). Being compliant with the specifications while continuing to work without issue for all FTP servers continues seem impossible. These little ghosts are the ones we’re scared of the most.

Props jsh4, afragen, costdev, pkolenbr, SergeyBiryukov, dd32, peterwilsoncc, gamecreature, desrosj.
Merges [54815] to the 6.1 branch.
Fixes #56966.
See #51170, #28013.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (2 diffs)
• src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (2 diffs)

branches/6.1/src/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -413 +413 @@
      *
      * @since 2.5.0
-     * @since 6.1.0 Uses WP_Filesystem_FTPext::is_dir() to check for directory existence
-     *              and ftp_rawlist() to check for file existence.
      *
      * @param string $path Path to file or directory.
@@ -420 +418 @@
      */
     public function exists( $path ) {
-        if ( $this->is_dir( $path ) ) {
-            return true;
-        }
-
-        return ! empty( ftp_rawlist( $this->link, $path ) );
+        $list = ftp_nlist( $this->link, $path );
+
+        if ( empty( $list ) && $this->is_dir( $path ) ) {
+            return true; // File is an empty directory.
+        }
+
+        return ! empty( $list ); // Empty list = no file, so invert.
     }
 

branches/6.1/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -415 +415 @@
      *
      * @since 2.5.0
-     * @since 6.1.0 Uses WP_Filesystem_ftpsockets::is_dir() to check for directory existence
-     *              and file size to check for file existence.
      *
      * @param string $path Path to file or directory.
@@ -422 +420 @@
      */
     public function exists( $path ) {
-        if ( $this->is_dir( $path ) ) {
-            return true;
-        }
-
-        return is_numeric( $this->size( $path ) );
+        $list = $this->ftp->nlist( $path );
+
+        if ( empty( $list ) && $this->is_dir( $path ) ) {
+            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.
     }