Skip to content

Commit

Permalink
Enforce stream_get_contents() requirement for ssh2 fs. Props dd32. fi…
Browse files Browse the repository at this point in the history 
…xes #10093 for 2.8.1

git-svn-id: https://develop.svn.wordpress.org/branches/2.8@11633 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
@ryanboren
ryanboren committed Jun 23, 2009
1 parent bae8db3 commit 0abf63d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
41 changes: 21 additions & 20 deletions wp-admin/includes/class-wp-filesystem-ssh2.php
View file
Expand Up @@ -13,7 +13,7 @@
*
* @contrib http://kevin.vanzonneveld.net/techblog/article/make_ssh_connections_with_php/ - Installation Notes
*
* Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now.)
* Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now, But many users have found the latest versions work)
*
* cd /usr/src
* wget http://surfnet.dl.sourceforge.net/sourceforge/libssh2/libssh2-0.14.tar.gz
Expand All @@ -22,7 +22,7 @@
* ./configure
* make all install
*
* Note: No not leave the directory yet!
* Note: Do not leave the directory yet!
*
* Enter: pecl install -f ssh2
*
Expand All @@ -33,6 +33,7 @@
* Restart Apache!
* Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp exist.
*
* Note: as of WordPress 2.8, This utilises the PHP5+ function 'stream_get_contents'
*
* @since 2.7
* @package WordPress
Expand All @@ -45,7 +46,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
var $sftp_link = false;
var $keys = false;
/*
* This is the timeout value for ssh results to comeback.
* This is the timeout value for ssh results.
* Slower servers might need this incressed, but this number otherwise should not change.
*
* @parm $timeout int
Expand All @@ -66,8 +67,8 @@ function WP_Filesystem_SSH2($opt='') {
$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
return false;
}
if ( ! version_compare(phpversion(), '5', '>=') ) {
$this->errors->add('ssh2_php_requirement', __('The ssh2 PHP extension is available, however requires PHP 5+'));
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>'));
return false;
}

Expand Down Expand Up @@ -101,7 +102,7 @@ function WP_Filesystem_SSH2($opt='') {
$this->options['username'] = $opt['username'];

if ( empty ($opt['password']) ) {
if ( !$this->keys ) // password can be blank if we are using keys
if ( !$this->keys ) //password can be blank if we are using keys
$this->errors->add('empty_password', __('SSH2 password is required'));
} else {
$this->options['password'] = $opt['password'];
Expand Down Expand Up @@ -148,10 +149,11 @@ function run_command( $command, $returnbool = false) {
} else {
stream_set_blocking( $stream, true );
stream_set_timeout( $stream, $this->timeout );
$data = stream_get_contents($stream);
$data = stream_get_contents( $stream );
fclose( $stream );

if ( $returnbool )
return '' != trim($data);
return ( $data === false ) ? false : '' != trim($data);
else
return $data;
}
Expand All @@ -166,17 +168,17 @@ function setDefaultPermissions($perm) {

function get_contents($file, $type = '', $resumepos = 0 ) {
$file = ltrim($file, '/');
return file_get_contents('ssh2.sftp://' . $this->sftp_link .'/' . $file);
return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}

function get_contents_array($file) {
$file = ltrim($file, '/');
return file('ssh2.sftp://' . $this->sftp_link .'/' . $file);
return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}

function put_contents($file, $contents, $type = '' ) {
$file = ltrim($file, '/');
return file_put_contents('ssh2.sftp://' . $this->sftp_link .'/' . $file, $contents);
return file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
}

function cwd() {
Expand Down Expand Up @@ -270,44 +272,43 @@ function delete($file, $recursive = false) {
}

function exists($file) {
//return $this->run_command(sprintf('ls -lad %s', escapeshellarg($file)), true);
$file = ltrim($file, '/');
return file_exists('ssh2.sftp://' . $this->sftp_link .'/' . $file);
return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}

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

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

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

function is_writable($file) {
$file = ltrim($file, '/');
return is_writable('ssh2.sftp://' . $this->sftp_link .'/' . $file);
return is_writable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}

function atime($file) {
$file = ltrim($file, '/');
return fileatime('ssh2.sftp://' . $this->sftp_link .'/' . $file);
return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}

function mtime($file) {
$file = ltrim($file, '/');
return filemtime('ssh2.sftp://' . $this->sftp_link .'/' . $file);
return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}

function size($file) {
$file = ltrim($file, '/');
return filesize('ssh2.sftp://' . $this->sftp_link .'/' . $file);
return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}

function touch($file, $time = 0, $atime = 0) {
Expand Down
6 changes: 3 additions & 3 deletions wp-admin/includes/file.php
View file
Expand Up @@ -645,7 +645,7 @@ function get_filesystem_method($args = array(), $context = false) {
}
}

if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && extension_loaded('sockets') ) $method = 'ssh2';
if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
return apply_filters('filesystem_method', $method, $args);
Expand Down Expand Up @@ -761,7 +761,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
<td><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php if ( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /></td>
</tr>

<?php if ( extension_loaded('ssh2') ) : ?>
<?php if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) : ?>
<tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">
<th scope="row"><?php _e('Authentication Keys') ?>
<div class="key-labels textright">
Expand All @@ -781,7 +781,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
<?php if ( 'ftpext' == $type ) : ?>
<br /><label><input id="ftps" name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('FTPS (SSL)') ?></label>
<?php endif; ?>
<?php if ( extension_loaded('ssh2') ) : ?>
<?php if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) : ?>
<br /><label><input id="ssh" name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('SSH') ?></label>
<?php endif; ?>
</fieldset>
Expand Down

0 comments on commit 0abf63d

Please sign in to comment.