Changeset 8852

Timestamp:

09/09/08 03:24:05 (3 months ago)

Author:

azaozz

Message:

SSH2 filesystem improvements, props ShaneF, see #7690

Files:

• trunk/wp-admin/includes/class-wp-filesystem-ssh2.php (modified) (12 diffs)
• trunk/wp-admin/includes/file.php (modified) (8 diffs)
• trunk/wp-admin/includes/update.php (modified) (1 diff)

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

@@ -9 +9 @@
-/**
- * WordPress Filesystem Class for implementing SSH2.
+ *
+ * To use this class you must follow these steps for PHP 5.2.6+
+ *
+ * @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.)
+ *
+ * cd /usr/src
+ * wget http://surfnet.dl.sourceforge.net/sourceforge/libssh2/libssh2-0.14.tar.gz
+ * tar -zxvf libssh2-0.14.tar.gz
+ * cd libssh2-0.14/
+ * ./configure
+ * make all install
+ *
+ * Note: No not leave the directory yet!
+ *
+ * Enter: pecl install -f ssh2
+ *
+ * Copy the ssh.so file it creates to your PHP Module Directory.
+ * Open up your PHP.INI file and look for where extensions are placed.
+ * Add in your PHP.ini file: extension=ssh2.so
+ *
+ * Restart Apache!
+ * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp  exist.
+ *
- *
- * @since 2.7
@@ -16 +41 @@
- */
-class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    var $errors = array();
-    var $options = array();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    function WP_Filesystem_SSH2($opt='') {
@@ -72 +90 @@
-
-        if ( empty ($opt['password']) )
-
+2
-        else
-            $this->options['password'] = $opt['password'];
-
-    }
-
@@ -92 +109 @@
-        }
-
+        $this->sftp_link = ssh2_sftp($this->link);
+
-        return true;
-    }
-
+
-    function run_command($link, $command, $returnbool = false) {
-$this->debug("run_command(".$command
-
-            $this->errors->add('command', sprintf(__('Unable to pre
-        
-            
+//$this->debug("run_command(".$command.",".$returnbool
+. "; echo \"__COMMAND_FINISHED__\";"
+           $this->errors->add('command', sprintf(__('Unable to per
+       
+           
-            $time_start = time();
-            $data = ""
+           $data = null
-            while( true ) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -130 +156 @@
-        if ($this->debugtest)
-        {
-
+"<br/>" . 
-        }
-    }
-
-    function setDefaultPermissions($perm) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if ( ! $temp )
-            return false;
-
-
-
-
-
-
-
+
-        fclose($temp);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        return $ret;
-    }
-
+
-    function cwd() {
-"pwd"
+'pwd'
-        if( $cwd )
-            $cwd = trailingslashit($cwd);
-        return $cwd;
-    }
-
+
-    function chdir($dir) {
-
-
-
-
-
-
+
+
+
-    function chgrp($file, $group, $recursive = false ) {
-
-
-
+
+
+
+
+
+
+
+
-    function chmod($file, $mode = false, $recursive = false) {
+        $this->debug("chmod();");
-        if( ! $mode )
-            $mode = $this->permission;
@@ -201 +222 @@
-        if ( ! $this->exists($file) )
-            return false;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    function chown($file, $owner, $recursive = false ) {
-
-
-
+
+
+
+
+
+
+
+
-    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'];
-    }
-
+
-    function copy($source, $destination, $overwrite = false ) {
+        $this->debug("copy();");
-        if( ! $overwrite && $this->exists($destination) )
-            return false;
@@ -239 +263 @@
-        return $this->put_contents($destination, $content);
-    }
-
+
-    function move($source, $destination, $overwrite = false) {
+        $this->debug("move();");
-        return @ssh2_sftp_rename($this->link, $source, $destination);
-    }
-
-=
+ = 
-        if ( $this->is_file($file) )
-@ssh2_sftp_unlink($this->
-
-return @ssh2_sftp_rmdir($this->
+ssh2_sftp_unlink($this->sftp_
+ 
+ return ssh2_sftp_rmdir($this->sftp_
-        $filelist = $this->dirlist($file);
-
-
-
-
+
+
+
+
+
+
-    }
-
-    function exists($file) {
-
-
-
-
-
-
+
+
+
+
-    function is_file($file) {
-
-
-
+
+
+
+
+
+
+
+
+
-    function is_dir($path) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    function is_readable($file) {
-
-
-
-
+
+
+
-    function is_writable($file) {
-
-
-
-
+
+
+
-    function atime($file) {
-return false;
-
-
+//Not implmented.
+
+
-    function mtime($file) {
-
-
-
-
+
+
+
-    function size($file) {
-
-
-
-
+
+
+
-    function touch($file, $time = 0, $atime = 0) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        if( $chown )
-            $this->chown($path, $chown);
@@ -317 +340 @@
-        return true;
-    }
-
+
-    function rmdir($path, $recursive = false) {
-
-
-
-
-
-
-
+
-    }
-
-    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]+|<DIR>) +(.+)/", $line, $lucifer)) {
@@ -391 +409 @@
-
-    function dirlist($path = '.', $incdot = false, $recursive = false) {
+        $this->debug("dirlist();");
-        if( $this->is_file($path) ) {
-            $limitFile = basename($path);
-dirname($path) . '/'
+trailingslashit(dirname($path))
-        } else {
-            $limitFile = false;
-        }
-
-
+
+l
-
-        if ( $list === false )
-            return false;
-
+        $list = explode("\n", $list);
+
-        $dirlist = array();
-
+(array)
-            $entry = $this->parselisting($v);
-            if ( empty($entry) )
-                continue;
-
-"name"] || '..' == $entry["name"
+'name'] || '..' == $entry['name'
-                continue;
-
@@ -417 +438 @@
-        if ( ! $dirlist )
-            return false;
+
-        if ( empty($dirlist) )
-            return array();
@@ -433 +455 @@
-                    }
-                } else { //No dots
-$recursive
+ $recursive 
-                        $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-                }
@@ -444 +466 @@
-
-    function __destruct(){
-
+ 
-            unset($this->link);
+        if ( $this->sftp_link )
+            unset($this->sftp_link);
-    }
-}

trunk/wp-admin/includes/file.php

@@ -387 +387 @@
-        return new WP_Error('empty_archive', __('Empty archive'));
-
+    $path = explode('/', $to);
+    for ( $i = count($path); $i > 0; $i-- ) { //>0 = first element is empty allways for paths starting with '/'
+        $tmppath = implode('/', array_slice($path, 0, $i) );
+        if ( $fs->is_dir($tmppath) ) { //Found the highest folder that exists, Create from here(ie +1)
+            for ( $i = $i + 1; $i <= count($path); $i++ ) {
+                $tmppath = implode('/', array_slice($path, 0, $i) );
+                if ( ! $fs->mkdir($tmppath, 0755) )
+                    return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
+            }
+            break; //Exit main for loop
+        }
+    }
+
-    $to = trailingslashit($to);
-    $path = explode('/', $to);
-    $tmppath = '';
-    for ( $j = 0; $j < count($path) - 1; $j++ ) {
-        $tmppath .= $path[$j] . '/';
-        if ( ! $fs->is_dir($tmppath) )
-            $fs->mkdir($tmppath, 0755);
-    }
-
-    foreach ($archive_files as $file) {
-        $path = explode('/', $file['filename']);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -415 +422 @@
-        }
-    }
-
-    return true;
-}
@@ -454 +460 @@
-        return false;
-
-.$method.
+ . $method . 
-    if( ! file_exists($abstraction_file) )
-        return;
@@ -481 +487 @@
-    }
-
-
-
-
-
-
+
-    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
@@ -508 +510 @@
-    $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
-    $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
-
+
+
+
+
+
-        $credentials['connection_type'] = 'ssh';
-'ftps' == $_POST['connection_type']
+(isset($_POST['connection_type']) && 'ftps' == $_POST['connection_type'])
-        $credentials['connection_type'] = 'ftps';
-    else
@@ -524 +530 @@
-    $username = '';
-    $password = '';
-ssl
+connection_type
-    if ( !empty($credentials) )
-        extract($credentials, EXTR_OVERWRITE);
@@ -541 +547 @@
-<tr valign="top">
-<th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>
-
+; if ( !empty($port) ) echo ":$port";
-</tr>
-<tr valign="top">
@@ -557 +563 @@
-<p><label><input name="connection_type"  type="radio" value="ftp" <?php checked('ftp', $connection_type); ?>    /> <?php _e('FTP') ?></label><br />
-<label><input name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); ?> /> <?php _e('FTPS (SSL)') ?></label><br />
-label><input name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); ?> /> <?php _e('SSH') ?></label
+?php if ( extension_loaded('ssh2') ) { ?><label><input name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); ?> /> <?php _e('SSH') ?></label><?php } ?
-</fieldset>
-</td>

trunk/wp-admin/includes/update.php

@@ -239 +239 @@
-
-    $working_dir = $content_dir . 'upgrade/core';
-
-    // Clean up working directory
-
-
-
-
+
+
+
+
+
-    // Unzip package to working directory
-    $result = unzip_file($download_file, $working_dir);
-
-    // Once extracted, delete the package
-    unlink($download_file);
-
+
-    if ( is_wp_error($result) ) {
-        $wp_filesystem->delete($working_dir, true);
-        return $result;
-    }
-
+
-    // Copy update-core.php from the new version into place.
-    if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {