Changeset 34738

Timestamp:

10/01/2015 05:39:44 AM (11 years ago)

Author:

dd32

Message:

Updates: SSH2 Transport: Use a work around to avoid a bug where PHP's SSH2 extension fails to list the contents of the / directory.
This fixes issues where SSH2 with chrooted environments runs into a Unable to locate WordPress Content directory (wp-content). error.

The workaround is to simply list the contents of the /./ directory instead of /.

Fixes #33919

File:

• trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php (modified) (15 diffs)

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

@@ -137 +137 @@
 
         /**
+         * Gets the ssh2.sftp PHP stream wrapper path to open for the given file.
+         *
+         * This method also works around a PHP bug where the root directory (/) cannot
+         * be opened by PHP functions, causing a false failure. In order to work around
+         * this, the path is converted to /./ which is semantically the same as /
+         * See https://bugs.php.net/bug.php?id=64169 for more details.
+         *
+         * @access public
+         *
+         * @since 4.4
+         *
+         * @param string $path The File/Directory path on the remote server to return
+         * @return string The ssh2.sftp:// wrapped path to use.
+         */
+        public function sftp_path( $path ) {
+                if ( '/' === $path ) {
+                        $path = '/./';
+                }
+                return 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $path, '/' );
+        }
+
+        /**
          * @access public
          * 
@@ -170 +192 @@
          */
         public function get_contents( $file ) {
-                $file = ltrim($file, '/');
-                return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return file_get_contents( $this->sftp_path( $file ) );
         }
 
@@ -181 +202 @@
          */
         public function get_contents_array($file) {
-                $file = ltrim($file, '/');
-                return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return file( $this->sftp_path( $file ) );
         }
 
@@ -194 +214 @@
          */
         public function put_contents($file, $contents, $mode = false ) {
-                $ret = file_put_contents( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ), $contents );
+                $ret = file_put_contents( $this->sftp_path( $file ), $contents );
 
                 if ( $ret !== strlen( $contents ) )
@@ -295 +315 @@
          */
         public function owner($file) {
-                $owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+                $owneruid = @fileowner( $this->sftp_path( $file ) );
                 if ( ! $owneruid )
                         return false;
@@ -311 +331 @@
          */
         public function getchmod($file) {
-                return substr( decoct( @fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ) ) ), -3 );
+                return substr( decoct( @fileperms( $this->sftp_path( $file ) ) ), -3 );
         }
 
@@ -321 +341 @@
          */
         public function group($file) {
-                $gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+                $gid = @filegroup( $this->sftp_path( $file ) );
                 if ( ! $gid )
                         return false;
@@ -389 +409 @@
          */
         public function exists($file) {
-                $file = ltrim($file, '/');
-                return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return file_exists( $this->sftp_path( $file ) );
         }
 
@@ -400 +419 @@
          */
         public function is_file($file) {
-                $file = ltrim($file, '/');
-                return is_file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return is_file( $this->sftp_path( $file ) );
         }
 
@@ -411 +429 @@
          */
         public function is_dir($path) {
-                $path = ltrim($path, '/');
-                return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path);
+                return is_dir( $this->sftp_path( $path ) );
         }
 
@@ -422 +439 @@
          */
         public function is_readable($file) {
-                $file = ltrim($file, '/');
-                return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return is_readable( $this->sftp_path( $file ) );
         }
 
@@ -444 +460 @@
          */
         public function atime($file) {
-                $file = ltrim($file, '/');
-                return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return fileatime( $this->sftp_path( $file ) );
         }
 
@@ -455 +470 @@
          */
         public function mtime($file) {
-                $file = ltrim($file, '/');
-                return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return filemtime( $this->sftp_path( $file ) );
         }
 
@@ -466 +480 @@
          */
         public function size($file) {
-                $file = ltrim($file, '/');
-                return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+                return filesize( $this->sftp_path( $file ) );
         }
 
@@ -537 +550 @@
 
                 $ret = array();
-                $dir = @dir('ssh2.sftp://' . $this->sftp_link .'/' . ltrim($path, '/') );
+                $dir = @dir( $this->sftp_path( $path ) );
 
                 if ( ! $dir )