WordPress 4.6.3

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-filesystem-ssh2.php

diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index e446656ec11f4c53448b78780eb859fdf3f91fc7..158b55598c626380c288a5b414f843655712a45c 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -35,14 +35,20 @@
  */
 class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
  */
 class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 

+       /**
+        * @access public
+        */

        public $link = false;
        public $link = false;

+

        /**
        /**

+        * @access public

         * @var resource
         */
        public $sftp_link;
        public $keys = false;
 
        /**
         * @var resource
         */
        public $sftp_link;
        public $keys = false;
 
        /**

+        * @access public

         *
         * @param array $opt
         */
         *
         * @param array $opt
         */


@@ -56,7 +62,14 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                        return;
                }
                if ( !function_exists('stream_get_contents') ) {
                        return;
                }
                if ( !function_exists('stream_get_contents') ) {

-                       $this->errors->add('ssh2_php_requirement', __('The ssh2 PHP extension is available, however, we require the PHP5 function <code>stream_get_contents()</code>'));
+                       $this->errors->add(
+                               'ssh2_php_requirement',
+                               sprintf(
+                                       /* translators: %s: stream_get_contents() */
+                                       __( 'The ssh2 PHP extension is available, however, we require the PHP5 function %s' ),
+                                       '<code>stream_get_contents()</code>'
+                               )
+                       );

                        return;
                }
 
                        return;
                }
 


@@ -96,6 +109,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public

         *
         * @return bool
         */
         *
         * @return bool
         */


@@ -107,38 +121,92 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                }
 
                if ( ! $this->link ) {
                }
 
                if ( ! $this->link ) {

-                       $this->errors->add('connect', sprintf(__('Failed to connect to SSH2 Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+                       $this->errors->add( 'connect',
+                               /* translators: %s: hostname:port */
+                               sprintf( __( 'Failed to connect to SSH2 Server %s' ),
+                                       $this->options['hostname'] . ':' . $this->options['port']
+                               )
+                       );

                        return false;
                }
 
                if ( !$this->keys ) {
                        if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
                        return false;
                }
 
                if ( !$this->keys ) {
                        if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {

-                               $this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
+                               $this->errors->add( 'auth',
+                                       /* translators: %s: username */
+                                       sprintf( __( 'Username/Password incorrect for %s' ),
+                                               $this->options['username']
+                                       )
+                               );

                                return false;
                        }
                } else {
                        if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
                                return false;
                        }
                } else {
                        if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {

-                               $this->errors->add('auth', sprintf(__('Public and Private keys incorrect for %s'), $this->options['username']));
+                               $this->errors->add( 'auth',
+                                       /* translators: %s: username */
+                                       sprintf( __( 'Public and Private keys incorrect for %s' ),
+                                               $this->options['username']
+                                       )
+                               );

                                return false;
                        }
                }
 
                                return false;
                        }
                }
 

-               $this->sftp_link = ssh2_sftp($this->link);
+               $this->sftp_link = ssh2_sftp( $this->link );
+               if ( ! $this->sftp_link ) {
+                       $this->errors->add( 'connect',
+                               /* translators: %s: hostname:port */
+                               sprintf( __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %s' ),
+                                       $this->options['hostname'] . ':' . $this->options['port']
+                               )
+                       );
+                       return false;
+               }

 
                return true;
        }
 
        /**
 
                return true;
        }
 
        /**

+        * 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.0
+        *
+        * @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
+        * 

         * @param string $command
         * @param bool $returnbool
         * @param string $command
         * @param bool $returnbool

-        * @return bool|string
+        * @return bool|string True on success, false on failure. String if the command was executed, `$returnbool`
+        *                     is false (default), and data from the resulting stream was retrieved.

         */
        public function run_command( $command, $returnbool = false ) {
                if ( ! $this->link )
                        return false;
 
                if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
         */
        public function run_command( $command, $returnbool = false ) {
                if ( ! $this->link )
                        return false;
 
                if ( ! ($stream = ssh2_exec($this->link, $command)) ) {

-                       $this->errors->add('command', sprintf(__('Unable to perform command: %s'), $command));
+                       $this->errors->add( 'command',
+                               /* translators: %s: command */
+                               sprintf( __( 'Unable to perform command: %s'),
+                                       $command
+                               )
+                       );

                } else {
                        stream_set_blocking( $stream, true );
                        stream_set_timeout( $stream, FS_TIMEOUT );
                } else {
                        stream_set_blocking( $stream, true );
                        stream_set_timeout( $stream, FS_TIMEOUT );


@@ -154,31 +222,35 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return string|false
         */
        public function get_contents( $file ) {
         * @param string $file
         * @return string|false
         */
        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 ) );

        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return array
         */
        public function get_contents_array($file) {
         * @param string $file
         * @return array
         */
        public function get_contents_array($file) {

-               $file = ltrim($file, '/');
-               return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               return file( $this->sftp_path( $file ) );

        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string   $file
         * @param string   $contents
         * @param bool|int $mode
         * @return bool
         */
        public function put_contents($file, $contents, $mode = false ) {
         * @param string   $file
         * @param string   $contents
         * @param bool|int $mode
         * @return bool
         */
        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 ) )
                        return false;
 
                if ( $ret !== strlen( $contents ) )
                        return false;


@@ -189,6 +261,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public

         *
         * @return bool
         */
         *
         * @return bool
         */


@@ -201,6 +274,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $dir
         * @return bool|string
         */
         * @param string $dir
         * @return bool|string
         */


@@ -209,6 +284,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @param string $group
         * @param bool   $recursive
         * @param string $file
         * @param string $group
         * @param bool   $recursive


@@ -224,6 +301,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @param int    $mode
         * @param bool   $recursive
         * @param string $file
         * @param int    $mode
         * @param bool   $recursive


@@ -250,12 +329,12 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        /**
         * Change the ownership of a file / folder.
         *
        /**
         * Change the ownership of a file / folder.
         *

-        * @since Unknown
+        * @access public

         *
         *

-        * @param string     $file    Path to the file.
-        * @param string|int $owner   A user name or number.
-        * @param bool       $recursive Optional. If set True changes file owner recursivly. Defaults to False.
-        * @return bool|string Returns true on success or false on failure.
+        * @param string     $file      Path to the file.
+        * @param string|int $owner     A user name or number.
+        * @param bool       $recursive Optional. If set True changes file owner recursivly. Default False.
+        * @return bool True on success or false on failure.

         */
        public function chown( $file, $owner, $recursive = false ) {
                if ( ! $this->exists($file) )
         */
        public function chown( $file, $owner, $recursive = false ) {
                if ( ! $this->exists($file) )


@@ -266,11 +345,13 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return string|false
         */
        public function owner($file) {
         * @param string $file
         * @return string|false
         */
        public function owner($file) {

-               $owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+               $owneruid = @fileowner( $this->sftp_path( $file ) );

                if ( ! $owneruid )
                        return false;
                if ( ! function_exists('posix_getpwuid') )
                if ( ! $owneruid )
                        return false;
                if ( ! function_exists('posix_getpwuid') )


@@ -278,20 +359,25 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                $ownerarray = posix_getpwuid($owneruid);
                return $ownerarray['name'];
        }
                $ownerarray = posix_getpwuid($owneruid);
                return $ownerarray['name'];
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return string
         */
        public function getchmod($file) {
         * @param string $file
         * @return string
         */
        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 );

        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return string|false
         */
        public function group($file) {
         * @param string $file
         * @return string|false
         */
        public function group($file) {

-               $gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+               $gid = @filegroup( $this->sftp_path( $file ) );

                if ( ! $gid )
                        return false;
                if ( ! function_exists('posix_getgrgid') )
                if ( ! $gid )
                        return false;
                if ( ! function_exists('posix_getgrgid') )


@@ -301,6 +387,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string   $source
         * @param string   $destination
         * @param bool     $overwrite
         * @param string   $source
         * @param string   $destination
         * @param bool     $overwrite


@@ -317,6 +405,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $source
         * @param string $destination
         * @param bool   $overwrite
         * @param string $source
         * @param string $destination
         * @param bool   $overwrite


@@ -327,6 +417,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string      $file
         * @param bool        $recursive
         * @param string|bool $type
         * @param string      $file
         * @param bool        $recursive
         * @param string|bool $type


@@ -347,73 +439,89 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
        public function exists($file) {
         * @param string $file
         * @return bool
         */
        public function exists($file) {

-               $file = ltrim($file, '/');
-               return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               return file_exists( $this->sftp_path( $file ) );

        }
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
        public function is_file($file) {
         * @param string $file
         * @return bool
         */
        public function is_file($file) {

-               $file = ltrim($file, '/');
-               return is_file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               return is_file( $this->sftp_path( $file ) );

        }
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $path
         * @return bool
         */
        public function is_dir($path) {
         * @param string $path
         * @return bool
         */
        public function is_dir($path) {

-               $path = ltrim($path, '/');
-               return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path);
+               return is_dir( $this->sftp_path( $path ) );

        }
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
        public function is_readable($file) {
         * @param string $file
         * @return bool
         */
        public function is_readable($file) {

-               $file = ltrim($file, '/');
-               return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               return is_readable( $this->sftp_path( $file ) );

        }
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
        public function is_writable($file) {
         * @param string $file
         * @return bool
         */
        public function is_writable($file) {

-               $file = ltrim($file, '/');
-               return is_writable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               // PHP will base it's writable checks on system_user === file_owner, not ssh_user === file_owner
+               return true;

        }
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return int
         */
        public function atime($file) {
         * @param string $file
         * @return int
         */
        public function atime($file) {

-               $file = ltrim($file, '/');
-               return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               return fileatime( $this->sftp_path( $file ) );

        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return int
         */
        public function mtime($file) {
         * @param string $file
         * @return int
         */
        public function mtime($file) {

-               $file = ltrim($file, '/');
-               return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               return filemtime( $this->sftp_path( $file ) );

        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return int
         */
        public function size($file) {
         * @param string $file
         * @return int
         */
        public function size($file) {

-               $file = ltrim($file, '/');
-               return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+               return filesize( $this->sftp_path( $file ) );

        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @param int    $time
         * @param int    $atime
         * @param string $file
         * @param int    $time
         * @param int    $atime


@@ -423,6 +531,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $path
         * @param mixed  $chmod
         * @param mixed  $chown
         * @param string $path
         * @param mixed  $chmod
         * @param mixed  $chown


@@ -446,6 +556,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $path
         * @param bool   $recursive
         * @return bool
         * @param string $path
         * @param bool   $recursive
         * @return bool


@@ -455,6 +567,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $path
         * @param bool   $include_hidden
         * @param bool   $recursive
         * @param string $path
         * @param bool   $include_hidden
         * @param bool   $recursive


@@ -472,7 +586,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                        return false;
 
                $ret = array();
                        return false;
 
                $ret = array();

-               $dir = @dir('ssh2.sftp://' . $this->sftp_link .'/' . ltrim($path, '/') );
+               $dir = @dir( $this->sftp_path( $path ) );

 
                if ( ! $dir )
                        return false;
 
                if ( ! $dir )
                        return false;