X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/449d082fcc4873c1f7d363a0d9f7409be7f6e77d..c46e6dd20c438dddfea40c35935b877ac3e67daa:/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 6da852d7..0de63548 100644
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -1,19 +1,12 @@
method = 'ssh2';
$this->errors = new WP_Error();
//Check if possible to use ssh2 functions.
if ( ! extension_loaded('ssh2') ) {
$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
- return false;
+ 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 stream_get_contents()
'));
+ return;
}
// Set defaults:
@@ -80,27 +67,24 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
else
$this->options['hostname'] = $opt['hostname'];
- if ( isset($opt['base']) && ! empty($opt['base']) )
- $this->wp_base = $opt['base'];
-
// Check if the options provided are OK.
- if ( empty ($opt['username']) )
- $this->errors->add('empty_username', __('SSH2 username is required'));
- else
- $this->options['username'] = $opt['username'];
-
- if ( ( !empty ($opt['public_key']) ) && ( !empty ($opt['private_key']) ) ) {
+ if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
$this->options['public_key'] = $opt['public_key'];
$this->options['private_key'] = $opt['private_key'];
- $this->options['hostkey'] = array("hostkey" => "ssh-rsa");
+ $this->options['hostkey'] = array('hostkey' => 'ssh-rsa');
$this->keys = true;
+ } elseif ( empty ($opt['username']) ) {
+ $this->errors->add('empty_username', __('SSH2 username is required'));
}
+ if ( !empty($opt['username']) )
+ $this->options['username'] = $opt['username'];
if ( empty ($opt['password']) ) {
- if ( !$this->keys ) // password can be blank if we are using keys
+ // Password can be blank if we are using keys.
+ if ( !$this->keys )
$this->errors->add('empty_password', __('SSH2 password is required'));
} else {
$this->options['password'] = $opt['password'];
@@ -108,9 +92,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
}
- function connect() {
- $this->debug("connect();");
-
+ public function connect() {
if ( ! $this->keys ) {
$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
} else {
@@ -129,7 +111,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
}
} 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 incorrent for %s'), $this->options['username']));
+ $this->errors->add('auth', sprintf(__('Public and Private keys incorrect for %s'), $this->options['username']));
return false;
}
}
@@ -139,369 +121,385 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
return true;
}
- function run_command($link, $command, $returnbool = false) {
- $this->debug("run_command();");
- if(!($stream = @ssh2_exec( $link, $command . "; echo \"__COMMAND_FINISHED__\";"))) {
+ /**
+ * @param string $command
+ * @param bool $returnbool
+ * @return bool|string
+ */
+ 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));
} else {
stream_set_blocking( $stream, true );
- $time_start = time();
- $data = null;
- while( true ) {
- if (strpos($data,"__COMMAND_FINISHED__") !== false){
- break; // the command has finshed!
- }
- if( (time()-$time_start) > $this->timeout ){
- $this->errors->add('command', sprintf(__('Connection to the server has timeout after %s seconds.'), $this->timeout));
- unset($this->link);
- unset($this->sftp_link); // close connections
- return false;
- }
- while( $buf = fread( $stream, strlen($stream) ) )
- $data .= $buf;
- }
- fclose($stream);
- $data = trim(str_replace("__COMMAND_FINISHED__", "", $data));
- if (($returnbool) && ( (int) $data )) {
- return true;
- } elseif (($returnbool) && (! (int) $data )) {
- return false;
- } else {
+ stream_set_timeout( $stream, FS_TIMEOUT );
+ $data = stream_get_contents( $stream );
+ fclose( $stream );
+
+ if ( $returnbool )
+ return ( $data === false ) ? false : '' != trim($data);
+ else
return $data;
- }
}
return false;
}
- function debug($text)
- {
- if ($this->debugtest)
- {
- echo "
" . $text . "
";
- }
+ /**
+ * @param string $file
+ * @return string|false
+ */
+ public function get_contents( $file ) {
+ $file = ltrim($file, '/');
+ return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
- function setDefaultPermissions($perm) {
- $this->debug("setDefaultPermissions();");
- if ( $perm )
- $this->permission = $perm;
+ /**
+ * @param string $file
+ * @return array
+ */
+ public function get_contents_array($file) {
+ $file = ltrim($file, '/');
+ return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
- function get_contents($file, $type = '', $resumepos = 0 ) {
- $this->debug("get_contents();");
- $tempfile = wp_tempnam( $file );
- if ( ! $tempfile )
- return false;
- if( ! ssh2_scp_recv($this->link, $file, $tempfile) )
+ /**
+ * @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 );
+
+ if ( $ret !== strlen( $contents ) )
return false;
- $contents = file_get_contents($tempfile);
- unlink($tempfile);
- return $contents;
- }
- function get_contents_array($file) {
- $this->debug("get_contents_array();");
- return explode("\n", $this->get_contents($file));
- }
+ $this->chmod($file, $mode);
- function put_contents($file, $contents, $type = '' ) {
- $this->debug("put_contents($file);");
- $tempfile = wp_tempnam( $file );
- $temp = fopen($tempfile, 'w');
- if ( ! $temp )
- return false;
- fwrite($temp, $contents);
- fclose($temp);
- $ret = ssh2_scp_send($this->link, $tempfile, $file, $this->permission);
- unlink($tempfile);
- return $ret;
+ return true;
}
- function cwd() {
- $this->debug("cwd();");
- $cwd = $this->run_command($this->link, 'pwd');
- if( $cwd )
- $cwd = trailingslashit($cwd);
+ public function cwd() {
+ $cwd = $this->run_command('pwd');
+ if ( $cwd ) {
+ $cwd = trailingslashit( trim( $cwd ) );
+ }
return $cwd;
}
- function chdir($dir) {
- $this->debug("chdir();");
- return $this->run_command($this->link, 'cd ' . $dir, true);
+ /**
+ * @param string $dir
+ * @return bool|string
+ */
+ public function chdir($dir) {
+ return $this->run_command('cd ' . $dir, true);
}
- function chgrp($file, $group, $recursive = false ) {
- $this->debug("chgrp();");
+ /**
+ * @param string $file
+ * @param string $group
+ * @param bool $recursive
+ */
+ public function chgrp($file, $group, $recursive = false ) {
if ( ! $this->exists($file) )
return false;
if ( ! $recursive || ! $this->is_dir($file) )
- return $this->run_command($this->link, sprintf('chgrp %o %s', $mode, $file), true);
- return $this->run_command($this->link, sprintf('chgrp -R %o %s', $mode, $file), true);
+ return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
+ return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
}
- function chmod($file, $mode = false, $recursive = false) {
- $this->debug("chmod();");
- if( ! $mode )
- $mode = $this->permission;
- if( ! $mode )
- return false;
+ /**
+ * @param string $file
+ * @param int $mode
+ * @param bool $recursive
+ * @return bool|string
+ */
+ public function chmod($file, $mode = false, $recursive = false) {
if ( ! $this->exists($file) )
return false;
+
+ if ( ! $mode ) {
+ if ( $this->is_file($file) )
+ $mode = FS_CHMOD_FILE;
+ elseif ( $this->is_dir($file) )
+ $mode = FS_CHMOD_DIR;
+ else
+ return false;
+ }
+
if ( ! $recursive || ! $this->is_dir($file) )
- return $this->run_command($this->link, sprintf('chmod %o %s', $mode, $file), true);
- return $this->run_command($this->link, sprintf('chmod -R %o %s', $mode, $file), true);
+ return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
+ return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
}
- function chown($file, $owner, $recursive = false ) {
- $this->debug("chown();");
+ /**
+ * Change the ownership of a file / folder.
+ *
+ * @since Unknown
+ *
+ * @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.
+ */
+ public function chown( $file, $owner, $recursive = false ) {
if ( ! $this->exists($file) )
return false;
if ( ! $recursive || ! $this->is_dir($file) )
- return $this->run_command($this->link, sprintf('chown %o %s', $mode, $file), true);
- return $this->run_command($this->link, sprintf('chown -R %o %s', $mode, $file), true);
+ return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
+ return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
}
- function owner($file) {
- $this->debug("owner();");
- $dir = $this->dirlist($file);
- return $dir[$file]['owner'];
- }
-
- function getchmod($file) {
- $this->debug("getchmod();");
- $dir = $this->dirlist($file);
- return $dir[$file]['permsn'];
- }
-
- function group($file) {
- $this->debug("group();");
- $dir = $this->dirlist($file);
- return $dir[$file]['group'];
+ /**
+ * @param string $file
+ * @return string|false
+ */
+ public function owner($file) {
+ $owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+ if ( ! $owneruid )
+ return false;
+ if ( ! function_exists('posix_getpwuid') )
+ return $owneruid;
+ $ownerarray = posix_getpwuid($owneruid);
+ return $ownerarray['name'];
+ }
+ /**
+ * @param string $file
+ * @return string
+ */
+ public function getchmod($file) {
+ return substr( decoct( @fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ) ) ), -3 );
}
- function copy($source, $destination, $overwrite = false ) {
- $this->debug("copy();");
- if( ! $overwrite && $this->exists($destination) )
+ /**
+ * @param string $file
+ * @return string|false
+ */
+ public function group($file) {
+ $gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+ if ( ! $gid )
+ return false;
+ if ( ! function_exists('posix_getgrgid') )
+ return $gid;
+ $grouparray = posix_getgrgid($gid);
+ return $grouparray['name'];
+ }
+
+ /**
+ * @param string $source
+ * @param string $destination
+ * @param bool $overwrite
+ * @param int|bool $mode
+ * @return bool
+ */
+ public function copy($source, $destination, $overwrite = false, $mode = false) {
+ if ( ! $overwrite && $this->exists($destination) )
return false;
$content = $this->get_contents($source);
- if( false === $content)
+ if ( false === $content)
return false;
- return $this->put_contents($destination, $content);
+ return $this->put_contents($destination, $content, $mode);
}
- function move($source, $destination, $overwrite = false) {
- $this->debug("move();");
- return @ssh2_sftp_rename($this->link, $source, $destination);
+ /**
+ * @param string $source
+ * @param string $destination
+ * @param bool $overwrite
+ * @return bool
+ */
+ public function move($source, $destination, $overwrite = false) {
+ return @ssh2_sftp_rename( $this->sftp_link, $source, $destination );
}
- function delete($file, $recursive = false) {
- $this->debug("delete();");
- if ( $this->is_file($file) )
+ /**
+ * @param string $file
+ * @param bool $recursive
+ * @param string|bool $type
+ * @return bool
+ */
+ public function delete($file, $recursive = false, $type = false) {
+ if ( 'f' == $type || $this->is_file($file) )
return ssh2_sftp_unlink($this->sftp_link, $file);
if ( ! $recursive )
return ssh2_sftp_rmdir($this->sftp_link, $file);
$filelist = $this->dirlist($file);
if ( is_array($filelist) ) {
foreach ( $filelist as $filename => $fileinfo) {
- $this->delete($file . '/' . $filename, $recursive);
+ $this->delete($file . '/' . $filename, $recursive, $fileinfo['type']);
}
}
return ssh2_sftp_rmdir($this->sftp_link, $file);
}
- function exists($file) {
- $this->debug("exists();");
- return $this->run_command($this->link, sprintf('ls -lad %s', $file), true);
+ /**
+ * @param string $file
+ * @return bool
+ */
+ public function exists($file) {
+ $file = ltrim($file, '/');
+ return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
-
- function is_file($file) {
- $this->debug("is_file();");
- //DO NOT RELY ON dirlist()!
- $list = $this->run_command($this->link, sprintf('ls -lad %s', $file));
- $list = $this->parselisting($list);
- if ( ! $list )
- return false;
- else
- return ( !$list['isdir'] && !$list['islink'] ); //ie. not a file or link, yet exists, must be file.
+ /**
+ * @param string $file
+ * @return bool
+ */
+ public function is_file($file) {
+ $file = ltrim($file, '/');
+ return is_file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
-
- function is_dir($path) {
- $this->debug("is_dir();");
- //DO NOT RELY ON dirlist()!
- $list = $this->parselisting($this->run_command($this->link, sprintf('ls -lad %s', untrailingslashit($path))));
- if ( ! $list )
- return false;
- else
- return $list['isdir'];
+ /**
+ * @param string $path
+ * @return bool
+ */
+ public function is_dir($path) {
+ $path = ltrim($path, '/');
+ return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path);
}
-
- function is_readable($file) {
- //Not implmented.
+ /**
+ * @param string $file
+ * @return bool
+ */
+ public function is_readable($file) {
+ $file = ltrim($file, '/');
+ return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
-
- function is_writable($file) {
- //Not implmented.
+ /**
+ * @param string $file
+ * @return bool
+ */
+ public function is_writable($file) {
+ $file = ltrim($file, '/');
+ return is_writable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
-
- function atime($file) {
- //Not implmented.
+ /**
+ * @param string $file
+ * @return int
+ */
+ public function atime($file) {
+ $file = ltrim($file, '/');
+ return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
- function mtime($file) {
- //Not implmented.
+ /**
+ * @param string $file
+ * @return int
+ */
+ public function mtime($file) {
+ $file = ltrim($file, '/');
+ return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
- function size($file) {
- //Not implmented.
+ /**
+ * @param string $file
+ * @return int
+ */
+ public function size($file) {
+ $file = ltrim($file, '/');
+ return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
- function touch($file, $time = 0, $atime = 0) {
- //Not implmented.
+ /**
+ * @param string $file
+ * @param int $time
+ * @param int $atime
+ */
+ public function touch($file, $time = 0, $atime = 0) {
+ //Not implemented.
}
- function mkdir($path, $chmod = null, $chown = false, $chgrp = false) {
- $this->debug("mkdir();");
+ /**
+ * @param string $path
+ * @param mixed $chmod
+ * @param mixed $chown
+ * @param mixed $chgrp
+ * @return bool
+ */
+ public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
$path = untrailingslashit($path);
- if( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
+ if ( empty($path) )
return false;
- if( $chown )
+
+ if ( ! $chmod )
+ $chmod = FS_CHMOD_DIR;
+ if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
+ return false;
+ if ( $chown )
$this->chown($path, $chown);
- if( $chgrp )
+ if ( $chgrp )
$this->chgrp($path, $chgrp);
return true;
}
- function rmdir($path, $recursive = false) {
- $this->debug("rmdir();");
+ /**
+ * @param string $path
+ * @param bool $recursive
+ * @return bool
+ */
+ public function rmdir($path, $recursive = false) {
return $this->delete($path, $recursive);
}
- function parselisting($line) {
- $this->debug("parselisting();");
- $is_windows = ($this->OS_remote == FTP_OS_Windows);
- if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|