Changeset 55556

Timestamp:

03/16/2023 04:12:51 PM (21 months ago)

Author:

SergeyBiryukov

Message:

Filesystem API: Return false for empty paths in FTP ::exists() methods.

When ftp_nlist() receives an empty path, it checks the current working directory and may return true.

This affects:

• WP_Filesystem_FTPext::exists()
• WP_Filesystem_ftpsockets::exists()

As the purpose of the API is to provide a consistent interface for various filesystem implementations, this commit updates the affected methods to returns false when an empty path is provided, bringing consistency with the other filesystem abstraction classes, specifically WP_Filesystem_Direct and WP_Filesystem_SSH2.

Follow-up to [6779], [11821], [25274], [31815].

Props mkox, costdev, Zdrobau, dd32, pbiron, azaozz, mukesh27, SergeyBiryukov.
Fixes #33058.

Location:

trunk/src/wp-admin/includes

Files:

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

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

@@ -420 +420 @@
      *
      * @since 2.5.0
+     * @since 6.3.0 Returns false for an empty path.
      *
      * @param string $path Path to file or directory.
@@ -425 +426 @@
      */
     public function exists( $path ) {
+        /*
+         * Check for empty path. If ftp_nlist() receives an empty path,
+         * it checks the current working directory and may return true.
+         *
+         * See https://core.trac.wordpress.org/ticket/33058.
+         */
+        if ( '' === $path ) {
+            return false;
+        }
+
         $list = ftp_nlist( $this->link, $path );
 

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

@@ -422 +422 @@
      *
      * @since 2.5.0
+     * @since 6.3.0 Returns false for an empty path.
      *
      * @param string $path Path to file or directory.
@@ -427 +428 @@
      */
     public function exists( $path ) {
+        /*
+         * Check for empty path. If ftp::nlist() receives an empty path,
+         * it checks the current working directory and may return true.
+         *
+         * See https://core.trac.wordpress.org/ticket/33058.
+         */
+        if ( '' === $path ) {
+            return false;
+        }
+
         $list = $this->ftp->nlist( $path );