nextcloud / server

apps/files_external/lib/Lib/PriorityTrait.php

Indentation +27 added lines, -27 removed lines

@@ -29,33 +29,33 @@
  */
 trait PriorityTrait {
 
-	/** @var int initial priority */
-	protected $priority = BackendService::PRIORITY_DEFAULT;
-
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
-
-	/**
-	 * @param int $priority
-	 * @return self
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-		return $this;
-	}
-
-	/**
-	 * @param PriorityTrait $a
-	 * @param PriorityTrait $b
-	 * @return int
-	 */
-	public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
-		return ($a->getPriority() - $b->getPriority());
-	}
+    /** @var int initial priority */
+    protected $priority = BackendService::PRIORITY_DEFAULT;
+
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
+
+    /**
+     * @param int $priority
+     * @return self
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+        return $this;
+    }
+
+    /**
+     * @param PriorityTrait $a
+     * @param PriorityTrait $b
+     * @return int
+     */
+    public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
+        return ($a->getPriority() - $b->getPriority());
+    }
 
 }
 

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/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/StorageModifierTrait.php

Indentation +21 added lines, -21 removed lines

@@ -43,28 +43,28 @@
  */
 trait StorageModifierTrait {
 
-	/**
-	 * Modify a StorageConfig parameters
-	 *
-	 * @param StorageConfig $storage
-	 * @param IUser $user User the storage is being used as
-	 * @throws InsufficientDataForMeaningfulAnswerException
-	 * @throws StorageNotAvailableException
-	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-	}
+    /**
+     * Modify a StorageConfig parameters
+     *
+     * @param StorageConfig $storage
+     * @param IUser $user User the storage is being used as
+     * @throws InsufficientDataForMeaningfulAnswerException
+     * @throws StorageNotAvailableException
+     */
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+    }
 
-	/**
-	 * Wrap a Storage if necessary
-	 *
-	 * @param Storage $storage
-	 * @return Storage
-	 * @throws InsufficientDataForMeaningfulAnswerException
-	 * @throws StorageNotAvailableException
-	 */
-	public function wrapStorage(Storage $storage) {
-		return $storage;
-	}
+    /**
+     * Wrap a Storage if necessary
+     *
+     * @param Storage $storage
+     * @return Storage
+     * @throws InsufficientDataForMeaningfulAnswerException
+     * @throws StorageNotAvailableException
+     */
+    public function wrapStorage(Storage $storage) {
+        return $storage;
+    }
 
 }
 

apps/files_external/lib/Lib/PersonalMount.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
  * Person mount points can be moved by the user
  */
 class PersonalMount extends MountPoint implements MoveableMount {
-	/** @var UserStoragesService */
-	protected $storagesService;
+    /** @var UserStoragesService */
+    protected $storagesService;
 
-	/** @var int */
-	protected $numericStorageId;
+    /** @var int */
+    protected $numericStorageId;
 
-	/**
-	 * @param UserStoragesService $storagesService
-	 * @param int $storageId
-	 * @param \OCP\Files\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $arguments (optional) configuration for the storage backend
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param array $mountOptions mount specific options
-	 */
-	public function __construct(
-		UserStoragesService $storagesService,
-		$storageId,
-		$storage,
-		$mountpoint,
-		$arguments = null,
-		$loader = null,
-		$mountOptions = null
-	) {
-		parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
-		$this->storagesService = $storagesService;
-		$this->numericStorageId = $storageId;
-	}
+    /**
+     * @param UserStoragesService $storagesService
+     * @param int $storageId
+     * @param \OCP\Files\Storage $storage
+     * @param string $mountpoint
+     * @param array $arguments (optional) configuration for the storage backend
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param array $mountOptions mount specific options
+     */
+    public function __construct(
+        UserStoragesService $storagesService,
+        $storageId,
+        $storage,
+        $mountpoint,
+        $arguments = null,
+        $loader = null,
+        $mountOptions = null
+    ) {
+        parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
+        $this->storagesService = $storagesService;
+        $this->numericStorageId = $storageId;
+    }
 
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$storage = $this->storagesService->getStorage($this->numericStorageId);
-		// remove "/$user/files" prefix
-		$targetParts = explode('/', trim($target, '/'), 3);
-		$storage->setMountPoint($targetParts[2]);
-		$this->storagesService->updateStorage($storage);
-		$this->setMountPoint($target);
-		return true;
-	}
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $storage = $this->storagesService->getStorage($this->numericStorageId);
+        // remove "/$user/files" prefix
+        $targetParts = explode('/', trim($target, '/'), 3);
+        $storage->setMountPoint($targetParts[2]);
+        $this->storagesService->updateStorage($storage);
+        $this->setMountPoint($target);
+        return true;
+    }
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$this->storagesService->removeStorage($this->numericStorageId);
-		return true;
-	}
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $this->storagesService->removeStorage($this->numericStorageId);
+        return true;
+    }
 }

apps/files_external/lib/Lib/Notify/SMBNotifyHandler.php

Indentation +109 added lines, -109 removed lines

@@ -29,122 +29,122 @@
 use OCP\Files\Notify\INotifyHandler;
 
 class SMBNotifyHandler implements INotifyHandler {
-	/**
-	 * @var \Icewind\SMB\INotifyHandler
-	 */
-	private $shareNotifyHandler;
+    /**
+     * @var \Icewind\SMB\INotifyHandler
+     */
+    private $shareNotifyHandler;
 
-	/**
-	 * @var string
-	 */
-	private $root;
+    /**
+     * @var string
+     */
+    private $root;
 
-	private $oldRenamePath = null;
+    private $oldRenamePath = null;
 
-	/**
-	 * SMBNotifyHandler constructor.
-	 *
-	 * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
-	 * @param string $root
-	 */
-	public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
-		$this->shareNotifyHandler = $shareNotifyHandler;
-		$this->root = $root;
-	}
+    /**
+     * SMBNotifyHandler constructor.
+     *
+     * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
+     * @param string $root
+     */
+    public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
+        $this->shareNotifyHandler = $shareNotifyHandler;
+        $this->root = $root;
+    }
 
-	private function relativePath($fullPath) {
-		if ($fullPath === $this->root) {
-			return '';
-		} else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
-			return substr($fullPath, strlen($this->root));
-		} else {
-			return null;
-		}
-	}
+    private function relativePath($fullPath) {
+        if ($fullPath === $this->root) {
+            return '';
+        } else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
+            return substr($fullPath, strlen($this->root));
+        } else {
+            return null;
+        }
+    }
 
-	public function listen(callable $callback) {
-		$oldRenamePath = null;
-		$this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
-			$change = $this->mapChange($shareChange);
-			if (!is_null($change)) {
-				return $callback($change);
-			} else {
-				return true;
-			}
-		});
-	}
+    public function listen(callable $callback) {
+        $oldRenamePath = null;
+        $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
+            $change = $this->mapChange($shareChange);
+            if (!is_null($change)) {
+                return $callback($change);
+            } else {
+                return true;
+            }
+        });
+    }
 
-	/**
-	 * Get all changes detected since the start of the notify process or the last call to getChanges
-	 *
-	 * @return IChange[]
-	 */
-	public function getChanges() {
-		$shareChanges = $this->shareNotifyHandler->getChanges();
-		$changes = [];
-		foreach ($shareChanges as $shareChange) {
-			$change = $this->mapChange($shareChange);
-			if ($change) {
-				$changes[] = $change;
-			}
-		}
-		return $changes;
-	}
+    /**
+     * Get all changes detected since the start of the notify process or the last call to getChanges
+     *
+     * @return IChange[]
+     */
+    public function getChanges() {
+        $shareChanges = $this->shareNotifyHandler->getChanges();
+        $changes = [];
+        foreach ($shareChanges as $shareChange) {
+            $change = $this->mapChange($shareChange);
+            if ($change) {
+                $changes[] = $change;
+            }
+        }
+        return $changes;
+    }
 
-	/**
-	 * Stop listening for changes
-	 *
-	 * Note that any pending changes will be discarded
-	 */
-	public function stop() {
-		$this->shareNotifyHandler->stop();
-	}
+    /**
+     * Stop listening for changes
+     *
+     * Note that any pending changes will be discarded
+     */
+    public function stop() {
+        $this->shareNotifyHandler->stop();
+    }
 
-	/**
-	 * @param \Icewind\SMB\Change $change
-	 * @return IChange|null
-	 */
-	private function mapChange(\Icewind\SMB\Change $change) {
-		$path = $this->relativePath($change->getPath());
-		if (is_null($path)) {
-			return null;
-		}
-		if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
-			$this->oldRenamePath = $path;
-			return null;
-		}
-		$type = $this->mapNotifyType($change->getCode());
-		if (is_null($type)) {
-			return null;
-		}
-		if ($type === IChange::RENAMED) {
-			if (!is_null($this->oldRenamePath)) {
-				$result = new RenameChange($type, $this->oldRenamePath, $path);
-				$this->oldRenamePath = null;
-			} else {
-				$result = null;
-			}
-		} else {
-			$result = new Change($type, $path);
-		}
-		return $result;
-	}
+    /**
+     * @param \Icewind\SMB\Change $change
+     * @return IChange|null
+     */
+    private function mapChange(\Icewind\SMB\Change $change) {
+        $path = $this->relativePath($change->getPath());
+        if (is_null($path)) {
+            return null;
+        }
+        if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
+            $this->oldRenamePath = $path;
+            return null;
+        }
+        $type = $this->mapNotifyType($change->getCode());
+        if (is_null($type)) {
+            return null;
+        }
+        if ($type === IChange::RENAMED) {
+            if (!is_null($this->oldRenamePath)) {
+                $result = new RenameChange($type, $this->oldRenamePath, $path);
+                $this->oldRenamePath = null;
+            } else {
+                $result = null;
+            }
+        } else {
+            $result = new Change($type, $path);
+        }
+        return $result;
+    }
 
-	private function mapNotifyType($smbType) {
-		switch ($smbType) {
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
-				return IChange::ADDED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
-				return IChange::REMOVED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
-				return IChange::MODIFIED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
-				return IChange::RENAMED;
-			default:
-				return null;
-		}
-	}
+    private function mapNotifyType($smbType) {
+        switch ($smbType) {
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
+                return IChange::ADDED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
+                return IChange::REMOVED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
+                return IChange::MODIFIED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
+                return IChange::RENAMED;
+            default:
+                return null;
+        }
+    }
 }