nextcloud / server

apps/files_external/lib/Lib/Config/IBackendProvider.php

Indentation +5 added lines, -5 removed lines

@@ -30,10 +30,10 @@
  */
 interface IBackendProvider {
 
-	/**
-	 * @since 9.1.0
-	 * @return Backend[]
-	 */
-	public function getBackends();
+    /**
+     * @since 9.1.0
+     * @return Backend[]
+     */
+    public function getBackends();
 
 }

apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php

Indentation +5 added lines, -5 removed lines

@@ -30,10 +30,10 @@
  */
 interface IAuthMechanismProvider {
 
-	/**
-	 * @since 9.1.0
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanisms();
+    /**
+     * @since 9.1.0
+     * @return AuthMechanism[]
+     */
+    public function getAuthMechanisms();
 
 }

apps/files_external/lib/Lib/SessionStorageWrapper.php

Indentation +8 added lines, -8 removed lines

@@ -31,14 +31,14 @@
  */
 class SessionStorageWrapper extends PermissionsMask {
 
-	/**
-	 * @param array $arguments ['storage' => $storage]
-	 */
-	public function __construct($arguments) {
-		// disable sharing permission
-		$arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE;
-		parent::__construct($arguments);
-	}
+    /**
+     * @param array $arguments ['storage' => $storage]
+     */
+    public function __construct($arguments) {
+        // disable sharing permission
+        $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE;
+        parent::__construct($arguments);
+    }
 
 }
 

apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php

Indentation +11 added lines, -11 removed lines

@@ -29,15 +29,15 @@
  * Authentication mechanism or backend has insufficient data
  */
 class InsufficientDataForMeaningfulAnswerException extends StorageNotAvailableException {
-	/**
-	 * StorageNotAvailableException constructor.
-	 *
-	 * @param string $message
-	 * @param int $code
-	 * @param \Exception $previous
-	 * @since 6.0.0
-	 */
-	public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * StorageNotAvailableException constructor.
+     *
+     * @param string $message
+     * @param int $code
+     * @param \Exception $previous
+     * @since 6.0.0
+     */
+    public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
+        parent::__construct($message, $code, $previous);
+    }
 }

apps/files_external/lib/Lib/Storage/SFTP.php

Indentation +424 added lines, -424 removed lines

@@ -42,428 +42,428 @@
 * provide access to SFTP servers.
 */
 class SFTP extends \OC\Files\Storage\Common {
-	private $host;
-	private $user;
-	private $root;
-	private $port = 22;
-
-	private $auth;
-
-	/**
-	 * @var \phpseclib\Net\SFTP
-	 */
-	protected $client;
-
-	/**
-	 * @param string $host protocol://server:port
-	 * @return array [$server, $port]
-	 */
-	private function splitHost($host) {
-		$input = $host;
-		if (strpos($host, '://') === false) {
-			// add a protocol to fix parse_url behavior with ipv6
-			$host = 'http://' . $host;
-		}
-
-		$parsed = parse_url($host);
-		if(is_array($parsed) && isset($parsed['port'])) {
-			return [$parsed['host'], $parsed['port']];
-		} else if (is_array($parsed)) {
-			return [$parsed['host'], 22];
-		} else {
-			return [$input, 22];
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __construct($params) {
-		// Register sftp://
-		Stream::register();
-
-		$parsedHost =  $this->splitHost($params['host']);
-
-		$this->host = $parsedHost[0];
-		$this->port = $parsedHost[1];
-
-		if (!isset($params['user'])) {
-			throw new \UnexpectedValueException('no authentication parameters specified');
-		}
-		$this->user = $params['user'];
-
-		if (isset($params['public_key_auth'])) {
-			$this->auth = $params['public_key_auth'];
-		} elseif (isset($params['password'])) {
-			$this->auth = $params['password'];
-		} else {
-			throw new \UnexpectedValueException('no authentication parameters specified');
-		}
-
-		$this->root
-			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
-
-		if ($this->root[0] != '/') {
-			 $this->root = '/' . $this->root;
-		}
-
-		if (substr($this->root, -1, 1) != '/') {
-			$this->root .= '/';
-		}
-	}
-
-	/**
-	 * Returns the connection.
-	 *
-	 * @return \phpseclib\Net\SFTP connected client instance
-	 * @throws \Exception when the connection failed
-	 */
-	public function getConnection() {
-		if (!is_null($this->client)) {
-			return $this->client;
-		}
-
-		$hostKeys = $this->readHostKeys();
-		$this->client = new \phpseclib\Net\SFTP($this->host, $this->port);
-
-		// The SSH Host Key MUST be verified before login().
-		$currentHostKey = $this->client->getServerPublicHostKey();
-		if (array_key_exists($this->host, $hostKeys)) {
-			if ($hostKeys[$this->host] != $currentHostKey) {
-				throw new \Exception('Host public key does not match known key');
-			}
-		} else {
-			$hostKeys[$this->host] = $currentHostKey;
-			$this->writeHostKeys($hostKeys);
-		}
-
-		if (!$this->client->login($this->user, $this->auth)) {
-			throw new \Exception('Login failed');
-		}
-		return $this->client;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function test() {
-		if (
-			!isset($this->host)
-			|| !isset($this->user)
-		) {
-			return false;
-		}
-		return $this->getConnection()->nlist() !== false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getId(){
-		$id = 'sftp::' . $this->user . '@' . $this->host;
-		if ($this->port !== 22) {
-			$id .= ':' . $this->port;
-		}
-		// note: this will double the root slash,
-		// we should not change it to keep compatible with
-		// old storage ids
-		$id .= '/' . $this->root;
-		return $id;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getHost() {
-		return $this->host;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getRoot() {
-		return $this->root;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function absPath($path) {
-		return $this->root . $this->cleanPath($path);
-	}
-
-	/**
-	 * @return string|false
-	 */
-	private function hostKeysPath() {
-		try {
-			$storage_view = \OCP\Files::getStorage('files_external');
-			if ($storage_view) {
-				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') .
-					$storage_view->getAbsolutePath('') .
-					'ssh_hostKeys';
-			}
-		} catch (\Exception $e) {
-		}
-		return false;
-	}
-
-	/**
-	 * @param $keys
-	 * @return bool
-	 */
-	protected function writeHostKeys($keys) {
-		try {
-			$keyPath = $this->hostKeysPath();
-			if ($keyPath && file_exists($keyPath)) {
-				$fp = fopen($keyPath, 'w');
-				foreach ($keys as $host => $key) {
-					fwrite($fp, $host . '::' . $key . "\n");
-				}
-				fclose($fp);
-				return true;
-			}
-		} catch (\Exception $e) {
-		}
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function readHostKeys() {
-		try {
-			$keyPath = $this->hostKeysPath();
-			if (file_exists($keyPath)) {
-				$hosts = array();
-				$keys = array();
-				$lines = file($keyPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-				if ($lines) {
-					foreach ($lines as $line) {
-						$hostKeyArray = explode("::", $line, 2);
-						if (count($hostKeyArray) == 2) {
-							$hosts[] = $hostKeyArray[0];
-							$keys[] = $hostKeyArray[1];
-						}
-					}
-					return array_combine($hosts, $keys);
-				}
-			}
-		} catch (\Exception $e) {
-		}
-		return array();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function mkdir($path) {
-		try {
-			return $this->getConnection()->mkdir($this->absPath($path));
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rmdir($path) {
-		try {
-			$result = $this->getConnection()->delete($this->absPath($path), true);
-			// workaround: stray stat cache entry when deleting empty folders
-			// see https://github.com/phpseclib/phpseclib/issues/706
-			$this->getConnection()->clearStatCache();
-			return $result;
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function opendir($path) {
-		try {
-			$list = $this->getConnection()->nlist($this->absPath($path));
-			if ($list === false) {
-				return false;
-			}
-
-			$id = md5('sftp:' . $path);
-			$dirStream = array();
-			foreach($list as $file) {
-				if ($file != '.' && $file != '..') {
-					$dirStream[] = $file;
-				}
-			}
-			return IteratorDirectory::wrap($dirStream);
-		} catch(\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function filetype($path) {
-		try {
-			$stat = $this->getConnection()->stat($this->absPath($path));
-			if ($stat['type'] == NET_SFTP_TYPE_REGULAR) {
-				return 'file';
-			}
-
-			if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-				return 'dir';
-			}
-		} catch (\Exception $e) {
-
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function file_exists($path) {
-		try {
-			return $this->getConnection()->stat($this->absPath($path)) !== false;
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function unlink($path) {
-		try {
-			return $this->getConnection()->delete($this->absPath($path), true);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function fopen($path, $mode) {
-		try {
-			$absPath = $this->absPath($path);
-			switch($mode) {
-				case 'r':
-				case 'rb':
-					if ( !$this->file_exists($path)) {
-						return false;
-					}
-				case 'w':
-				case 'wb':
-				case 'a':
-				case 'ab':
-				case 'r+':
-				case 'w+':
-				case 'wb+':
-				case 'a+':
-				case 'x':
-				case 'x+':
-				case 'c':
-				case 'c+':
-					$context = stream_context_create(array('sftp' => array('session' => $this->getConnection())));
-					$handle = fopen($this->constructUrl($path), $mode, false, $context);
-					return RetryWrapper::wrap($handle);
-			}
-		} catch (\Exception $e) {
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function touch($path, $mtime=null) {
-		try {
-			if (!is_null($mtime)) {
-				return false;
-			}
-			if (!$this->file_exists($path)) {
-				$this->getConnection()->put($this->absPath($path), '');
-			} else {
-				return false;
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $target
-	 * @throws \Exception
-	 */
-	public function getFile($path, $target) {
-		$this->getConnection()->get($path, $target);
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $target
-	 * @throws \Exception
-	 */
-	public function uploadFile($path, $target) {
-		$this->getConnection()->put($target, $path, NET_SFTP_LOCAL_FILE);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rename($source, $target) {
-		try {
-			if ($this->file_exists($target)) {
-				$this->unlink($target);
-			}
-			return $this->getConnection()->rename(
-				$this->absPath($source),
-				$this->absPath($target)
-			);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function stat($path) {
-		try {
-			$stat = $this->getConnection()->stat($this->absPath($path));
-
-			$mtime = $stat ? $stat['mtime'] : -1;
-			$size = $stat ? $stat['size'] : 0;
-
-			return array('mtime' => $mtime, 'size' => $size, 'ctime' => -1);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function constructUrl($path) {
-		// Do not pass the password here. We want to use the Net_SFTP object
-		// supplied via stream context or fail. We only supply username and
-		// hostname because this might show up in logs (they are not used).
-		$url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
-		return $url;
-	}
+    private $host;
+    private $user;
+    private $root;
+    private $port = 22;
+
+    private $auth;
+
+    /**
+     * @var \phpseclib\Net\SFTP
+     */
+    protected $client;
+
+    /**
+     * @param string $host protocol://server:port
+     * @return array [$server, $port]
+     */
+    private function splitHost($host) {
+        $input = $host;
+        if (strpos($host, '://') === false) {
+            // add a protocol to fix parse_url behavior with ipv6
+            $host = 'http://' . $host;
+        }
+
+        $parsed = parse_url($host);
+        if(is_array($parsed) && isset($parsed['port'])) {
+            return [$parsed['host'], $parsed['port']];
+        } else if (is_array($parsed)) {
+            return [$parsed['host'], 22];
+        } else {
+            return [$input, 22];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($params) {
+        // Register sftp://
+        Stream::register();
+
+        $parsedHost =  $this->splitHost($params['host']);
+
+        $this->host = $parsedHost[0];
+        $this->port = $parsedHost[1];
+
+        if (!isset($params['user'])) {
+            throw new \UnexpectedValueException('no authentication parameters specified');
+        }
+        $this->user = $params['user'];
+
+        if (isset($params['public_key_auth'])) {
+            $this->auth = $params['public_key_auth'];
+        } elseif (isset($params['password'])) {
+            $this->auth = $params['password'];
+        } else {
+            throw new \UnexpectedValueException('no authentication parameters specified');
+        }
+
+        $this->root
+            = isset($params['root']) ? $this->cleanPath($params['root']) : '/';
+
+        if ($this->root[0] != '/') {
+                $this->root = '/' . $this->root;
+        }
+
+        if (substr($this->root, -1, 1) != '/') {
+            $this->root .= '/';
+        }
+    }
+
+    /**
+     * Returns the connection.
+     *
+     * @return \phpseclib\Net\SFTP connected client instance
+     * @throws \Exception when the connection failed
+     */
+    public function getConnection() {
+        if (!is_null($this->client)) {
+            return $this->client;
+        }
+
+        $hostKeys = $this->readHostKeys();
+        $this->client = new \phpseclib\Net\SFTP($this->host, $this->port);
+
+        // The SSH Host Key MUST be verified before login().
+        $currentHostKey = $this->client->getServerPublicHostKey();
+        if (array_key_exists($this->host, $hostKeys)) {
+            if ($hostKeys[$this->host] != $currentHostKey) {
+                throw new \Exception('Host public key does not match known key');
+            }
+        } else {
+            $hostKeys[$this->host] = $currentHostKey;
+            $this->writeHostKeys($hostKeys);
+        }
+
+        if (!$this->client->login($this->user, $this->auth)) {
+            throw new \Exception('Login failed');
+        }
+        return $this->client;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function test() {
+        if (
+            !isset($this->host)
+            || !isset($this->user)
+        ) {
+            return false;
+        }
+        return $this->getConnection()->nlist() !== false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId(){
+        $id = 'sftp::' . $this->user . '@' . $this->host;
+        if ($this->port !== 22) {
+            $id .= ':' . $this->port;
+        }
+        // note: this will double the root slash,
+        // we should not change it to keep compatible with
+        // old storage ids
+        $id .= '/' . $this->root;
+        return $id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHost() {
+        return $this->host;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRoot() {
+        return $this->root;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function absPath($path) {
+        return $this->root . $this->cleanPath($path);
+    }
+
+    /**
+     * @return string|false
+     */
+    private function hostKeysPath() {
+        try {
+            $storage_view = \OCP\Files::getStorage('files_external');
+            if ($storage_view) {
+                return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') .
+                    $storage_view->getAbsolutePath('') .
+                    'ssh_hostKeys';
+            }
+        } catch (\Exception $e) {
+        }
+        return false;
+    }
+
+    /**
+     * @param $keys
+     * @return bool
+     */
+    protected function writeHostKeys($keys) {
+        try {
+            $keyPath = $this->hostKeysPath();
+            if ($keyPath && file_exists($keyPath)) {
+                $fp = fopen($keyPath, 'w');
+                foreach ($keys as $host => $key) {
+                    fwrite($fp, $host . '::' . $key . "\n");
+                }
+                fclose($fp);
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    protected function readHostKeys() {
+        try {
+            $keyPath = $this->hostKeysPath();
+            if (file_exists($keyPath)) {
+                $hosts = array();
+                $keys = array();
+                $lines = file($keyPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+                if ($lines) {
+                    foreach ($lines as $line) {
+                        $hostKeyArray = explode("::", $line, 2);
+                        if (count($hostKeyArray) == 2) {
+                            $hosts[] = $hostKeyArray[0];
+                            $keys[] = $hostKeyArray[1];
+                        }
+                    }
+                    return array_combine($hosts, $keys);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return array();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function mkdir($path) {
+        try {
+            return $this->getConnection()->mkdir($this->absPath($path));
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rmdir($path) {
+        try {
+            $result = $this->getConnection()->delete($this->absPath($path), true);
+            // workaround: stray stat cache entry when deleting empty folders
+            // see https://github.com/phpseclib/phpseclib/issues/706
+            $this->getConnection()->clearStatCache();
+            return $result;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function opendir($path) {
+        try {
+            $list = $this->getConnection()->nlist($this->absPath($path));
+            if ($list === false) {
+                return false;
+            }
+
+            $id = md5('sftp:' . $path);
+            $dirStream = array();
+            foreach($list as $file) {
+                if ($file != '.' && $file != '..') {
+                    $dirStream[] = $file;
+                }
+            }
+            return IteratorDirectory::wrap($dirStream);
+        } catch(\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function filetype($path) {
+        try {
+            $stat = $this->getConnection()->stat($this->absPath($path));
+            if ($stat['type'] == NET_SFTP_TYPE_REGULAR) {
+                return 'file';
+            }
+
+            if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
+                return 'dir';
+            }
+        } catch (\Exception $e) {
+
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function file_exists($path) {
+        try {
+            return $this->getConnection()->stat($this->absPath($path)) !== false;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unlink($path) {
+        try {
+            return $this->getConnection()->delete($this->absPath($path), true);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fopen($path, $mode) {
+        try {
+            $absPath = $this->absPath($path);
+            switch($mode) {
+                case 'r':
+                case 'rb':
+                    if ( !$this->file_exists($path)) {
+                        return false;
+                    }
+                case 'w':
+                case 'wb':
+                case 'a':
+                case 'ab':
+                case 'r+':
+                case 'w+':
+                case 'wb+':
+                case 'a+':
+                case 'x':
+                case 'x+':
+                case 'c':
+                case 'c+':
+                    $context = stream_context_create(array('sftp' => array('session' => $this->getConnection())));
+                    $handle = fopen($this->constructUrl($path), $mode, false, $context);
+                    return RetryWrapper::wrap($handle);
+            }
+        } catch (\Exception $e) {
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function touch($path, $mtime=null) {
+        try {
+            if (!is_null($mtime)) {
+                return false;
+            }
+            if (!$this->file_exists($path)) {
+                $this->getConnection()->put($this->absPath($path), '');
+            } else {
+                return false;
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @param string $target
+     * @throws \Exception
+     */
+    public function getFile($path, $target) {
+        $this->getConnection()->get($path, $target);
+    }
+
+    /**
+     * @param string $path
+     * @param string $target
+     * @throws \Exception
+     */
+    public function uploadFile($path, $target) {
+        $this->getConnection()->put($target, $path, NET_SFTP_LOCAL_FILE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rename($source, $target) {
+        try {
+            if ($this->file_exists($target)) {
+                $this->unlink($target);
+            }
+            return $this->getConnection()->rename(
+                $this->absPath($source),
+                $this->absPath($target)
+            );
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function stat($path) {
+        try {
+            $stat = $this->getConnection()->stat($this->absPath($path));
+
+            $mtime = $stat ? $stat['mtime'] : -1;
+            $size = $stat ? $stat['size'] : 0;
+
+            return array('mtime' => $mtime, 'size' => $size, 'ctime' => -1);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function constructUrl($path) {
+        // Do not pass the password here. We want to use the Net_SFTP object
+        // supplied via stream context or fail. We only supply username and
+        // hostname because this might show up in logs (they are not used).
+        $url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
+        return $url;
+    }
 }

apps/files_external/lib/Lib/Storage/FTP.php

Indentation +109 added lines, -109 removed lines

@@ -37,122 +37,122 @@
 use Icewind\Streams\RetryWrapper;
 
 class FTP extends StreamWrapper{
-	private $password;
-	private $user;
-	private $host;
-	private $secure;
-	private $root;
+    private $password;
+    private $user;
+    private $host;
+    private $secure;
+    private $root;
 
-	private static $tempFiles=array();
+    private static $tempFiles=array();
 
-	public function __construct($params) {
-		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
-			$this->host=$params['host'];
-			$this->user=$params['user'];
-			$this->password=$params['password'];
-			if (isset($params['secure'])) {
-				$this->secure = $params['secure'];
-			} else {
-				$this->secure = false;
-			}
-			$this->root=isset($params['root'])?$params['root']:'/';
-			if ( ! $this->root || $this->root[0]!='/') {
-				$this->root='/'.$this->root;
-			}
-			if (substr($this->root, -1) !== '/') {
-				$this->root .= '/';
-			}
-		} else {
-			throw new \Exception('Creating FTP storage failed');
-		}
+    public function __construct($params) {
+        if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+            $this->host=$params['host'];
+            $this->user=$params['user'];
+            $this->password=$params['password'];
+            if (isset($params['secure'])) {
+                $this->secure = $params['secure'];
+            } else {
+                $this->secure = false;
+            }
+            $this->root=isset($params['root'])?$params['root']:'/';
+            if ( ! $this->root || $this->root[0]!='/') {
+                $this->root='/'.$this->root;
+            }
+            if (substr($this->root, -1) !== '/') {
+                $this->root .= '/';
+            }
+        } else {
+            throw new \Exception('Creating FTP storage failed');
+        }
 		
-	}
+    }
 
-	public function getId(){
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
-	}
+    public function getId(){
+        return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
+    }
 
-	/**
-	 * construct the ftp url
-	 * @param string $path
-	 * @return string
-	 */
-	public function constructUrl($path) {
-		$url='ftp';
-		if ($this->secure) {
-			$url.='s';
-		}
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
-		return $url;
-	}
+    /**
+     * construct the ftp url
+     * @param string $path
+     * @return string
+     */
+    public function constructUrl($path) {
+        $url='ftp';
+        if ($this->secure) {
+            $url.='s';
+        }
+        $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
+        return $url;
+    }
 
-	/**
-	 * Unlinks file or directory
-	 * @param string $path
-	 */
-	public function unlink($path) {
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-		else {
-			$url = $this->constructUrl($path);
-			$result = unlink($url);
-			clearstatcache(true, $url);
-			return $result;
-		}
-	}
-	public function fopen($path,$mode) {
-		switch($mode) {
-			case 'r':
-			case 'rb':
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-				//these are supported by the wrapper
-				$context = stream_context_create(array('ftp' => array('overwrite' => true)));
-				$handle = fopen($this->constructUrl($path), $mode, false, $context);
-				return RetryWrapper::wrap($handle);
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				//emulate these
-				if (strrpos($path, '.')!==false) {
-					$ext=substr($path, strrpos($path, '.'));
-				} else {
-					$ext='';
-				}
-				$tmpFile=\OCP\Files::tmpFile($ext);
-				if ($this->file_exists($path)) {
-					$this->getFile($path, $tmpFile);
-				}
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-		return false;
-	}
+    /**
+     * Unlinks file or directory
+     * @param string $path
+     */
+    public function unlink($path) {
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+        else {
+            $url = $this->constructUrl($path);
+            $result = unlink($url);
+            clearstatcache(true, $url);
+            return $result;
+        }
+    }
+    public function fopen($path,$mode) {
+        switch($mode) {
+            case 'r':
+            case 'rb':
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+                //these are supported by the wrapper
+                $context = stream_context_create(array('ftp' => array('overwrite' => true)));
+                $handle = fopen($this->constructUrl($path), $mode, false, $context);
+                return RetryWrapper::wrap($handle);
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                //emulate these
+                if (strrpos($path, '.')!==false) {
+                    $ext=substr($path, strrpos($path, '.'));
+                } else {
+                    $ext='';
+                }
+                $tmpFile=\OCP\Files::tmpFile($ext);
+                if ($this->file_exists($path)) {
+                    $this->getFile($path, $tmpFile);
+                }
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+        return false;
+    }
 
-	public function writeBack($tmpFile, $path) {
-		$this->uploadFile($tmpFile, $path);
-		unlink($tmpFile);
-	}
+    public function writeBack($tmpFile, $path) {
+        $this->uploadFile($tmpFile, $path);
+        unlink($tmpFile);
+    }
 
-	/**
-	 * check if php-ftp is installed
-	 */
-	public static function checkDependencies() {
-		if (function_exists('ftp_login')) {
-			return(true);
-		} else {
-			return array('ftp');
-		}
-	}
+    /**
+     * check if php-ftp is installed
+     */
+    public static function checkDependencies() {
+        if (function_exists('ftp_login')) {
+            return(true);
+        } else {
+            return array('ftp');
+        }
+    }
 
 }

apps/files_external/lib/Lib/Storage/StreamWrapper.php

Indentation +96 added lines, -96 removed lines

@@ -30,101 +30,101 @@
 
 abstract class StreamWrapper extends \OC\Files\Storage\Common {
 
-	/**
-	 * @param string $path
-	 * @return string|null
-	 */
-	abstract public function constructUrl($path);
-
-	public function mkdir($path) {
-		return mkdir($this->constructUrl($path));
-	}
-
-	public function rmdir($path) {
-		if ($this->is_dir($path) && $this->isDeletable($path)) {
-			$dh = $this->opendir($path);
-			if (!is_resource($dh)) {
-				return false;
-			}
-			while (($file = readdir($dh)) !== false) {
-				if ($this->is_dir($path . '/' . $file)) {
-					$this->rmdir($path . '/' . $file);
-				} else {
-					$this->unlink($path . '/' . $file);
-				}
-			}
-			$url = $this->constructUrl($path);
-			$success = rmdir($url);
-			clearstatcache(false, $url);
-			return $success;
-		} else {
-			return false;
-		}
-	}
-
-	public function opendir($path) {
-		return opendir($this->constructUrl($path));
-	}
-
-	public function filetype($path) {
-		return @filetype($this->constructUrl($path));
-	}
-
-	public function file_exists($path) {
-		return file_exists($this->constructUrl($path));
-	}
-
-	public function unlink($path) {
-		$url = $this->constructUrl($path);
-		$success = unlink($url);
-		// normally unlink() is supposed to do this implicitly,
-		// but doing it anyway just to be sure
-		clearstatcache(false, $url);
-		return $success;
-	}
-
-	public function fopen($path, $mode) {
-		return fopen($this->constructUrl($path), $mode);
-	}
-
-	public function touch($path, $mtime = null) {
-		if ($this->file_exists($path)) {
-			if (is_null($mtime)) {
-				$fh = $this->fopen($path, 'a');
-				fwrite($fh, '');
-				fclose($fh);
-
-				return true;
-			} else {
-				return false; //not supported
-			}
-		} else {
-			$this->file_put_contents($path, '');
-			return true;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $target
-	 */
-	public function getFile($path, $target) {
-		return copy($this->constructUrl($path), $target);
-	}
-
-	/**
-	 * @param string $target
-	 */
-	public function uploadFile($path, $target) {
-		return copy($path, $this->constructUrl($target));
-	}
-
-	public function rename($path1, $path2) {
-		return rename($this->constructUrl($path1), $this->constructUrl($path2));
-	}
-
-	public function stat($path) {
-		return stat($this->constructUrl($path));
-	}
+    /**
+     * @param string $path
+     * @return string|null
+     */
+    abstract public function constructUrl($path);
+
+    public function mkdir($path) {
+        return mkdir($this->constructUrl($path));
+    }
+
+    public function rmdir($path) {
+        if ($this->is_dir($path) && $this->isDeletable($path)) {
+            $dh = $this->opendir($path);
+            if (!is_resource($dh)) {
+                return false;
+            }
+            while (($file = readdir($dh)) !== false) {
+                if ($this->is_dir($path . '/' . $file)) {
+                    $this->rmdir($path . '/' . $file);
+                } else {
+                    $this->unlink($path . '/' . $file);
+                }
+            }
+            $url = $this->constructUrl($path);
+            $success = rmdir($url);
+            clearstatcache(false, $url);
+            return $success;
+        } else {
+            return false;
+        }
+    }
+
+    public function opendir($path) {
+        return opendir($this->constructUrl($path));
+    }
+
+    public function filetype($path) {
+        return @filetype($this->constructUrl($path));
+    }
+
+    public function file_exists($path) {
+        return file_exists($this->constructUrl($path));
+    }
+
+    public function unlink($path) {
+        $url = $this->constructUrl($path);
+        $success = unlink($url);
+        // normally unlink() is supposed to do this implicitly,
+        // but doing it anyway just to be sure
+        clearstatcache(false, $url);
+        return $success;
+    }
+
+    public function fopen($path, $mode) {
+        return fopen($this->constructUrl($path), $mode);
+    }
+
+    public function touch($path, $mtime = null) {
+        if ($this->file_exists($path)) {
+            if (is_null($mtime)) {
+                $fh = $this->fopen($path, 'a');
+                fwrite($fh, '');
+                fclose($fh);
+
+                return true;
+            } else {
+                return false; //not supported
+            }
+        } else {
+            $this->file_put_contents($path, '');
+            return true;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string $target
+     */
+    public function getFile($path, $target) {
+        return copy($this->constructUrl($path), $target);
+    }
+
+    /**
+     * @param string $target
+     */
+    public function uploadFile($path, $target) {
+        return copy($path, $this->constructUrl($target));
+    }
+
+    public function rename($path1, $path2) {
+        return rename($this->constructUrl($path1), $this->constructUrl($path2));
+    }
+
+    public function stat($path) {
+        return stat($this->constructUrl($path));
+    }
 
 }

apps/files_external/lib/Lib/Storage/AmazonS3.php

Indentation +494 added lines, -494 removed lines

@@ -37,7 +37,7 @@ 
 namespace OCA\Files_External\Lib\Storage;
 
 set_include_path(get_include_path() . PATH_SEPARATOR .
-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+    \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
 require_once 'aws-autoloader.php';
 
 use Aws\S3\S3Client;
@@ -47,498 +47,498 @@ 
 use OC\Files\ObjectStore\S3ConnectionTrait;
 
 class AmazonS3 extends \OC\Files\Storage\Common {
-	use S3ConnectionTrait;
-
-	/**
-	 * @var array
-	 */
-	private static $tmpFiles = array();
-
-	/**
-	 * @var int in seconds
-	 */
-	private $rescanDelay = 10;
-
-	public function __construct($parameters) {
-		parent::__construct($parameters);
-		$this->parseParams($parameters);
-	}
-
-	/**
-	 * @param string $path
-	 * @return string correctly encoded path
-	 */
-	private function normalizePath($path) {
-		$path = trim($path, '/');
-
-		if (!$path) {
-			$path = '.';
-		}
-
-		return $path;
-	}
-
-	private function isRoot($path) {
-		return $path === '.';
-	}
-
-	private function cleanKey($path) {
-		if ($this->isRoot($path)) {
-			return '/';
-		}
-		return $path;
-	}
-
-	/**
-	 * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
-	 * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
-	 *
-	 * @param array $params
-	 */
-	public function updateLegacyId (array $params) {
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
-
-		// find by old id or bucket
-		$stmt = \OC::$server->getDatabaseConnection()->prepare(
-			'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
-		);
-		$stmt->execute(array($oldId, $this->id));
-		while ($row = $stmt->fetch()) {
-			$storages[$row['id']] = $row['numeric_id'];
-		}
-
-		if (isset($storages[$this->id]) && isset($storages[$oldId])) {
-			// if both ids exist, delete the old storage and corresponding filecache entries
-			\OC\Files\Cache\Storage::remove($oldId);
-		} else if (isset($storages[$oldId])) {
-			// if only the old id exists do an update
-			$stmt = \OC::$server->getDatabaseConnection()->prepare(
-				'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
-			);
-			$stmt->execute(array($this->id, $oldId));
-		}
-		// only the bucket based id may exist, do nothing
-	}
-
-	/**
-	 * Remove a file or folder
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function remove($path) {
-		// remember fileType to reduce http calls
-		$fileType = $this->filetype($path);
-		if ($fileType === 'dir') {
-			return $this->rmdir($path);
-		} else if ($fileType === 'file') {
-			return $this->unlink($path);
-		} else {
-			return false;
-		}
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return false;
-		}
-
-		try {
-			$this->getConnection()->putObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
-				'Body' => '',
-				'ContentType' => 'httpd/unix-directory'
-			));
-			$this->testTimeout();
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function file_exists($path) {
-		return $this->filetype($path) !== false;
-	}
-
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			return $this->clearBucket();
-		}
-
-		if (!$this->file_exists($path)) {
-			return false;
-		}
-
-		return $this->batchDelete($path);
-	}
-
-	protected function clearBucket() {
-		try {
-			$this->getConnection()->clearBucket($this->bucket);
-			return true;
-			// clearBucket() is not working with Ceph, so if it fails we try the slower approach
-		} catch (\Exception $e) {
-			return $this->batchDelete();
-		}
-		return false;
-	}
-
-	private function batchDelete ($path = null) {
-		$params = array(
-			'Bucket' => $this->bucket
-		);
-		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
-		}
-		try {
-			// Since there are no real directories on S3, we need
-			// to delete all objects prefixed with the path.
-			do {
-				// instead of the iterator, manually loop over the list ...
-				$objects = $this->getConnection()->listObjects($params);
-				// ... so we can delete the files in batches
-				$this->getConnection()->deleteObjects(array(
-					'Bucket' => $this->bucket,
-					'Objects' => $objects['Contents']
-				));
-				$this->testTimeout();
-				// we reached the end when the list is no longer truncated
-			} while ($objects['IsTruncated']);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-		return true;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			$path = '';
-		} else {
-			$path .= '/';
-		}
-
-		try {
-			$files = array();
-			$result = $this->getConnection()->getIterator('ListObjects', array(
-				'Bucket' => $this->bucket,
-				'Delimiter' => '/',
-				'Prefix' => $path
-			), array('return_prefixes' => true));
-
-			foreach ($result as $object) {
-				if (isset($object['Key']) && $object['Key'] === $path) {
-					// it's the directory itself, skip
-					continue;
-				}
-				$file = basename(
-					isset($object['Key']) ? $object['Key'] : $object['Prefix']
-				);
-				$files[] = $file;
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-
-		try {
-			$stat = array();
-			if ($this->is_dir($path)) {
-				//folders don't really exist
-				$stat['size'] = -1; //unknown
-				$stat['mtime'] = time() - $this->rescanDelay * 1000;
-			} else {
-				$result = $this->getConnection()->headObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $path
-				));
-
-				$stat['size'] = $result['ContentLength'] ? $result['ContentLength'] : 0;
-				if ($result['Metadata']['lastmodified']) {
-					$stat['mtime'] = strtotime($result['Metadata']['lastmodified']);
-				} else {
-					$stat['mtime'] = strtotime($result['LastModified']);
-				}
-			}
-			$stat['atime'] = time();
-
-			return $stat;
-		} catch(S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			return 'dir';
-		}
-
-		try {
-			if ($this->getConnection()->doesObjectExist($this->bucket, $path)) {
-				return 'file';
-			}
-			if ($this->getConnection()->doesObjectExist($this->bucket, $path.'/')) {
-				return 'dir';
-			}
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return false;
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-
-		try {
-			$this->getConnection()->deleteObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $path
-			));
-			$this->testTimeout();
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				$tmpFile = \OCP\Files::tmpFile();
-				self::$tmpFiles[$tmpFile] = $path;
-
-				try {
-					$this->getConnection()->getObject(array(
-						'Bucket' => $this->bucket,
-						'Key' => $path,
-						'SaveAs' => $tmpFile
-					));
-				} catch (S3Exception $e) {
-					\OCP\Util::logException('files_external', $e);
-					return false;
-				}
-
-				return fopen($tmpFile, 'r');
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-		return false;
-	}
-
-	public function touch($path, $mtime = null) {
-		$path = $this->normalizePath($path);
-
-		$metadata = array();
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$metadata = [
-			'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime)
-		];
-
-		$fileType = $this->filetype($path);
-		try {
-			if ($fileType !== false) {
-				if ($fileType === 'dir' && ! $this->isRoot($path)) {
-					$path .= '/';
-				}
-				$this->getConnection()->copyObject([
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path),
-					'Metadata' => $metadata,
-					'CopySource' => $this->bucket . '/' . $path,
-					'MetadataDirective' => 'REPLACE',
-				]);
-				$this->testTimeout();
-			} else {
-				$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-				$this->getConnection()->putObject([
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path),
-					'Metadata' => $metadata,
-					'Body' => '',
-					'ContentType' => $mimeType,
-					'MetadataDirective' => 'REPLACE',
-				]);
-				$this->testTimeout();
-			}
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function copy($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		if ($this->is_file($path1)) {
-			try {
-				$this->getConnection()->copyObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path2),
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				return false;
-			}
-		} else {
-			$this->remove($path2);
-
-			try {
-				$this->getConnection()->copyObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $path2 . '/',
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				return false;
-			}
-
-			$dh = $this->opendir($path1);
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-						continue;
-					}
-
-					$source = $path1 . '/' . $file;
-					$target = $path2 . '/' . $file;
-					$this->copy($source, $target);
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public function rename($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		if ($this->is_file($path1)) {
-
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			if ($this->unlink($path1) === false) {
-				$this->unlink($path2);
-				return false;
-			}
-		} else {
-
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			if ($this->rmdir($path1) === false) {
-				$this->rmdir($path2);
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public function test() {
-		$test = $this->getConnection()->getBucketAcl(array(
-			'Bucket' => $this->bucket,
-		));
-		if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
-			return true;
-		}
-		return false;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	public function writeBack($tmpFile, $path) {
-		try {
-			$this->getConnection()->putObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $this->cleanKey($path),
-				'SourceFile' => $tmpFile,
-				'ContentType' => \OC::$server->getMimeTypeDetector()->detect($tmpFile),
-				'ContentLength' => filesize($tmpFile)
-			));
-			$this->testTimeout();
-
-			unlink($tmpFile);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    use S3ConnectionTrait;
+
+    /**
+     * @var array
+     */
+    private static $tmpFiles = array();
+
+    /**
+     * @var int in seconds
+     */
+    private $rescanDelay = 10;
+
+    public function __construct($parameters) {
+        parent::__construct($parameters);
+        $this->parseParams($parameters);
+    }
+
+    /**
+     * @param string $path
+     * @return string correctly encoded path
+     */
+    private function normalizePath($path) {
+        $path = trim($path, '/');
+
+        if (!$path) {
+            $path = '.';
+        }
+
+        return $path;
+    }
+
+    private function isRoot($path) {
+        return $path === '.';
+    }
+
+    private function cleanKey($path) {
+        if ($this->isRoot($path)) {
+            return '/';
+        }
+        return $path;
+    }
+
+    /**
+     * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
+     * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
+     *
+     * @param array $params
+     */
+    public function updateLegacyId (array $params) {
+        $oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+
+        // find by old id or bucket
+        $stmt = \OC::$server->getDatabaseConnection()->prepare(
+            'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
+        );
+        $stmt->execute(array($oldId, $this->id));
+        while ($row = $stmt->fetch()) {
+            $storages[$row['id']] = $row['numeric_id'];
+        }
+
+        if (isset($storages[$this->id]) && isset($storages[$oldId])) {
+            // if both ids exist, delete the old storage and corresponding filecache entries
+            \OC\Files\Cache\Storage::remove($oldId);
+        } else if (isset($storages[$oldId])) {
+            // if only the old id exists do an update
+            $stmt = \OC::$server->getDatabaseConnection()->prepare(
+                'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
+            );
+            $stmt->execute(array($this->id, $oldId));
+        }
+        // only the bucket based id may exist, do nothing
+    }
+
+    /**
+     * Remove a file or folder
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function remove($path) {
+        // remember fileType to reduce http calls
+        $fileType = $this->filetype($path);
+        if ($fileType === 'dir') {
+            return $this->rmdir($path);
+        } else if ($fileType === 'file') {
+            return $this->unlink($path);
+        } else {
+            return false;
+        }
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return false;
+        }
+
+        try {
+            $this->getConnection()->putObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $path . '/',
+                'Body' => '',
+                'ContentType' => 'httpd/unix-directory'
+            ));
+            $this->testTimeout();
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function file_exists($path) {
+        return $this->filetype($path) !== false;
+    }
+
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            return $this->clearBucket();
+        }
+
+        if (!$this->file_exists($path)) {
+            return false;
+        }
+
+        return $this->batchDelete($path);
+    }
+
+    protected function clearBucket() {
+        try {
+            $this->getConnection()->clearBucket($this->bucket);
+            return true;
+            // clearBucket() is not working with Ceph, so if it fails we try the slower approach
+        } catch (\Exception $e) {
+            return $this->batchDelete();
+        }
+        return false;
+    }
+
+    private function batchDelete ($path = null) {
+        $params = array(
+            'Bucket' => $this->bucket
+        );
+        if ($path !== null) {
+            $params['Prefix'] = $path . '/';
+        }
+        try {
+            // Since there are no real directories on S3, we need
+            // to delete all objects prefixed with the path.
+            do {
+                // instead of the iterator, manually loop over the list ...
+                $objects = $this->getConnection()->listObjects($params);
+                // ... so we can delete the files in batches
+                $this->getConnection()->deleteObjects(array(
+                    'Bucket' => $this->bucket,
+                    'Objects' => $objects['Contents']
+                ));
+                $this->testTimeout();
+                // we reached the end when the list is no longer truncated
+            } while ($objects['IsTruncated']);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+        return true;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            $path = '';
+        } else {
+            $path .= '/';
+        }
+
+        try {
+            $files = array();
+            $result = $this->getConnection()->getIterator('ListObjects', array(
+                'Bucket' => $this->bucket,
+                'Delimiter' => '/',
+                'Prefix' => $path
+            ), array('return_prefixes' => true));
+
+            foreach ($result as $object) {
+                if (isset($object['Key']) && $object['Key'] === $path) {
+                    // it's the directory itself, skip
+                    continue;
+                }
+                $file = basename(
+                    isset($object['Key']) ? $object['Key'] : $object['Prefix']
+                );
+                $files[] = $file;
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+
+        try {
+            $stat = array();
+            if ($this->is_dir($path)) {
+                //folders don't really exist
+                $stat['size'] = -1; //unknown
+                $stat['mtime'] = time() - $this->rescanDelay * 1000;
+            } else {
+                $result = $this->getConnection()->headObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $path
+                ));
+
+                $stat['size'] = $result['ContentLength'] ? $result['ContentLength'] : 0;
+                if ($result['Metadata']['lastmodified']) {
+                    $stat['mtime'] = strtotime($result['Metadata']['lastmodified']);
+                } else {
+                    $stat['mtime'] = strtotime($result['LastModified']);
+                }
+            }
+            $stat['atime'] = time();
+
+            return $stat;
+        } catch(S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            return 'dir';
+        }
+
+        try {
+            if ($this->getConnection()->doesObjectExist($this->bucket, $path)) {
+                return 'file';
+            }
+            if ($this->getConnection()->doesObjectExist($this->bucket, $path.'/')) {
+                return 'dir';
+            }
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return false;
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+
+        try {
+            $this->getConnection()->deleteObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $path
+            ));
+            $this->testTimeout();
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                $tmpFile = \OCP\Files::tmpFile();
+                self::$tmpFiles[$tmpFile] = $path;
+
+                try {
+                    $this->getConnection()->getObject(array(
+                        'Bucket' => $this->bucket,
+                        'Key' => $path,
+                        'SaveAs' => $tmpFile
+                    ));
+                } catch (S3Exception $e) {
+                    \OCP\Util::logException('files_external', $e);
+                    return false;
+                }
+
+                return fopen($tmpFile, 'r');
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                if ($this->file_exists($path)) {
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+        return false;
+    }
+
+    public function touch($path, $mtime = null) {
+        $path = $this->normalizePath($path);
+
+        $metadata = array();
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $metadata = [
+            'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime)
+        ];
+
+        $fileType = $this->filetype($path);
+        try {
+            if ($fileType !== false) {
+                if ($fileType === 'dir' && ! $this->isRoot($path)) {
+                    $path .= '/';
+                }
+                $this->getConnection()->copyObject([
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path),
+                    'Metadata' => $metadata,
+                    'CopySource' => $this->bucket . '/' . $path,
+                    'MetadataDirective' => 'REPLACE',
+                ]);
+                $this->testTimeout();
+            } else {
+                $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+                $this->getConnection()->putObject([
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path),
+                    'Metadata' => $metadata,
+                    'Body' => '',
+                    'ContentType' => $mimeType,
+                    'MetadataDirective' => 'REPLACE',
+                ]);
+                $this->testTimeout();
+            }
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function copy($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        if ($this->is_file($path1)) {
+            try {
+                $this->getConnection()->copyObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path2),
+                    'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                \OCP\Util::logException('files_external', $e);
+                return false;
+            }
+        } else {
+            $this->remove($path2);
+
+            try {
+                $this->getConnection()->copyObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $path2 . '/',
+                    'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                \OCP\Util::logException('files_external', $e);
+                return false;
+            }
+
+            $dh = $this->opendir($path1);
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                        continue;
+                    }
+
+                    $source = $path1 . '/' . $file;
+                    $target = $path2 . '/' . $file;
+                    $this->copy($source, $target);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function rename($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        if ($this->is_file($path1)) {
+
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            if ($this->unlink($path1) === false) {
+                $this->unlink($path2);
+                return false;
+            }
+        } else {
+
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            if ($this->rmdir($path1) === false) {
+                $this->rmdir($path2);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function test() {
+        $test = $this->getConnection()->getBucketAcl(array(
+            'Bucket' => $this->bucket,
+        ));
+        if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
+            return true;
+        }
+        return false;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    public function writeBack($tmpFile, $path) {
+        try {
+            $this->getConnection()->putObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $this->cleanKey($path),
+                'SourceFile' => $tmpFile,
+                'ContentType' => \OC::$server->getMimeTypeDetector()->detect($tmpFile),
+                'ContentLength' => filesize($tmpFile)
+            ));
+            $this->testTimeout();
+
+            unlink($tmpFile);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

apps/files_external/lib/Lib/Storage/Dropbox.php

Indentation +290 added lines, -290 removed lines

@@ -40,317 +40,317 @@
 
 class Dropbox extends \OC\Files\Storage\Common {
 
-	private $dropbox;
-	private $root;
-	private $id;
-	private $metaData = array();
-	private $oauth;
+    private $dropbox;
+    private $root;
+    private $id;
+    private $metaData = array();
+    private $oauth;
 
-	public function __construct($params) {
-		if (isset($params['configured']) && $params['configured'] == 'true'
-			&& isset($params['app_key'])
-			&& isset($params['app_secret'])
-			&& isset($params['token'])
-			&& isset($params['token_secret'])
-		) {
-			$this->root = isset($params['root']) ? $params['root'] : '';
-			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
-			$this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
-			$this->oauth->setToken($params['token'], $params['token_secret']);
-			// note: Dropbox_API connection is lazy
-			$this->dropbox = new \Dropbox_API($this->oauth, 'auto');
-		} else {
-			throw new \Exception('Creating Dropbox storage failed');
-		}
-	}
+    public function __construct($params) {
+        if (isset($params['configured']) && $params['configured'] == 'true'
+            && isset($params['app_key'])
+            && isset($params['app_secret'])
+            && isset($params['token'])
+            && isset($params['token_secret'])
+        ) {
+            $this->root = isset($params['root']) ? $params['root'] : '';
+            $this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
+            $this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
+            $this->oauth->setToken($params['token'], $params['token_secret']);
+            // note: Dropbox_API connection is lazy
+            $this->dropbox = new \Dropbox_API($this->oauth, 'auto');
+        } else {
+            throw new \Exception('Creating Dropbox storage failed');
+        }
+    }
 
-	/**
-	 * @param string $path
-	 */
-	private function deleteMetaData($path) {
-		$path = ltrim($this->root.$path, '/');
-		if (isset($this->metaData[$path])) {
-			unset($this->metaData[$path]);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $path
+     */
+    private function deleteMetaData($path) {
+        $path = ltrim($this->root.$path, '/');
+        if (isset($this->metaData[$path])) {
+            unset($this->metaData[$path]);
+            return true;
+        }
+        return false;
+    }
 
-	private function setMetaData($path, $metaData) {
-		$this->metaData[ltrim($path, '/')] = $metaData;
-	}
+    private function setMetaData($path, $metaData) {
+        $this->metaData[ltrim($path, '/')] = $metaData;
+    }
 
-	/**
-	 * Returns the path's metadata
-	 * @param string $path path for which to return the metadata
-	 * @param bool $list if true, also return the directory's contents
-	 * @return mixed directory contents if $list is true, file metadata if $list is
-	 * false, null if the file doesn't exist or "false" if the operation failed
-	 */
-	private function getDropBoxMetaData($path, $list = false) {
-		$path = ltrim($this->root.$path, '/');
-		if ( ! $list && isset($this->metaData[$path])) {
-			return $this->metaData[$path];
-		} else {
-			if ($list) {
-				try {
-					$response = $this->dropbox->getMetaData($path);
-				} catch (\Dropbox_Exception_Forbidden $e) {
-					throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
-				} catch (\Exception $exception) {
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-				$contents = array();
-				if ($response && isset($response['contents'])) {
-					// Cache folder's contents
-					foreach ($response['contents'] as $file) {
-						if (!isset($file['is_deleted']) || !$file['is_deleted']) {
-							$this->setMetaData($path.'/'.basename($file['path']), $file);
-							$contents[] = $file;
-						}
-					}
-					unset($response['contents']);
-				}
-				if (!isset($response['is_deleted']) || !$response['is_deleted']) {
-					$this->setMetaData($path, $response);
-				}
-				// Return contents of folder only
-				return $contents;
-			} else {
-				try {
-					$requestPath = $path;
-					if ($path === '.') {
-						$requestPath = '';
-					}
+    /**
+     * Returns the path's metadata
+     * @param string $path path for which to return the metadata
+     * @param bool $list if true, also return the directory's contents
+     * @return mixed directory contents if $list is true, file metadata if $list is
+     * false, null if the file doesn't exist or "false" if the operation failed
+     */
+    private function getDropBoxMetaData($path, $list = false) {
+        $path = ltrim($this->root.$path, '/');
+        if ( ! $list && isset($this->metaData[$path])) {
+            return $this->metaData[$path];
+        } else {
+            if ($list) {
+                try {
+                    $response = $this->dropbox->getMetaData($path);
+                } catch (\Dropbox_Exception_Forbidden $e) {
+                    throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
+                } catch (\Exception $exception) {
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+                $contents = array();
+                if ($response && isset($response['contents'])) {
+                    // Cache folder's contents
+                    foreach ($response['contents'] as $file) {
+                        if (!isset($file['is_deleted']) || !$file['is_deleted']) {
+                            $this->setMetaData($path.'/'.basename($file['path']), $file);
+                            $contents[] = $file;
+                        }
+                    }
+                    unset($response['contents']);
+                }
+                if (!isset($response['is_deleted']) || !$response['is_deleted']) {
+                    $this->setMetaData($path, $response);
+                }
+                // Return contents of folder only
+                return $contents;
+            } else {
+                try {
+                    $requestPath = $path;
+                    if ($path === '.') {
+                        $requestPath = '';
+                    }
 
-					$response = $this->dropbox->getMetaData($requestPath, 'false');
-					if (!isset($response['is_deleted']) || !$response['is_deleted']) {
-						$this->setMetaData($path, $response);
-						return $response;
-					}
-					return null;
-				} catch (\Dropbox_Exception_Forbidden $e) {
-					throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
-				} catch (\Exception $exception) {
-					if ($exception instanceof \Dropbox_Exception_NotFound) {
-						// don't log, might be a file_exist check
-						return false;
-					}
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			}
-		}
-	}
+                    $response = $this->dropbox->getMetaData($requestPath, 'false');
+                    if (!isset($response['is_deleted']) || !$response['is_deleted']) {
+                        $this->setMetaData($path, $response);
+                        return $response;
+                    }
+                    return null;
+                } catch (\Dropbox_Exception_Forbidden $e) {
+                    throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
+                } catch (\Exception $exception) {
+                    if ($exception instanceof \Dropbox_Exception_NotFound) {
+                        // don't log, might be a file_exist check
+                        return false;
+                    }
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            }
+        }
+    }
 
-	public function getId(){
-		return $this->id;
-	}
+    public function getId(){
+        return $this->id;
+    }
 
-	public function mkdir($path) {
-		$path = $this->root.$path;
-		try {
-			$this->dropbox->createFolder($path);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function mkdir($path) {
+        $path = $this->root.$path;
+        try {
+            $this->dropbox->createFolder($path);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function rmdir($path) {
-		return $this->unlink($path);
-	}
+    public function rmdir($path) {
+        return $this->unlink($path);
+    }
 
-	public function opendir($path) {
-		$contents = $this->getDropBoxMetaData($path, true);
-		if ($contents !== false) {
-			$files = array();
-			foreach ($contents as $file) {
-				$files[] = basename($file['path']);
-			}
-			return IteratorDirectory::wrap($files);
-		}
-		return false;
-	}
+    public function opendir($path) {
+        $contents = $this->getDropBoxMetaData($path, true);
+        if ($contents !== false) {
+            $files = array();
+            foreach ($contents as $file) {
+                $files[] = basename($file['path']);
+            }
+            return IteratorDirectory::wrap($files);
+        }
+        return false;
+    }
 
-	public function stat($path) {
-		$metaData = $this->getDropBoxMetaData($path);
-		if ($metaData) {
-			$stat['size'] = $metaData['bytes'];
-			$stat['atime'] = time();
-			$stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
-			return $stat;
-		}
-		return false;
-	}
+    public function stat($path) {
+        $metaData = $this->getDropBoxMetaData($path);
+        if ($metaData) {
+            $stat['size'] = $metaData['bytes'];
+            $stat['atime'] = time();
+            $stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
+            return $stat;
+        }
+        return false;
+    }
 
-	public function filetype($path) {
-		if ($path == '' || $path == '/') {
-			return 'dir';
-		} else {
-			$metaData = $this->getDropBoxMetaData($path);
-			if ($metaData) {
-				if ($metaData['is_dir'] == 'true') {
-					return 'dir';
-				} else {
-					return 'file';
-				}
-			}
-		}
-		return false;
-	}
+    public function filetype($path) {
+        if ($path == '' || $path == '/') {
+            return 'dir';
+        } else {
+            $metaData = $this->getDropBoxMetaData($path);
+            if ($metaData) {
+                if ($metaData['is_dir'] == 'true') {
+                    return 'dir';
+                } else {
+                    return 'file';
+                }
+            }
+        }
+        return false;
+    }
 
-	public function file_exists($path) {
-		if ($path == '' || $path == '/') {
-			return true;
-		}
-		if ($this->getDropBoxMetaData($path)) {
-			return true;
-		}
-		return false;
-	}
+    public function file_exists($path) {
+        if ($path == '' || $path == '/') {
+            return true;
+        }
+        if ($this->getDropBoxMetaData($path)) {
+            return true;
+        }
+        return false;
+    }
 
-	public function unlink($path) {
-		try {
-			$this->dropbox->delete($this->root.$path);
-			$this->deleteMetaData($path);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function unlink($path) {
+        try {
+            $this->dropbox->delete($this->root.$path);
+            $this->deleteMetaData($path);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function rename($path1, $path2) {
-		try {
-			// overwrite if target file exists and is not a directory
-			$destMetaData = $this->getDropBoxMetaData($path2);
-			if (isset($destMetaData) && $destMetaData !== false && !$destMetaData['is_dir']) {
-				$this->unlink($path2);
-			}
-			$this->dropbox->move($this->root.$path1, $this->root.$path2);
-			$this->deleteMetaData($path1);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function rename($path1, $path2) {
+        try {
+            // overwrite if target file exists and is not a directory
+            $destMetaData = $this->getDropBoxMetaData($path2);
+            if (isset($destMetaData) && $destMetaData !== false && !$destMetaData['is_dir']) {
+                $this->unlink($path2);
+            }
+            $this->dropbox->move($this->root.$path1, $this->root.$path2);
+            $this->deleteMetaData($path1);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function copy($path1, $path2) {
-		$path1 = $this->root.$path1;
-		$path2 = $this->root.$path2;
-		try {
-			$this->dropbox->copy($path1, $path2);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function copy($path1, $path2) {
+        $path1 = $this->root.$path1;
+        $path2 = $this->root.$path2;
+        try {
+            $this->dropbox->copy($path1, $path2);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function fopen($path, $mode) {
-		$path = $this->root.$path;
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				try {
-					// slashes need to stay
-					$encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
-					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
-					$headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
+    public function fopen($path, $mode) {
+        $path = $this->root.$path;
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                try {
+                    // slashes need to stay
+                    $encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
+                    $downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
+                    $headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
 
-					$client = \OC::$server->getHTTPClientService()->newClient();
-					try {
-						$response = $client->get($downloadUrl, [
-							'headers' => $headers,
-							'stream' => true,
-						]);
-					} catch (RequestException $e) {
-						if (!is_null($e->getResponse())) {
-							if ($e->getResponse()->getStatusCode() === 404) {
-								return false;
-							} else {
-								throw $e;
-							}
-						} else {
-							throw $e;
-						}
-					}
+                    $client = \OC::$server->getHTTPClientService()->newClient();
+                    try {
+                        $response = $client->get($downloadUrl, [
+                            'headers' => $headers,
+                            'stream' => true,
+                        ]);
+                    } catch (RequestException $e) {
+                        if (!is_null($e->getResponse())) {
+                            if ($e->getResponse()->getStatusCode() === 404) {
+                                return false;
+                            } else {
+                                throw $e;
+                            }
+                        } else {
+                            throw $e;
+                        }
+                    }
 
-					$handle = $response->getBody();
-					return RetryWrapper::wrap($handle);
-				} catch (\Exception $exception) {
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-			$handle = fopen($tmpFile, $mode);
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-				$this->writeBack($tmpFile, $path);
-			});
-		}
-		return false;
-	}
+                    $handle = $response->getBody();
+                    return RetryWrapper::wrap($handle);
+                } catch (\Exception $exception) {
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                if ($this->file_exists($path)) {
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+            $handle = fopen($tmpFile, $mode);
+            return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                $this->writeBack($tmpFile, $path);
+            });
+        }
+        return false;
+    }
 
-	public function writeBack($tmpFile, $path) {
-		$handle = fopen($tmpFile, 'r');
-		try {
-			$this->dropbox->putFile($path, $handle);
-			unlink($tmpFile);
-			$this->deleteMetaData($path);
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-		}
-	}
+    public function writeBack($tmpFile, $path) {
+        $handle = fopen($tmpFile, 'r');
+        try {
+            $this->dropbox->putFile($path, $handle);
+            unlink($tmpFile);
+            $this->deleteMetaData($path);
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+        }
+    }
 
-	public function free_space($path) {
-		try {
-			$info = $this->dropbox->getAccountInfo();
-			return $info['quota_info']['quota'] - $info['quota_info']['normal'];
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function free_space($path) {
+        try {
+            $info = $this->dropbox->getAccountInfo();
+            return $info['quota_info']['quota'] - $info['quota_info']['normal'];
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function touch($path, $mtime = null) {
-		if ($this->file_exists($path)) {
-			return false;
-		} else {
-			$this->file_put_contents($path, '');
-		}
-		return true;
-	}
+    public function touch($path, $mtime = null) {
+        if ($this->file_exists($path)) {
+            return false;
+        } else {
+            $this->file_put_contents($path, '');
+        }
+        return true;
+    }
 
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }