- Patch #395472 by JacobSingh, chx, cwgordon7: more improvements to the file transfer system to pave the path for a plugin manager. Heroic effort.

1 files changed, 44 insertions, 35 deletions

diff --git a/includes/filetransfer/ftp.inc b/includes/filetransfer/ftp.inc
index d21e88bec..ecb164a17 100644
--- a/includes/filetransfer/ftp.inc
+++ b/includes/filetransfer/ftp.inc
@@ -2,17 +2,6 @@
 // $Id$
 
 /**
- * Common code for the FTP connections.
- */
-abstract class FileTransferFTP extends FileTransfer {
-  function __construct($settings) {
-    // This is the default, if $settings contains a port, this will be overridden.
-    $this->port = 21;
-    parent::__construct($settings);
-  }
-}
-
-/**
  * Connection class using the FTP URL wrapper.
  */
 class FileTransferFTPWrapper extends FileTransfer {
@@ -22,18 +11,21 @@ class FileTransferFTPWrapper extends FileTransfer {
       throw new FileTransferException('FTP Connection failed.');
     }
   }
+  
+  static function factory($jail, $settings) {
+    $settings['hostname'] = empty($settings['hostname']) ? 'localhost' : $settings['hostname'];
+    $settings['port'] = empty($settings['port']) ? 21 : $settings['port'];
+    return new FileTransferFTPWrapper($jail, $settings['username'], $settings['password'], $settings['hostname'], $settings['port']);
+  }
 
-  function createDirectory($directory) {
-    if (!@createDirectory($directory)) {
+  function createDirectoryJailed($directory) {
+    if (!@mkdir($directory)) {
       $exception = new FileTransferException('Cannot create directory @directory.', NULL, array('@directory' => $directory));
       throw $exception;
     }
   }
 
-  function removeDirectory($directory) {
-    if (realpath(substr($directory, 0, strlen(DRUPAL_ROOT))) !== DRUPAL_ROOT) {
-      throw new FileTransferException('@directory is outside of the Drupal root.', NULL, array('@directory' => $directory));
-    }
+  function removeDirectoryJailed($directory) {
     if (is_dir($directory)) {
       $dh = opendir($directory);
       while (($resource = readdir($dh)) !== FALSE) {
@@ -49,28 +41,32 @@ class FileTransferFTPWrapper extends FileTransfer {
         }
       }
       closedir($dh);
-      if (!removeDirectory($directory)) {
+      if (!rmdir($directory)) {
         $exception = new FileTransferException('Cannot remove @directory.', NULL, array('@directory' => $directory));
         throw $exception;
       }
     }
   }
 
-  function copyFile($source, $destination) {
+  function copyFileJailed($source, $destination) {
     if (!@copy($this->connection . '/' . $source, $this->connection . '/' . $destination)) {
       throw new FileTransferException('Cannot copy @source_file to @destination_file.', NULL, array('@source' => $source, '@destination' => $destination));
     }
   }
 
-  function removeFile($destination) {
+  function removeFileJailed($destination) {
     if (!@unlink($destination)) {
       throw new FileTransferException('Cannot remove @destination', NULL, array('@destination' => $destination));
     }
   }
+  
+  function isDirectory($path) {
+    return is_dir($this->connection . '/' . $path);
+  }
 }
 
 class FileTransferFTPExtension extends FileTransfer {
-  function connect() {
+  public function connect() {
     $this->connection = ftp_connect($this->hostname, $this->port);
 
     if (!$this->connection) {
@@ -80,23 +76,26 @@ class FileTransferFTPExtension extends FileTransfer {
       throw new FileTransferException("Cannot login to FTP server, please check username and password");
     }
   }
+  
+  static function factory($jail, $settings) {
+    $settings['hostname'] = empty($settings['hostname']) ? 'localhost' : $settings['hostname'];
+    $settings['port'] = empty($settings['port']) ? 21 : $settings['port'];
+    return new FileTransferFTPExtension($jail, $settings['username'], $settings['password'], $settings['hostname'], $settings['port']);
+  }
 
-  function copyFile($source, $destination) {
+  protected function copyFileJailed($source, $destination) {
     if (!@ftp_put($this->connection,  $destination, $source, FTP_BINARY)) {
       throw new FileTransferException("Cannot move @source to @destination", NULL, array("@source" => $source, "@destination" => $destination));
     }
   }
 
-  function createDirectory($directory) {
-    if (!@ftp_createDirectory($this->connection, $directory)) {
+  protected function createDirectoryJailed($directory) {
+    if (!@ftp_mkdir($this->connection, $directory)) {
       throw new FileTransferException("Cannot create directory @directory", NULL, array("@directory" => $directory));
     }
   }
 
-  function removeDirectory($directory) {
-    if (realpath(substr($directory, 0, strlen(DRUPAL_ROOT))) !== DRUPAL_ROOT) {
-      throw new FileTransferException('@directory is outside of the Drupal root.', NULL, array('@directory' => $directory));
-    }
+  protected function removeDirectoryJailed($directory) {
     $pwd = ftp_pwd($this->connection);
     if (!@ftp_chdir($this->connection, $directory)) {
       throw new FileTransferException("Unable to change to directory @directory", NULL, array('@directory' => $directory));
@@ -107,22 +106,32 @@ class FileTransferFTPExtension extends FileTransfer {
         continue;
       }
       if (@ftp_chdir($this->connection, $item)){
-        ftp_chdir($this->connection, '..');
-        $this->removeDirectory($item);
+        ftp_cdup($this->connection);
+        $this->removeDirectory(ftp_pwd($this->connection) . '/' . $item);
       }
       else {
-        $this->removeFile($item);
+        $this->removeFile(ftp_pwd($this->connection) . '/' . $item);
       }
     }
     ftp_chdir($this->connection, $pwd);
-    if (!ftp_removeDirectory($this->connection, $directory)) {
+    if (!ftp_rmdir($this->connection, $directory)) {
       throw new FileTransferException("Unable to remove to directory @directory", NULL, array('@directory' => $directory));
     }
   }
 
-  function removeFile($destination) {
-    if (!ftp_delete($this->connection, $item)) {
-      throw new FileTransferException("Unable to remove to file @file", NULL, array('@file' => $item));
+  protected function removeFileJailed($destination) {
+    if (!ftp_delete($this->connection, $destination)) {
+      throw new FileTransferException("Unable to remove to file @file", NULL, array('@file' => $destination));
+    }
+  }
+  
+  public function isDirectory($path) {
+    $result = FALSE;
+    $curr = ftp_pwd($this->connection);
+    if (ftp_chdir($this->connection, $path)) {
+      $result = TRUE;
     }
+    ftp_chdir($this->connection, $curr);
+    return $result;
   }
 }