nextcloud / server

lib/public/Files/ObjectStore/IObjectStoreMultiPartUpload.php

Indentation +24 added lines, -24 removed lines

@@ -32,28 +32,28 @@
  * @since 26.0.0
  */
 interface IObjectStoreMultiPartUpload {
-	/**
-	 * @since 26.0.0
-	 */
-	public function initiateMultipartUpload(string $urn): string;
-
-	/**
-	 * @since 26.0.0
-	 */
-	public function uploadMultipartPart(string $urn, string $uploadId, int $partId, $stream, $size): Result;
-
-	/**
-	 * @since 26.0.0
-	 */
-	public function completeMultipartUpload(string $urn, string $uploadId, array $result): int;
-
-	/**
-	 * @since 26.0.0
-	 */
-	public function abortMultipartUpload(string $urn, string $uploadId): void;
-
-	/**
-	 * @since 26.0.0
-	 */
-	public function getMultipartUploads(string $urn, string $uploadId): array;
+    /**
+     * @since 26.0.0
+     */
+    public function initiateMultipartUpload(string $urn): string;
+
+    /**
+     * @since 26.0.0
+     */
+    public function uploadMultipartPart(string $urn, string $uploadId, int $partId, $stream, $size): Result;
+
+    /**
+     * @since 26.0.0
+     */
+    public function completeMultipartUpload(string $urn, string $uploadId, array $result): int;
+
+    /**
+     * @since 26.0.0
+     */
+    public function abortMultipartUpload(string $urn, string $uploadId): void;
+
+    /**
+     * @since 26.0.0
+     */
+    public function getMultipartUploads(string $urn, string $uploadId): array;
 }

lib/public/Files/Storage/IChunkedFileWrite.php

Indentation +32 added lines, -32 removed lines

@@ -32,39 +32,39 @@
  * @since 26.0.0
  */
 interface IChunkedFileWrite extends IStorage {
-	/**
-	 * @param string $targetPath Relative target path in the storage
-	 * @return string writeToken to be used with the other methods to uniquely identify the file write operation
-	 * @throws GenericFileException
-	 * @since 26.0.0
-	 */
-	public function startChunkedWrite(string $targetPath): string;
+    /**
+     * @param string $targetPath Relative target path in the storage
+     * @return string writeToken to be used with the other methods to uniquely identify the file write operation
+     * @throws GenericFileException
+     * @since 26.0.0
+     */
+    public function startChunkedWrite(string $targetPath): string;
 
-	/**
-	 * @param string $targetPath
-	 * @param string $writeToken
-	 * @param string $chunkId
-	 * @param resource $data
-	 * @param int|null $size
-	 * @throws GenericFileException
-	 * @since 26.0.0
-	 */
-	public function putChunkedWritePart(string $targetPath, string $writeToken, string $chunkId, $data, int $size = null): ?array;
+    /**
+     * @param string $targetPath
+     * @param string $writeToken
+     * @param string $chunkId
+     * @param resource $data
+     * @param int|null $size
+     * @throws GenericFileException
+     * @since 26.0.0
+     */
+    public function putChunkedWritePart(string $targetPath, string $writeToken, string $chunkId, $data, int $size = null): ?array;
 
-	/**
-	 * @param string $targetPath
-	 * @param string $writeToken
-	 * @return int
-	 * @throws GenericFileException
-	 * @since 26.0.0
-	 */
-	public function completeChunkedWrite(string $targetPath, string $writeToken): int;
+    /**
+     * @param string $targetPath
+     * @param string $writeToken
+     * @return int
+     * @throws GenericFileException
+     * @since 26.0.0
+     */
+    public function completeChunkedWrite(string $targetPath, string $writeToken): int;
 
-	/**
-	 * @param string $targetPath
-	 * @param string $writeToken
-	 * @throws GenericFileException
-	 * @since 26.0.0
-	 */
-	public function cancelChunkedWrite(string $targetPath, string $writeToken): void;
+    /**
+     * @param string $targetPath
+     * @param string $writeToken
+     * @throws GenericFileException
+     * @since 26.0.0
+     */
+    public function cancelChunkedWrite(string $targetPath, string $writeToken): void;
 }

lib/private/Files/ObjectStore/S3.php

Indentation +63 added lines, -63 removed lines

@@ -29,74 +29,74 @@
 use OCP\Files\ObjectStore\IObjectStoreMultiPartUpload;
 
 class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
-	use S3ConnectionTrait;
-	use S3ObjectTrait;
+    use S3ConnectionTrait;
+    use S3ObjectTrait;
 
-	public function __construct($parameters) {
-		$parameters['primary_storage'] = true;
-		$this->parseParams($parameters);
-	}
+    public function __construct($parameters) {
+        $parameters['primary_storage'] = true;
+        $this->parseParams($parameters);
+    }
 
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 * @since 7.0.0
-	 */
-	public function getStorageId() {
-		return $this->id;
-	}
+    /**
+     * @return string the container or bucket name where objects are stored
+     * @since 7.0.0
+     */
+    public function getStorageId() {
+        return $this->id;
+    }
 
-	public function initiateMultipartUpload(string $urn): string {
-		$upload = $this->getConnection()->createMultipartUpload([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-		]);
-		$uploadId = $upload->get('UploadId');
-		if ($uploadId === null) {
-			throw new Exception('No upload id returned');
-		}
-		return (string)$uploadId;
-	}
+    public function initiateMultipartUpload(string $urn): string {
+        $upload = $this->getConnection()->createMultipartUpload([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+        ]);
+        $uploadId = $upload->get('UploadId');
+        if ($uploadId === null) {
+            throw new Exception('No upload id returned');
+        }
+        return (string)$uploadId;
+    }
 
-	public function uploadMultipartPart(string $urn, string $uploadId, int $partId, $stream, $size): Result {
-		return $this->getConnection()->uploadPart([
-			'Body' => $stream,
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-			'ContentLength' => $size,
-			'PartNumber' => $partId,
-			'UploadId' => $uploadId,
-		]);
-	}
+    public function uploadMultipartPart(string $urn, string $uploadId, int $partId, $stream, $size): Result {
+        return $this->getConnection()->uploadPart([
+            'Body' => $stream,
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+            'ContentLength' => $size,
+            'PartNumber' => $partId,
+            'UploadId' => $uploadId,
+        ]);
+    }
 
-	public function getMultipartUploads(string $urn, string $uploadId): array {
-		$parts = $this->getConnection()->listParts([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-			'UploadId' => $uploadId,
-			'MaxParts' => 10000
-		]);
-		return $parts->get('Parts') ?? [];
-	}
+    public function getMultipartUploads(string $urn, string $uploadId): array {
+        $parts = $this->getConnection()->listParts([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+            'UploadId' => $uploadId,
+            'MaxParts' => 10000
+        ]);
+        return $parts->get('Parts') ?? [];
+    }
 
-	public function completeMultipartUpload(string $urn, string $uploadId, array $result): int {
-		$this->getConnection()->completeMultipartUpload([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-			'UploadId' => $uploadId,
-			'MultipartUpload' => ['Parts' => $result],
-		]);
-		$stat = $this->getConnection()->headObject([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-		]);
-		return (int)$stat->get('ContentLength');
-	}
+    public function completeMultipartUpload(string $urn, string $uploadId, array $result): int {
+        $this->getConnection()->completeMultipartUpload([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+            'UploadId' => $uploadId,
+            'MultipartUpload' => ['Parts' => $result],
+        ]);
+        $stat = $this->getConnection()->headObject([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+        ]);
+        return (int)$stat->get('ContentLength');
+    }
 
-	public function abortMultipartUpload($urn, $uploadId): void {
-		$this->getConnection()->abortMultipartUpload([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-			'UploadId' => $uploadId
-		]);
-	}
+    public function abortMultipartUpload($urn, $uploadId): void {
+        $this->getConnection()->abortMultipartUpload([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+            'UploadId' => $uploadId
+        ]);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 		if ($uploadId === null) {
 			throw new Exception('No upload id returned');
 		}
-		return (string)$uploadId;
+		return (string) $uploadId;
 	}
 
 	public function uploadMultipartPart(string $urn, string $uploadId, int $partId, $stream, $size): Result {
@@ -89,7 +89,7 @@ 
 			'Bucket' => $this->bucket,
 			'Key' => $urn,
 		]);
-		return (int)$stat->get('ContentLength');
+		return (int) $stat->get('ContentLength');
 	}
 
 	public function abortMultipartUpload($urn, $uploadId): void {

lib/private/Files/ObjectStore/ObjectStoreStorage.php

Indentation +649 added lines, -649 removed lines

@@ -47,656 +47,656 @@
 use OCP\Files\Storage\IStorage;
 
 class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFileWrite {
-	use CopyDirectory;
-
-	/**
-	 * @var \OCP\Files\ObjectStore\IObjectStore $objectStore
-	 */
-	protected $objectStore;
-	/**
-	 * @var string $id
-	 */
-	protected $id;
-	/**
-	 * @var \OC\User\User $user
-	 */
-	protected $user;
-
-	private $objectPrefix = 'urn:oid:';
-
-	private $logger;
-
-	/** @var bool */
-	protected $validateWrites = true;
-
-	public function __construct($params) {
-		if (isset($params['objectstore']) && $params['objectstore'] instanceof IObjectStore) {
-			$this->objectStore = $params['objectstore'];
-		} else {
-			throw new \Exception('missing IObjectStore instance');
-		}
-		if (isset($params['storageid'])) {
-			$this->id = 'object::store:' . $params['storageid'];
-		} else {
-			$this->id = 'object::store:' . $this->objectStore->getStorageId();
-		}
-		if (isset($params['objectPrefix'])) {
-			$this->objectPrefix = $params['objectPrefix'];
-		}
-		if (isset($params['validateWrites'])) {
-			$this->validateWrites = (bool)$params['validateWrites'];
-		}
-		//initialize cache with root directory in cache
-		if (!$this->is_dir('/')) {
-			$this->mkdir('/');
-		}
-
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-		if ($this->file_exists($path)) {
-			return false;
-		}
-
-		$mTime = time();
-		$data = [
-			'mimetype' => 'httpd/unix-directory',
-			'size' => 0,
-			'mtime' => $mTime,
-			'storage_mtime' => $mTime,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		];
-		if ($path === '') {
-			//create root on the fly
-			$data['etag'] = $this->getETag('');
-			$this->getCache()->put('', $data);
-			return true;
-		} else {
-			// if parent does not exist, create it
-			$parent = $this->normalizePath(dirname($path));
-			$parentType = $this->filetype($parent);
-			if ($parentType === false) {
-				if (!$this->mkdir($parent)) {
-					// something went wrong
-					return false;
-				}
-			} elseif ($parentType === 'file') {
-				// parent is a file
-				return false;
-			}
-			// finally create the new dir
-			$mTime = time(); // update mtime
-			$data['mtime'] = $mTime;
-			$data['storage_mtime'] = $mTime;
-			$data['etag'] = $this->getETag($path);
-			$this->getCache()->put($path, $data);
-			return true;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function normalizePath($path) {
-		$path = trim($path, '/');
-		//FIXME why do we sometimes get a path like 'files//username'?
-		$path = str_replace('//', '/', $path);
-
-		// dirname('/folder') returns '.' but internally (in the cache) we store the root as ''
-		if (!$path || $path === '.') {
-			$path = '';
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Object Stores use a NoopScanner because metadata is directly stored in
-	 * the file cache and cannot really scan the filesystem. The storage passed in is not used anywhere.
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
-	 * @return \OC\Files\ObjectStore\NoopScanner
-	 */
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->scanner)) {
-			$this->scanner = new NoopScanner($storage);
-		}
-		return $this->scanner;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if (!$this->is_dir($path)) {
-			return false;
-		}
-
-		if (!$this->rmObjects($path)) {
-			return false;
-		}
-
-		$this->getCache()->remove($path);
-
-		return true;
-	}
-
-	private function rmObjects($path) {
-		$children = $this->getCache()->getFolderContents($path);
-		foreach ($children as $child) {
-			if ($child['mimetype'] === 'httpd/unix-directory') {
-				if (!$this->rmObjects($child['path'])) {
-					return false;
-				}
-			} else {
-				if (!$this->unlink($child['path'])) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-		$stat = $this->stat($path);
-
-		if ($stat && isset($stat['fileid'])) {
-			if ($stat['mimetype'] === 'httpd/unix-directory') {
-				return $this->rmdir($path);
-			}
-			try {
-				$this->objectStore->deleteObject($this->getURN($stat['fileid']));
-			} catch (\Exception $ex) {
-				if ($ex->getCode() !== 404) {
-					$this->logger->logException($ex, [
-						'app' => 'objectstore',
-						'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path,
-					]);
-					return false;
-				}
-				//removing from cache is ok as it does not exist in the objectstore anyway
-			}
-			$this->getCache()->remove($path);
-			return true;
-		}
-		return false;
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-		$cacheEntry = $this->getCache()->get($path);
-		if ($cacheEntry instanceof CacheEntry) {
-			return $cacheEntry->getData();
-		} else {
-			return false;
-		}
-	}
-
-	public function getPermissions($path) {
-		$stat = $this->stat($path);
-
-		if (is_array($stat) && isset($stat['permissions'])) {
-			return $stat['permissions'];
-		}
-
-		return parent::getPermissions($path);
-	}
-
-	/**
-	 * Override this method if you need a different unique resource identifier for your object storage implementation.
-	 * The default implementations just appends the fileId to 'urn:oid:'. Make sure the URN is unique over all users.
-	 * You may need a mapping table to store your URN if it cannot be generated from the fileid.
-	 *
-	 * @param int $fileId the fileid
-	 * @return null|string the unified resource name used to identify the object
-	 */
-	public function getURN($fileId) {
-		if (is_numeric($fileId)) {
-			return $this->objectPrefix . $fileId;
-		}
-		return null;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		try {
-			$files = [];
-			$folderContents = $this->getCache()->getFolderContents($path);
-			foreach ($folderContents as $file) {
-				$files[] = $file['name'];
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			return false;
-		}
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-		$stat = $this->stat($path);
-		if ($stat) {
-			if ($stat['mimetype'] === 'httpd/unix-directory') {
-				return 'dir';
-			}
-			return 'file';
-		} else {
-			return false;
-		}
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		if (strrpos($path, '.') !== false) {
-			$ext = substr($path, strrpos($path, '.'));
-		} else {
-			$ext = '';
-		}
-
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				$stat = $this->stat($path);
-				if (is_array($stat)) {
-					$filesize = $stat['size'] ?? 0;
-					// Reading 0 sized files is a waste of time
-					if ($filesize === 0) {
-						return fopen('php://memory', $mode);
-					}
-
-					try {
-						$handle = $this->objectStore->readObject($this->getURN($stat['fileid']));
-						if ($handle === false) {
-							return false; // keep backward compatibility
-						}
-						$streamStat = fstat($handle);
-						$actualSize = $streamStat['size'] ?? -1;
-						if ($actualSize > -1 && $actualSize !== $filesize) {
-							$this->getCache()->update((int)$stat['fileid'], ['size' => $actualSize]);
-						}
-						return $handle;
-					} catch (NotFoundException $e) {
-						$this->logger->logException($e, [
-							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
-						]);
-						throw $e;
-					} catch (\Exception $ex) {
-						$this->logger->logException($ex, [
-							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
-						]);
-						return false;
-					}
-				} else {
-					return false;
-				}
-				// no break
-			case 'w':
-			case 'wb':
-			case 'w+':
-			case 'wb+':
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-					unlink($tmpFile);
-				});
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($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);
-					unlink($tmpFile);
-				});
-		}
-		return false;
-	}
-
-	public function file_exists($path) {
-		$path = $this->normalizePath($path);
-		return (bool)$this->stat($path);
-	}
-
-	public function rename($source, $target) {
-		$source = $this->normalizePath($source);
-		$target = $this->normalizePath($target);
-		$this->remove($target);
-		$this->getCache()->move($source, $target);
-		$this->touch(dirname($target));
-		return true;
-	}
-
-	public function getMimeType($path) {
-		$path = $this->normalizePath($path);
-		return parent::getMimeType($path);
-	}
-
-	public function touch($path, $mtime = null) {
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-
-		$path = $this->normalizePath($path);
-		$dirName = dirname($path);
-		$parentExists = $this->is_dir($dirName);
-		if (!$parentExists) {
-			return false;
-		}
-
-		$stat = $this->stat($path);
-		if (is_array($stat)) {
-			// update existing mtime in db
-			$stat['mtime'] = $mtime;
-			$this->getCache()->update($stat['fileid'], $stat);
-		} else {
-			try {
-				//create a empty file, need to have at least on char to make it
-				// work with all object storage implementations
-				$this->file_put_contents($path, ' ');
-				$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-				$stat = [
-					'etag' => $this->getETag($path),
-					'mimetype' => $mimeType,
-					'size' => 0,
-					'mtime' => $mtime,
-					'storage_mtime' => $mtime,
-					'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
-				];
-				$this->getCache()->put($path, $stat);
-			} catch (\Exception $ex) {
-				$this->logger->logException($ex, [
-					'app' => 'objectstore',
-					'message' => 'Could not create object for ' . $path,
-				]);
-				throw $ex;
-			}
-		}
-		return true;
-	}
-
-	public function writeBack($tmpFile, $path) {
-		$size = filesize($tmpFile);
-		$this->writeStream($path, fopen($tmpFile, 'r'), $size);
-	}
-
-	/**
-	 * external changes are not supported, exclusive access to the object storage is assumed
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return false
-	 */
-	public function hasUpdated($path, $time) {
-		return false;
-	}
-
-	public function needsPartFile() {
-		return false;
-	}
-
-	public function file_put_contents($path, $data) {
-		$handle = $this->fopen($path, 'w+');
-		$result = fwrite($handle, $data);
-		fclose($handle);
-		return $result;
-	}
-
-	public function writeStream(string $path, $stream, int $size = null): int {
-		$stat = $this->stat($path);
-		if (empty($stat)) {
-			// create new file
-			$stat = [
-				'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
-			];
-		}
-		// update stat with new data
-		$mTime = time();
-		$stat['size'] = (int)$size;
-		$stat['mtime'] = $mTime;
-		$stat['storage_mtime'] = $mTime;
-
-		$mimetypeDetector = \OC::$server->getMimeTypeDetector();
-		$mimetype = $mimetypeDetector->detectPath($path);
-
-		$stat['mimetype'] = $mimetype;
-		$stat['etag'] = $this->getETag($path);
-		$stat['checksum'] = '';
-
-		$exists = $this->getCache()->inCache($path);
-		$uploadPath = $exists ? $path : $path . '.part';
-
-		if ($exists) {
-			$fileId = $stat['fileid'];
-		} else {
-			$fileId = $this->getCache()->put($uploadPath, $stat);
-		}
-
-		$urn = $this->getURN($fileId);
-		try {
-			//upload to object storage
-			if ($size === null) {
-				$countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
-					$this->getCache()->update($fileId, [
-						'size' => $writtenSize,
-					]);
-					$size = $writtenSize;
-				});
-				$this->objectStore->writeObject($urn, $countStream, $mimetype);
-				if (is_resource($countStream)) {
-					fclose($countStream);
-				}
-				$stat['size'] = $size;
-			} else {
-				$this->objectStore->writeObject($urn, $stream, $mimetype);
-				if (is_resource($stream)) {
-					fclose($stream);
-				}
-			}
-		} catch (\Exception $ex) {
-			if (!$exists) {
-				/*
+    use CopyDirectory;
+
+    /**
+     * @var \OCP\Files\ObjectStore\IObjectStore $objectStore
+     */
+    protected $objectStore;
+    /**
+     * @var string $id
+     */
+    protected $id;
+    /**
+     * @var \OC\User\User $user
+     */
+    protected $user;
+
+    private $objectPrefix = 'urn:oid:';
+
+    private $logger;
+
+    /** @var bool */
+    protected $validateWrites = true;
+
+    public function __construct($params) {
+        if (isset($params['objectstore']) && $params['objectstore'] instanceof IObjectStore) {
+            $this->objectStore = $params['objectstore'];
+        } else {
+            throw new \Exception('missing IObjectStore instance');
+        }
+        if (isset($params['storageid'])) {
+            $this->id = 'object::store:' . $params['storageid'];
+        } else {
+            $this->id = 'object::store:' . $this->objectStore->getStorageId();
+        }
+        if (isset($params['objectPrefix'])) {
+            $this->objectPrefix = $params['objectPrefix'];
+        }
+        if (isset($params['validateWrites'])) {
+            $this->validateWrites = (bool)$params['validateWrites'];
+        }
+        //initialize cache with root directory in cache
+        if (!$this->is_dir('/')) {
+            $this->mkdir('/');
+        }
+
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+        if ($this->file_exists($path)) {
+            return false;
+        }
+
+        $mTime = time();
+        $data = [
+            'mimetype' => 'httpd/unix-directory',
+            'size' => 0,
+            'mtime' => $mTime,
+            'storage_mtime' => $mTime,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ];
+        if ($path === '') {
+            //create root on the fly
+            $data['etag'] = $this->getETag('');
+            $this->getCache()->put('', $data);
+            return true;
+        } else {
+            // if parent does not exist, create it
+            $parent = $this->normalizePath(dirname($path));
+            $parentType = $this->filetype($parent);
+            if ($parentType === false) {
+                if (!$this->mkdir($parent)) {
+                    // something went wrong
+                    return false;
+                }
+            } elseif ($parentType === 'file') {
+                // parent is a file
+                return false;
+            }
+            // finally create the new dir
+            $mTime = time(); // update mtime
+            $data['mtime'] = $mTime;
+            $data['storage_mtime'] = $mTime;
+            $data['etag'] = $this->getETag($path);
+            $this->getCache()->put($path, $data);
+            return true;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function normalizePath($path) {
+        $path = trim($path, '/');
+        //FIXME why do we sometimes get a path like 'files//username'?
+        $path = str_replace('//', '/', $path);
+
+        // dirname('/folder') returns '.' but internally (in the cache) we store the root as ''
+        if (!$path || $path === '.') {
+            $path = '';
+        }
+
+        return $path;
+    }
+
+    /**
+     * Object Stores use a NoopScanner because metadata is directly stored in
+     * the file cache and cannot really scan the filesystem. The storage passed in is not used anywhere.
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
+     * @return \OC\Files\ObjectStore\NoopScanner
+     */
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->scanner)) {
+            $this->scanner = new NoopScanner($storage);
+        }
+        return $this->scanner;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if (!$this->is_dir($path)) {
+            return false;
+        }
+
+        if (!$this->rmObjects($path)) {
+            return false;
+        }
+
+        $this->getCache()->remove($path);
+
+        return true;
+    }
+
+    private function rmObjects($path) {
+        $children = $this->getCache()->getFolderContents($path);
+        foreach ($children as $child) {
+            if ($child['mimetype'] === 'httpd/unix-directory') {
+                if (!$this->rmObjects($child['path'])) {
+                    return false;
+                }
+            } else {
+                if (!$this->unlink($child['path'])) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+        $stat = $this->stat($path);
+
+        if ($stat && isset($stat['fileid'])) {
+            if ($stat['mimetype'] === 'httpd/unix-directory') {
+                return $this->rmdir($path);
+            }
+            try {
+                $this->objectStore->deleteObject($this->getURN($stat['fileid']));
+            } catch (\Exception $ex) {
+                if ($ex->getCode() !== 404) {
+                    $this->logger->logException($ex, [
+                        'app' => 'objectstore',
+                        'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path,
+                    ]);
+                    return false;
+                }
+                //removing from cache is ok as it does not exist in the objectstore anyway
+            }
+            $this->getCache()->remove($path);
+            return true;
+        }
+        return false;
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+        $cacheEntry = $this->getCache()->get($path);
+        if ($cacheEntry instanceof CacheEntry) {
+            return $cacheEntry->getData();
+        } else {
+            return false;
+        }
+    }
+
+    public function getPermissions($path) {
+        $stat = $this->stat($path);
+
+        if (is_array($stat) && isset($stat['permissions'])) {
+            return $stat['permissions'];
+        }
+
+        return parent::getPermissions($path);
+    }
+
+    /**
+     * Override this method if you need a different unique resource identifier for your object storage implementation.
+     * The default implementations just appends the fileId to 'urn:oid:'. Make sure the URN is unique over all users.
+     * You may need a mapping table to store your URN if it cannot be generated from the fileid.
+     *
+     * @param int $fileId the fileid
+     * @return null|string the unified resource name used to identify the object
+     */
+    public function getURN($fileId) {
+        if (is_numeric($fileId)) {
+            return $this->objectPrefix . $fileId;
+        }
+        return null;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        try {
+            $files = [];
+            $folderContents = $this->getCache()->getFolderContents($path);
+            foreach ($folderContents as $file) {
+                $files[] = $file['name'];
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            return false;
+        }
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+        $stat = $this->stat($path);
+        if ($stat) {
+            if ($stat['mimetype'] === 'httpd/unix-directory') {
+                return 'dir';
+            }
+            return 'file';
+        } else {
+            return false;
+        }
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        if (strrpos($path, '.') !== false) {
+            $ext = substr($path, strrpos($path, '.'));
+        } else {
+            $ext = '';
+        }
+
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                $stat = $this->stat($path);
+                if (is_array($stat)) {
+                    $filesize = $stat['size'] ?? 0;
+                    // Reading 0 sized files is a waste of time
+                    if ($filesize === 0) {
+                        return fopen('php://memory', $mode);
+                    }
+
+                    try {
+                        $handle = $this->objectStore->readObject($this->getURN($stat['fileid']));
+                        if ($handle === false) {
+                            return false; // keep backward compatibility
+                        }
+                        $streamStat = fstat($handle);
+                        $actualSize = $streamStat['size'] ?? -1;
+                        if ($actualSize > -1 && $actualSize !== $filesize) {
+                            $this->getCache()->update((int)$stat['fileid'], ['size' => $actualSize]);
+                        }
+                        return $handle;
+                    } catch (NotFoundException $e) {
+                        $this->logger->logException($e, [
+                            'app' => 'objectstore',
+                            'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+                        ]);
+                        throw $e;
+                    } catch (\Exception $ex) {
+                        $this->logger->logException($ex, [
+                            'app' => 'objectstore',
+                            'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+                        ]);
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+                // no break
+            case 'w':
+            case 'wb':
+            case 'w+':
+            case 'wb+':
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                    unlink($tmpFile);
+                });
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($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);
+                    unlink($tmpFile);
+                });
+        }
+        return false;
+    }
+
+    public function file_exists($path) {
+        $path = $this->normalizePath($path);
+        return (bool)$this->stat($path);
+    }
+
+    public function rename($source, $target) {
+        $source = $this->normalizePath($source);
+        $target = $this->normalizePath($target);
+        $this->remove($target);
+        $this->getCache()->move($source, $target);
+        $this->touch(dirname($target));
+        return true;
+    }
+
+    public function getMimeType($path) {
+        $path = $this->normalizePath($path);
+        return parent::getMimeType($path);
+    }
+
+    public function touch($path, $mtime = null) {
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+
+        $path = $this->normalizePath($path);
+        $dirName = dirname($path);
+        $parentExists = $this->is_dir($dirName);
+        if (!$parentExists) {
+            return false;
+        }
+
+        $stat = $this->stat($path);
+        if (is_array($stat)) {
+            // update existing mtime in db
+            $stat['mtime'] = $mtime;
+            $this->getCache()->update($stat['fileid'], $stat);
+        } else {
+            try {
+                //create a empty file, need to have at least on char to make it
+                // work with all object storage implementations
+                $this->file_put_contents($path, ' ');
+                $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+                $stat = [
+                    'etag' => $this->getETag($path),
+                    'mimetype' => $mimeType,
+                    'size' => 0,
+                    'mtime' => $mtime,
+                    'storage_mtime' => $mtime,
+                    'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
+                ];
+                $this->getCache()->put($path, $stat);
+            } catch (\Exception $ex) {
+                $this->logger->logException($ex, [
+                    'app' => 'objectstore',
+                    'message' => 'Could not create object for ' . $path,
+                ]);
+                throw $ex;
+            }
+        }
+        return true;
+    }
+
+    public function writeBack($tmpFile, $path) {
+        $size = filesize($tmpFile);
+        $this->writeStream($path, fopen($tmpFile, 'r'), $size);
+    }
+
+    /**
+     * external changes are not supported, exclusive access to the object storage is assumed
+     *
+     * @param string $path
+     * @param int $time
+     * @return false
+     */
+    public function hasUpdated($path, $time) {
+        return false;
+    }
+
+    public function needsPartFile() {
+        return false;
+    }
+
+    public function file_put_contents($path, $data) {
+        $handle = $this->fopen($path, 'w+');
+        $result = fwrite($handle, $data);
+        fclose($handle);
+        return $result;
+    }
+
+    public function writeStream(string $path, $stream, int $size = null): int {
+        $stat = $this->stat($path);
+        if (empty($stat)) {
+            // create new file
+            $stat = [
+                'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
+            ];
+        }
+        // update stat with new data
+        $mTime = time();
+        $stat['size'] = (int)$size;
+        $stat['mtime'] = $mTime;
+        $stat['storage_mtime'] = $mTime;
+
+        $mimetypeDetector = \OC::$server->getMimeTypeDetector();
+        $mimetype = $mimetypeDetector->detectPath($path);
+
+        $stat['mimetype'] = $mimetype;
+        $stat['etag'] = $this->getETag($path);
+        $stat['checksum'] = '';
+
+        $exists = $this->getCache()->inCache($path);
+        $uploadPath = $exists ? $path : $path . '.part';
+
+        if ($exists) {
+            $fileId = $stat['fileid'];
+        } else {
+            $fileId = $this->getCache()->put($uploadPath, $stat);
+        }
+
+        $urn = $this->getURN($fileId);
+        try {
+            //upload to object storage
+            if ($size === null) {
+                $countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
+                    $this->getCache()->update($fileId, [
+                        'size' => $writtenSize,
+                    ]);
+                    $size = $writtenSize;
+                });
+                $this->objectStore->writeObject($urn, $countStream, $mimetype);
+                if (is_resource($countStream)) {
+                    fclose($countStream);
+                }
+                $stat['size'] = $size;
+            } else {
+                $this->objectStore->writeObject($urn, $stream, $mimetype);
+                if (is_resource($stream)) {
+                    fclose($stream);
+                }
+            }
+        } catch (\Exception $ex) {
+            if (!$exists) {
+                /*
 				 * Only remove the entry if we are dealing with a new file.
 				 * Else people lose access to existing files
 				 */
-				$this->getCache()->remove($uploadPath);
-				$this->logger->logException($ex, [
-					'app' => 'objectstore',
-					'message' => 'Could not create object ' . $urn . ' for ' . $path,
-				]);
-			} else {
-				$this->logger->logException($ex, [
-					'app' => 'objectstore',
-					'message' => 'Could not update object ' . $urn . ' for ' . $path,
-				]);
-			}
-			throw $ex; // make this bubble up
-		}
-
-		if ($exists) {
-			$this->getCache()->update($fileId, $stat);
-		} else {
-			if (!$this->validateWrites || $this->objectStore->objectExists($urn)) {
-				$this->getCache()->move($uploadPath, $path);
-			} else {
-				$this->getCache()->remove($uploadPath);
-				throw new \Exception("Object not found after writing (urn: $urn, path: $path)", 404);
-			}
-		}
-
-		return $size;
-	}
-
-	public function getObjectStore(): IObjectStore {
-		return $this->objectStore;
-	}
-
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
-		if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
-			/** @var ObjectStoreStorage $sourceStorage */
-			if ($sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
-				/** @var CacheEntry $sourceEntry */
-				$sourceEntry = $sourceStorage->getCache()->get($sourceInternalPath);
-				$sourceEntryData = $sourceEntry->getData();
-				// $sourceEntry['permissions'] here is the permissions from the jailed storage for the current
-				// user. Instead we use $sourceEntryData['scan_permissions'] that are the permissions from the
-				// unjailed storage.
-				if (is_array($sourceEntryData) && array_key_exists('scan_permissions', $sourceEntryData)) {
-					$sourceEntry['permissions'] = $sourceEntryData['scan_permissions'];
-				}
-				$this->copyInner($sourceEntry, $targetInternalPath);
-				return true;
-			}
-		}
-
-		return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-	}
-
-	public function copy($source, $target) {
-		$source = $this->normalizePath($source);
-		$target = $this->normalizePath($target);
-
-		$cache = $this->getCache();
-		$sourceEntry = $cache->get($source);
-		if (!$sourceEntry) {
-			throw new NotFoundException('Source object not found');
-		}
-
-		$this->copyInner($sourceEntry, $target);
-
-		return true;
-	}
-
-	private function copyInner(ICacheEntry $sourceEntry, string $to) {
-		$cache = $this->getCache();
-
-		if ($sourceEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			if ($cache->inCache($to)) {
-				$cache->remove($to);
-			}
-			$this->mkdir($to);
-
-			foreach ($cache->getFolderContentsById($sourceEntry->getId()) as $child) {
-				$this->copyInner($child, $to . '/' . $child->getName());
-			}
-		} else {
-			$this->copyFile($sourceEntry, $to);
-		}
-	}
-
-	private function copyFile(ICacheEntry $sourceEntry, string $to) {
-		$cache = $this->getCache();
-
-		$sourceUrn = $this->getURN($sourceEntry->getId());
-
-		if (!$cache instanceof Cache) {
-			throw new \Exception("Invalid source cache for object store copy");
-		}
-
-		$targetId = $cache->copyFromCache($cache, $sourceEntry, $to);
-
-		$targetUrn = $this->getURN($targetId);
-
-		try {
-			$this->objectStore->copyObject($sourceUrn, $targetUrn);
-		} catch (\Exception $e) {
-			$cache->remove($to);
-
-			throw $e;
-		}
-	}
-
-	public function startChunkedWrite(string $targetPath): string {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-		return $this->objectStore->initiateMultipartUpload($urn);
-	}
-
-	/**
-	 *
-	 * @throws GenericFileException
-	 */
-	public function putChunkedWritePart(string $targetPath, string $writeToken, string $chunkId, $data, $size = null): ?array {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-
-		$result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int)$chunkId, $data, $size);
-
-		$parts[$chunkId] = [
-			'PartNumber' => $chunkId,
-			'ETag' => trim($result->get('ETag'), '"')
-		];
-		return $parts[$chunkId];
-	}
-
-	public function completeChunkedWrite(string $targetPath, string $writeToken): int {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-		$parts = $this->objectStore->getMultipartUploads($urn, $writeToken);
-		$sortedParts = array_values($parts);
-		sort($sortedParts);
-		try {
-			$size = $this->objectStore->completeMultipartUpload($urn, $writeToken, $sortedParts);
-			$stat = $this->stat($targetPath);
-			$mtime = time();
-			if (is_array($stat)) {
-				$stat['size'] = $size;
-				$stat['mtime'] = $mtime;
-				$stat['mimetype'] = $this->getMimeType($targetPath);
-				$this->getCache()->update($stat['fileid'], $stat);
-			}
-		} catch (S3MultipartUploadException | S3Exception $e) {
-			$this->objectStore->abortMultipartUpload($urn, $writeToken);
-			$this->logger->logException($e, [
-				'app' => 'objectstore',
-				'message' => 'Could not compete multipart upload ' . $urn. ' with uploadId ' . $writeToken
-			]);
-			throw new GenericFileException('Could not write chunked file');
-		}
-		return $size;
-	}
-
-	public function cancelChunkedWrite(string $targetPath, string $writeToken): void {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-		$this->objectStore->abortMultipartUpload($urn, $writeToken);
-	}
+                $this->getCache()->remove($uploadPath);
+                $this->logger->logException($ex, [
+                    'app' => 'objectstore',
+                    'message' => 'Could not create object ' . $urn . ' for ' . $path,
+                ]);
+            } else {
+                $this->logger->logException($ex, [
+                    'app' => 'objectstore',
+                    'message' => 'Could not update object ' . $urn . ' for ' . $path,
+                ]);
+            }
+            throw $ex; // make this bubble up
+        }
+
+        if ($exists) {
+            $this->getCache()->update($fileId, $stat);
+        } else {
+            if (!$this->validateWrites || $this->objectStore->objectExists($urn)) {
+                $this->getCache()->move($uploadPath, $path);
+            } else {
+                $this->getCache()->remove($uploadPath);
+                throw new \Exception("Object not found after writing (urn: $urn, path: $path)", 404);
+            }
+        }
+
+        return $size;
+    }
+
+    public function getObjectStore(): IObjectStore {
+        return $this->objectStore;
+    }
+
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+        if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
+            /** @var ObjectStoreStorage $sourceStorage */
+            if ($sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
+                /** @var CacheEntry $sourceEntry */
+                $sourceEntry = $sourceStorage->getCache()->get($sourceInternalPath);
+                $sourceEntryData = $sourceEntry->getData();
+                // $sourceEntry['permissions'] here is the permissions from the jailed storage for the current
+                // user. Instead we use $sourceEntryData['scan_permissions'] that are the permissions from the
+                // unjailed storage.
+                if (is_array($sourceEntryData) && array_key_exists('scan_permissions', $sourceEntryData)) {
+                    $sourceEntry['permissions'] = $sourceEntryData['scan_permissions'];
+                }
+                $this->copyInner($sourceEntry, $targetInternalPath);
+                return true;
+            }
+        }
+
+        return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+    }
+
+    public function copy($source, $target) {
+        $source = $this->normalizePath($source);
+        $target = $this->normalizePath($target);
+
+        $cache = $this->getCache();
+        $sourceEntry = $cache->get($source);
+        if (!$sourceEntry) {
+            throw new NotFoundException('Source object not found');
+        }
+
+        $this->copyInner($sourceEntry, $target);
+
+        return true;
+    }
+
+    private function copyInner(ICacheEntry $sourceEntry, string $to) {
+        $cache = $this->getCache();
+
+        if ($sourceEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
+            if ($cache->inCache($to)) {
+                $cache->remove($to);
+            }
+            $this->mkdir($to);
+
+            foreach ($cache->getFolderContentsById($sourceEntry->getId()) as $child) {
+                $this->copyInner($child, $to . '/' . $child->getName());
+            }
+        } else {
+            $this->copyFile($sourceEntry, $to);
+        }
+    }
+
+    private function copyFile(ICacheEntry $sourceEntry, string $to) {
+        $cache = $this->getCache();
+
+        $sourceUrn = $this->getURN($sourceEntry->getId());
+
+        if (!$cache instanceof Cache) {
+            throw new \Exception("Invalid source cache for object store copy");
+        }
+
+        $targetId = $cache->copyFromCache($cache, $sourceEntry, $to);
+
+        $targetUrn = $this->getURN($targetId);
+
+        try {
+            $this->objectStore->copyObject($sourceUrn, $targetUrn);
+        } catch (\Exception $e) {
+            $cache->remove($to);
+
+            throw $e;
+        }
+    }
+
+    public function startChunkedWrite(string $targetPath): string {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+        return $this->objectStore->initiateMultipartUpload($urn);
+    }
+
+    /**
+     *
+     * @throws GenericFileException
+     */
+    public function putChunkedWritePart(string $targetPath, string $writeToken, string $chunkId, $data, $size = null): ?array {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+
+        $result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int)$chunkId, $data, $size);
+
+        $parts[$chunkId] = [
+            'PartNumber' => $chunkId,
+            'ETag' => trim($result->get('ETag'), '"')
+        ];
+        return $parts[$chunkId];
+    }
+
+    public function completeChunkedWrite(string $targetPath, string $writeToken): int {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+        $parts = $this->objectStore->getMultipartUploads($urn, $writeToken);
+        $sortedParts = array_values($parts);
+        sort($sortedParts);
+        try {
+            $size = $this->objectStore->completeMultipartUpload($urn, $writeToken, $sortedParts);
+            $stat = $this->stat($targetPath);
+            $mtime = time();
+            if (is_array($stat)) {
+                $stat['size'] = $size;
+                $stat['mtime'] = $mtime;
+                $stat['mimetype'] = $this->getMimeType($targetPath);
+                $this->getCache()->update($stat['fileid'], $stat);
+            }
+        } catch (S3MultipartUploadException | S3Exception $e) {
+            $this->objectStore->abortMultipartUpload($urn, $writeToken);
+            $this->logger->logException($e, [
+                'app' => 'objectstore',
+                'message' => 'Could not compete multipart upload ' . $urn. ' with uploadId ' . $writeToken
+            ]);
+            throw new GenericFileException('Could not write chunked file');
+        }
+        return $size;
+    }
+
+    public function cancelChunkedWrite(string $targetPath, string $writeToken): void {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+        $this->objectStore->abortMultipartUpload($urn, $writeToken);
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -76,15 +76,15 @@ 
 			throw new \Exception('missing IObjectStore instance');
 		}
 		if (isset($params['storageid'])) {
-			$this->id = 'object::store:' . $params['storageid'];
+			$this->id = 'object::store:'.$params['storageid'];
 		} else {
-			$this->id = 'object::store:' . $this->objectStore->getStorageId();
+			$this->id = 'object::store:'.$this->objectStore->getStorageId();
 		}
 		if (isset($params['objectPrefix'])) {
 			$this->objectPrefix = $params['objectPrefix'];
 		}
 		if (isset($params['validateWrites'])) {
-			$this->validateWrites = (bool)$params['validateWrites'];
+			$this->validateWrites = (bool) $params['validateWrites'];
 		}
 		//initialize cache with root directory in cache
 		if (!$this->is_dir('/')) {
@@ -222,7 +222,7 @@ 
 				if ($ex->getCode() !== 404) {
 					$this->logger->logException($ex, [
 						'app' => 'objectstore',
-						'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path,
+						'message' => 'Could not delete object '.$this->getURN($stat['fileid']).' for '.$path,
 					]);
 					return false;
 				}
@@ -264,7 +264,7 @@ 
 	 */
 	public function getURN($fileId) {
 		if (is_numeric($fileId)) {
-			return $this->objectPrefix . $fileId;
+			return $this->objectPrefix.$fileId;
 		}
 		return null;
 	}
@@ -327,19 +327,19 @@ 
 						$streamStat = fstat($handle);
 						$actualSize = $streamStat['size'] ?? -1;
 						if ($actualSize > -1 && $actualSize !== $filesize) {
-							$this->getCache()->update((int)$stat['fileid'], ['size' => $actualSize]);
+							$this->getCache()->update((int) $stat['fileid'], ['size' => $actualSize]);
 						}
 						return $handle;
 					} catch (NotFoundException $e) {
 						$this->logger->logException($e, [
 							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+							'message' => 'Could not get object '.$this->getURN($stat['fileid']).' for file '.$path,
 						]);
 						throw $e;
 					} catch (\Exception $ex) {
 						$this->logger->logException($ex, [
 							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+							'message' => 'Could not get object '.$this->getURN($stat['fileid']).' for file '.$path,
 						]);
 						return false;
 					}
@@ -353,7 +353,7 @@ 
 			case 'wb+':
 				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 					unlink($tmpFile);
 				});
@@ -371,7 +371,7 @@ 
 					file_put_contents($tmpFile, $source);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 					unlink($tmpFile);
 				});
@@ -381,7 +381,7 @@ 
 
 	public function file_exists($path) {
 		$path = $this->normalizePath($path);
-		return (bool)$this->stat($path);
+		return (bool) $this->stat($path);
 	}
 
 	public function rename($source, $target) {
@@ -433,7 +433,7 @@ 
 			} catch (\Exception $ex) {
 				$this->logger->logException($ex, [
 					'app' => 'objectstore',
-					'message' => 'Could not create object for ' . $path,
+					'message' => 'Could not create object for '.$path,
 				]);
 				throw $ex;
 			}
@@ -478,7 +478,7 @@ 
 		}
 		// update stat with new data
 		$mTime = time();
-		$stat['size'] = (int)$size;
+		$stat['size'] = (int) $size;
 		$stat['mtime'] = $mTime;
 		$stat['storage_mtime'] = $mTime;
 
@@ -490,7 +490,7 @@ 
 		$stat['checksum'] = '';
 
 		$exists = $this->getCache()->inCache($path);
-		$uploadPath = $exists ? $path : $path . '.part';
+		$uploadPath = $exists ? $path : $path.'.part';
 
 		if ($exists) {
 			$fileId = $stat['fileid'];
@@ -502,7 +502,7 @@ 
 		try {
 			//upload to object storage
 			if ($size === null) {
-				$countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
+				$countStream = CountWrapper::wrap($stream, function($writtenSize) use ($fileId, &$size) {
 					$this->getCache()->update($fileId, [
 						'size' => $writtenSize,
 					]);
@@ -528,12 +528,12 @@ 
 				$this->getCache()->remove($uploadPath);
 				$this->logger->logException($ex, [
 					'app' => 'objectstore',
-					'message' => 'Could not create object ' . $urn . ' for ' . $path,
+					'message' => 'Could not create object '.$urn.' for '.$path,
 				]);
 			} else {
 				$this->logger->logException($ex, [
 					'app' => 'objectstore',
-					'message' => 'Could not update object ' . $urn . ' for ' . $path,
+					'message' => 'Could not update object '.$urn.' for '.$path,
 				]);
 			}
 			throw $ex; // make this bubble up
@@ -603,7 +603,7 @@ 
 			$this->mkdir($to);
 
 			foreach ($cache->getFolderContentsById($sourceEntry->getId()) as $child) {
-				$this->copyInner($child, $to . '/' . $child->getName());
+				$this->copyInner($child, $to.'/'.$child->getName());
 			}
 		} else {
 			$this->copyFile($sourceEntry, $to);
@@ -652,7 +652,7 @@ 
 		$cacheEntry = $this->getCache()->get($targetPath);
 		$urn = $this->getURN($cacheEntry->getId());
 
-		$result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int)$chunkId, $data, $size);
+		$result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int) $chunkId, $data, $size);
 
 		$parts[$chunkId] = [
 			'PartNumber' => $chunkId,
@@ -684,7 +684,7 @@ 
 			$this->objectStore->abortMultipartUpload($urn, $writeToken);
 			$this->logger->logException($e, [
 				'app' => 'objectstore',
-				'message' => 'Could not compete multipart upload ' . $urn. ' with uploadId ' . $writeToken
+				'message' => 'Could not compete multipart upload '.$urn.' with uploadId '.$writeToken
 			]);
 			throw new GenericFileException('Could not write chunked file');
 		}

apps/dav/lib/Connector/Sabre/Node.php

Indentation +368 added lines, -368 removed lines

@@ -48,377 +48,377 @@
 use OCP\Share\IManager;
 
 abstract class Node implements \Sabre\DAV\INode {
-	/**
-	 * @var View
-	 */
-	protected $fileView;
-
-	/**
-	 * The path to the current node
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * node properties cache
-	 *
-	 * @var array
-	 */
-	protected $property_cache = null;
-
-	protected FileInfo $info;
-
-	/**
-	 * @var IManager
-	 */
-	protected $shareManager;
-
-	protected \OCP\Files\Node $node;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 */
-	public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
-		$this->fileView = $view;
-		$this->path = $this->fileView->getRelativePath($info->getPath());
-		$this->info = $info;
-		if ($shareManager) {
-			$this->shareManager = $shareManager;
-		} else {
-			$this->shareManager = \OC::$server->getShareManager();
-		}
-		if ($info instanceof Folder || $info instanceof File) {
-			$this->node = $info;
-		} else {
-			$root = \OC::$server->get(IRootFolder::class);
-			if ($info->getType() === FileInfo::TYPE_FOLDER) {
-				$this->node = new Folder($root, $view, $this->path, $info);
-			} else {
-				$this->node = new File($root, $view, $this->path, $info);
-			}
-		}
-	}
-
-	protected function refreshInfo(): void {
-		$info = $this->fileView->getFileInfo($this->path);
-		if ($info === false) {
-			throw new \Sabre\DAV\Exception('Failed to get fileinfo for '. $this->path);
-		}
-		$this->info = $info;
-		$root = \OC::$server->get(IRootFolder::class);
-		if ($this->info->getType() === FileInfo::TYPE_FOLDER) {
-			$this->node = new Folder($root, $this->fileView, $this->path, $this->info);
-		} else {
-			$this->node = new File($root, $this->fileView, $this->path, $this->info);
-		}
-	}
-
-	/**
-	 *  Returns the name of the node
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->info->getName();
-	}
-
-	/**
-	 * Returns the full path
-	 *
-	 * @return string
-	 */
-	public function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function setName($name) {
-		// rename is only allowed if the update privilege is granted
-		if (!($this->info->isUpdateable() || ($this->info->getMountPoint() instanceof MoveableMount && $this->info->getInternalPath() === ''))) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-
-		[$parentPath,] = \Sabre\Uri\split($this->path);
-		[, $newName] = \Sabre\Uri\split($name);
-
-		// verify path of the target
-		$this->verifyPath();
-
-		$newPath = $parentPath . '/' . $newName;
-
-		if (!$this->fileView->rename($this->path, $newPath)) {
-			throw new \Sabre\DAV\Exception('Failed to rename '. $this->path . ' to ' . $newPath);
-		}
-
-		$this->path = $newPath;
-
-		$this->refreshInfo();
-	}
-
-	public function setPropertyCache($property_cache) {
-		$this->property_cache = $property_cache;
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int timestamp as integer
-	 */
-	public function getLastModified() {
-		$timestamp = $this->info->getMtime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
-	}
-
-	/**
-	 *  sets the last modification time of the file (mtime) to the value given
-	 *  in the second parameter or to now if the second param is empty.
-	 *  Even if the modification time is set to a custom value the access time is set to now.
-	 */
-	public function touch($mtime) {
-		$mtime = $this->sanitizeMtime($mtime);
-		$this->fileView->touch($this->path, $mtime);
-		$this->refreshInfo();
-	}
-
-	/**
-	 * Returns the ETag for a file
-	 *
-	 * An ETag is a unique identifier representing the current version of the
-	 * file. If the file changes, the ETag MUST change.  The ETag is an
-	 * arbitrary string, but MUST be surrounded by double-quotes.
-	 *
-	 * Return null if the ETag can not effectively be determined
-	 *
-	 * @return string
-	 */
-	public function getETag() {
-		return '"' . $this->info->getEtag() . '"';
-	}
-
-	/**
-	 * Sets the ETag
-	 *
-	 * @param string $etag
-	 *
-	 * @return int file id of updated file or -1 on failure
-	 */
-	public function setETag($etag) {
-		return $this->fileView->putFileInfo($this->path, ['etag' => $etag]);
-	}
-
-	public function setCreationTime(int $time) {
-		return $this->fileView->putFileInfo($this->path, ['creation_time' => $time]);
-	}
-
-	public function setUploadTime(int $time) {
-		return $this->fileView->putFileInfo($this->path, ['upload_time' => $time]);
-	}
-
-	/**
-	 * Returns the size of the node, in bytes
-	 *
-	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
-	 * @return int|float
-	 */
-	public function getSize(): int|float {
-		return $this->info->getSize();
-	}
-
-	/**
-	 * Returns the cache's file id
-	 *
-	 * @return int
-	 */
-	public function getId() {
-		return $this->info->getId();
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getFileId() {
-		if ($id = $this->info->getId()) {
-			return DavUtil::getDavFileId($id);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return integer
-	 */
-	public function getInternalFileId() {
-		return $this->info->getId();
-	}
-
-	public function getInternalPath(): string {
-		return $this->info->getInternalPath();
-	}
-
-	/**
-	 * @param string $user
-	 * @return int
-	 */
-	public function getSharePermissions($user) {
-		// check of we access a federated share
-		if ($user !== null) {
-			try {
-				$share = $this->shareManager->getShareByToken($user);
-				return $share->getPermissions();
-			} catch (ShareNotFound $e) {
-				// ignore
-			}
-		}
-
-		try {
-			$storage = $this->info->getStorage();
-		} catch (StorageNotAvailableException $e) {
-			$storage = null;
-		}
-
-		if ($storage && $storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			/** @var \OCA\Files_Sharing\SharedStorage $storage */
-			$permissions = (int)$storage->getShare()->getPermissions();
-		} else {
-			$permissions = $this->info->getPermissions();
-		}
-
-		/*
+    /**
+     * @var View
+     */
+    protected $fileView;
+
+    /**
+     * The path to the current node
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * node properties cache
+     *
+     * @var array
+     */
+    protected $property_cache = null;
+
+    protected FileInfo $info;
+
+    /**
+     * @var IManager
+     */
+    protected $shareManager;
+
+    protected \OCP\Files\Node $node;
+
+    /**
+     * Sets up the node, expects a full path name
+     */
+    public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
+        $this->fileView = $view;
+        $this->path = $this->fileView->getRelativePath($info->getPath());
+        $this->info = $info;
+        if ($shareManager) {
+            $this->shareManager = $shareManager;
+        } else {
+            $this->shareManager = \OC::$server->getShareManager();
+        }
+        if ($info instanceof Folder || $info instanceof File) {
+            $this->node = $info;
+        } else {
+            $root = \OC::$server->get(IRootFolder::class);
+            if ($info->getType() === FileInfo::TYPE_FOLDER) {
+                $this->node = new Folder($root, $view, $this->path, $info);
+            } else {
+                $this->node = new File($root, $view, $this->path, $info);
+            }
+        }
+    }
+
+    protected function refreshInfo(): void {
+        $info = $this->fileView->getFileInfo($this->path);
+        if ($info === false) {
+            throw new \Sabre\DAV\Exception('Failed to get fileinfo for '. $this->path);
+        }
+        $this->info = $info;
+        $root = \OC::$server->get(IRootFolder::class);
+        if ($this->info->getType() === FileInfo::TYPE_FOLDER) {
+            $this->node = new Folder($root, $this->fileView, $this->path, $this->info);
+        } else {
+            $this->node = new File($root, $this->fileView, $this->path, $this->info);
+        }
+    }
+
+    /**
+     *  Returns the name of the node
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->info->getName();
+    }
+
+    /**
+     * Returns the full path
+     *
+     * @return string
+     */
+    public function getPath() {
+        return $this->path;
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws \Sabre\DAV\Exception\BadRequest
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function setName($name) {
+        // rename is only allowed if the update privilege is granted
+        if (!($this->info->isUpdateable() || ($this->info->getMountPoint() instanceof MoveableMount && $this->info->getInternalPath() === ''))) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+
+        [$parentPath,] = \Sabre\Uri\split($this->path);
+        [, $newName] = \Sabre\Uri\split($name);
+
+        // verify path of the target
+        $this->verifyPath();
+
+        $newPath = $parentPath . '/' . $newName;
+
+        if (!$this->fileView->rename($this->path, $newPath)) {
+            throw new \Sabre\DAV\Exception('Failed to rename '. $this->path . ' to ' . $newPath);
+        }
+
+        $this->path = $newPath;
+
+        $this->refreshInfo();
+    }
+
+    public function setPropertyCache($property_cache) {
+        $this->property_cache = $property_cache;
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int timestamp as integer
+     */
+    public function getLastModified() {
+        $timestamp = $this->info->getMtime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
+    }
+
+    /**
+     *  sets the last modification time of the file (mtime) to the value given
+     *  in the second parameter or to now if the second param is empty.
+     *  Even if the modification time is set to a custom value the access time is set to now.
+     */
+    public function touch($mtime) {
+        $mtime = $this->sanitizeMtime($mtime);
+        $this->fileView->touch($this->path, $mtime);
+        $this->refreshInfo();
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the
+     * file. If the file changes, the ETag MUST change.  The ETag is an
+     * arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return string
+     */
+    public function getETag() {
+        return '"' . $this->info->getEtag() . '"';
+    }
+
+    /**
+     * Sets the ETag
+     *
+     * @param string $etag
+     *
+     * @return int file id of updated file or -1 on failure
+     */
+    public function setETag($etag) {
+        return $this->fileView->putFileInfo($this->path, ['etag' => $etag]);
+    }
+
+    public function setCreationTime(int $time) {
+        return $this->fileView->putFileInfo($this->path, ['creation_time' => $time]);
+    }
+
+    public function setUploadTime(int $time) {
+        return $this->fileView->putFileInfo($this->path, ['upload_time' => $time]);
+    }
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+     * @return int|float
+     */
+    public function getSize(): int|float {
+        return $this->info->getSize();
+    }
+
+    /**
+     * Returns the cache's file id
+     *
+     * @return int
+     */
+    public function getId() {
+        return $this->info->getId();
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getFileId() {
+        if ($id = $this->info->getId()) {
+            return DavUtil::getDavFileId($id);
+        }
+
+        return null;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getInternalFileId() {
+        return $this->info->getId();
+    }
+
+    public function getInternalPath(): string {
+        return $this->info->getInternalPath();
+    }
+
+    /**
+     * @param string $user
+     * @return int
+     */
+    public function getSharePermissions($user) {
+        // check of we access a federated share
+        if ($user !== null) {
+            try {
+                $share = $this->shareManager->getShareByToken($user);
+                return $share->getPermissions();
+            } catch (ShareNotFound $e) {
+                // ignore
+            }
+        }
+
+        try {
+            $storage = $this->info->getStorage();
+        } catch (StorageNotAvailableException $e) {
+            $storage = null;
+        }
+
+        if ($storage && $storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            /** @var \OCA\Files_Sharing\SharedStorage $storage */
+            $permissions = (int)$storage->getShare()->getPermissions();
+        } else {
+            $permissions = $this->info->getPermissions();
+        }
+
+        /*
 		 * We can always share non moveable mount points with DELETE and UPDATE
 		 * Eventually we need to do this properly
 		 */
-		$mountpoint = $this->info->getMountPoint();
-		if (!($mountpoint instanceof MoveableMount)) {
-			$mountpointpath = $mountpoint->getMountPoint();
-			if (substr($mountpointpath, -1) === '/') {
-				$mountpointpath = substr($mountpointpath, 0, -1);
-			}
-
-			if (!$mountpoint->getOption('readonly', false) && $mountpointpath === $this->info->getPath()) {
-				$permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
-			}
-		}
-
-		/*
+        $mountpoint = $this->info->getMountPoint();
+        if (!($mountpoint instanceof MoveableMount)) {
+            $mountpointpath = $mountpoint->getMountPoint();
+            if (substr($mountpointpath, -1) === '/') {
+                $mountpointpath = substr($mountpointpath, 0, -1);
+            }
+
+            if (!$mountpoint->getOption('readonly', false) && $mountpointpath === $this->info->getPath()) {
+                $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
+            }
+        }
+
+        /*
 		 * Files can't have create or delete permissions
 		 */
-		if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
-			$permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE);
-		}
-
-		return $permissions;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getShareAttributes(): array {
-		$attributes = [];
-
-		try {
-			$storage = $this->info->getStorage();
-		} catch (StorageNotAvailableException $e) {
-			$storage = null;
-		}
-
-		if ($storage && $storage->instanceOfStorage(\OCA\Files_Sharing\SharedStorage::class)) {
-			/** @var \OCA\Files_Sharing\SharedStorage $storage */
-			$attributes = $storage->getShare()->getAttributes();
-			if ($attributes === null) {
-				return [];
-			} else {
-				return $attributes->toArray();
-			}
-		}
-
-		return $attributes;
-	}
-
-	/**
-	 * @param string $user
-	 * @return string
-	 */
-	public function getNoteFromShare($user) {
-		if ($user === null) {
-			return '';
-		}
-
-		// Retrieve note from the share object already loaded into
-		// memory, to avoid additional database queries.
-		$storage = $this->getNode()->getStorage();
-		if (!$storage->instanceOfStorage(\OCA\Files_Sharing\SharedStorage::class)) {
-			return '';
-		}
-		/** @var \OCA\Files_Sharing\SharedStorage $storage */
-
-		$share = $storage->getShare();
-		$note = $share->getNote();
-		if ($share->getShareOwner() !== $user) {
-			return $note;
-		}
-		return '';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getDavPermissions() {
-		return DavUtil::getDavPermissions($this->info);
-	}
-
-	public function getOwner() {
-		return $this->info->getOwner();
-	}
-
-	protected function verifyPath() {
-		try {
-			$fileName = basename($this->info->getPath());
-			$this->fileView->verifyPath($this->path, $fileName);
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		}
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function acquireLock($type) {
-		$this->fileView->lockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock($type) {
-		$this->fileView->unlockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function changeLock($type) {
-		$this->fileView->changeLock($this->path, $type);
-	}
-
-	public function getFileInfo() {
-		return $this->info;
-	}
-
-	public function getNode(): \OCP\Files\Node {
-		return $this->node;
-	}
-
-	protected function sanitizeMtime($mtimeFromRequest) {
-		return MtimeSanitizer::sanitizeMtime($mtimeFromRequest);
-	}
+        if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+            $permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE);
+        }
+
+        return $permissions;
+    }
+
+    /**
+     * @return array
+     */
+    public function getShareAttributes(): array {
+        $attributes = [];
+
+        try {
+            $storage = $this->info->getStorage();
+        } catch (StorageNotAvailableException $e) {
+            $storage = null;
+        }
+
+        if ($storage && $storage->instanceOfStorage(\OCA\Files_Sharing\SharedStorage::class)) {
+            /** @var \OCA\Files_Sharing\SharedStorage $storage */
+            $attributes = $storage->getShare()->getAttributes();
+            if ($attributes === null) {
+                return [];
+            } else {
+                return $attributes->toArray();
+            }
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * @param string $user
+     * @return string
+     */
+    public function getNoteFromShare($user) {
+        if ($user === null) {
+            return '';
+        }
+
+        // Retrieve note from the share object already loaded into
+        // memory, to avoid additional database queries.
+        $storage = $this->getNode()->getStorage();
+        if (!$storage->instanceOfStorage(\OCA\Files_Sharing\SharedStorage::class)) {
+            return '';
+        }
+        /** @var \OCA\Files_Sharing\SharedStorage $storage */
+
+        $share = $storage->getShare();
+        $note = $share->getNote();
+        if ($share->getShareOwner() !== $user) {
+            return $note;
+        }
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getDavPermissions() {
+        return DavUtil::getDavPermissions($this->info);
+    }
+
+    public function getOwner() {
+        return $this->info->getOwner();
+    }
+
+    protected function verifyPath() {
+        try {
+            $fileName = basename($this->info->getPath());
+            $this->fileView->verifyPath($this->path, $fileName);
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        }
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function acquireLock($type) {
+        $this->fileView->lockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function releaseLock($type) {
+        $this->fileView->unlockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function changeLock($type) {
+        $this->fileView->changeLock($this->path, $type);
+    }
+
+    public function getFileInfo() {
+        return $this->info;
+    }
+
+    public function getNode(): \OCP\Files\Node {
+        return $this->node;
+    }
+
+    protected function sanitizeMtime($mtimeFromRequest) {
+        return MtimeSanitizer::sanitizeMtime($mtimeFromRequest);
+    }
 }

apps/dav/lib/Server.php

Indentation +295 added lines, -295 removed lines

@@ -86,299 +86,299 @@
 use SearchDAV\DAV\SearchPlugin;
 
 class Server {
-	private IRequest $request;
-	private string $baseUri;
-	public Connector\Sabre\Server $server;
-	private IProfiler $profiler;
-
-	public function __construct(IRequest $request, string $baseUri) {
-		$this->profiler = \OC::$server->get(IProfiler::class);
-		if ($this->profiler->isEnabled()) {
-			/** @var IEventLogger $eventLogger */
-			$eventLogger = \OC::$server->get(IEventLogger::class);
-			$eventLogger->start('runtime', 'DAV Runtime');
-		}
-
-		$this->request = $request;
-		$this->baseUri = $baseUri;
-		$logger = \OC::$server->get(LoggerInterface::class);
-		$dispatcher = \OC::$server->getEventDispatcher();
-		/** @var IEventDispatcher $newDispatcher */
-		$newDispatcher = \OC::$server->query(IEventDispatcher::class);
-
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
-
-		// Add maintenance plugin
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig(), \OC::$server->getL10N('dav')));
-
-		// Backends
-		$authBackend = new Auth(
-			\OC::$server->getSession(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getRequest(),
-			\OC::$server->getTwoFactorAuthManager(),
-			\OC::$server->getBruteForceThrottler()
-		);
-
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
-
-		$this->server->addPlugin(new ProfilerPlugin($this->request));
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
-
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
-
-		$newAuthEvent = new SabrePluginAuthInitEvent($this->server);
-		$newDispatcher->dispatchTyped($newAuthEvent);
-
-		$bearerAuthBackend = new BearerAuth(
-			\OC::$server->getUserSession(),
-			\OC::$server->getSession(),
-			\OC::$server->getRequest()
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
-
-		// debugging
-		if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
-
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
-
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users',
-			'principals/groups',
-			'principals/calendar-resources',
-			'principals/calendar-rooms',
-		];
-		$this->server->addPlugin($acl);
-
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\ICSExportPlugin\ICSExportPlugin(\OC::$server->getConfig(), $logger));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class)));
-			if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-				$this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
-			}
-
-			$this->server->addPlugin(\OC::$server->get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($request));
-			if (\OC::$server->getConfig()->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
-				$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-			}
-
-			$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig()));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-				\OC::$server->getConfig(),
-				\OC::$server->getURLGenerator()
-			));
-		}
-
-		// addressbook plugins
-		if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig()));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new MultiGetExportPlugin());
-			$this->server->addPlugin(new HasPhotoPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(new PhotoCache(
-				\OC::$server->getAppDataDir('dav-photocache'),
-				$logger)
-			));
-		}
-
-		// system tags plugins
-		$this->server->addPlugin(new SystemTagPlugin(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getGroupManager(),
-			\OC::$server->getUserSession()
-		));
-
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OC::$server->getCommentsManager(),
-			\OC::$server->getUserSession()
-		));
-
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new RequestIdHeaderPlugin(\OC::$server->get(IRequest::class)));
-		$this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
-		$this->server->addPlugin(new ChunkingPlugin());
-
-		// allow setup of additional plugins
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
-
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if ($request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
-
-		// Allow view-only plugin for webdav requests
-		$this->server->addPlugin(new ViewOnlyPlugin(
-			$logger
-		));
-
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
-
-		$lazySearchBackend = new LazySearchBackend();
-		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
-
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger) {
-			// custom properties plugin must be the last one
-			$userSession = \OC::$server->getUserSession();
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = \OC\Files\Filesystem::getView();
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						\OC::$server->getConfig(),
-						$this->request,
-						\OC::$server->getPreviewManager(),
-						\OC::$server->getUserSession(),
-						false,
-						!\OC::$server->getConfig()->getSystemValue('debug', false)
-					)
-				);
-				$this->server->addPlugin(new ChecksumUpdatePlugin());
-
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server->tree,
-							\OC::$server->getDatabaseConnection(),
-							\OC::$server->getUserSession()->getUser()
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OC::$server->getTagManager()
-					)
-				);
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					\OC::$server->getShareManager()
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OC::$server->getCommentsManager(),
-					$userSession
-				));
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OC::$server->getSystemTagManager(),
-						\OC::$server->getSystemTagObjectMapper(),
-						\OC::$server->getTagManager(),
-						$userSession,
-						\OC::$server->getGroupManager(),
-						$userFolder,
-						\OC::$server->getAppManager()
-					));
-					$lazySearchBackend->setBackend(new \OCA\DAV\Files\FileSearchBackend(
-						$this->server->tree,
-						$user,
-						\OC::$server->getRootFolder(),
-						\OC::$server->getShareManager(),
-						$view
-					));
-					$this->server->addPlugin(
-						new BulkUploadPlugin(
-							$userFolder,
-							$logger
-						)
-					);
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
-					\OC::$server->getConfig(),
-					\OC::$server->query(BirthdayService::class)
-				));
-				$this->server->addPlugin(new AppleProvisioningPlugin(
-					\OC::$server->getUserSession(),
-					\OC::$server->getURLGenerator(),
-					\OC::$server->getThemingDefaults(),
-					\OC::$server->getRequest(),
-					\OC::$server->getL10N('dav'),
-					function () {
-						return UUIDUtil::getUUID();
-					}
-				));
-			}
-
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OC::$server->getAppManager()
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-
-		$this->server->addPlugin(
-			new PropfindCompressionPlugin()
-		);
-	}
-
-	public function exec() {
-		/** @var IEventLogger $eventLogger */
-		$eventLogger = \OC::$server->get(IEventLogger::class);
-		$eventLogger->start('dav_server_exec', '');
-		$this->server->exec();
-		$eventLogger->end('dav_server_exec');
-		if ($this->profiler->isEnabled()) {
-			$eventLogger->end('runtime');
-			$profile = $this->profiler->collect(\OC::$server->get(IRequest::class), new Response());
-			$this->profiler->saveProfile($profile);
-		}
-	}
-
-	private function requestIsForSubtree(array $subTrees): bool {
-		foreach ($subTrees as $subTree) {
-			$subTree = trim($subTree, ' /');
-			if (strpos($this->server->getRequestUri(), $subTree.'/') === 0) {
-				return true;
-			}
-		}
-		return false;
-	}
+    private IRequest $request;
+    private string $baseUri;
+    public Connector\Sabre\Server $server;
+    private IProfiler $profiler;
+
+    public function __construct(IRequest $request, string $baseUri) {
+        $this->profiler = \OC::$server->get(IProfiler::class);
+        if ($this->profiler->isEnabled()) {
+            /** @var IEventLogger $eventLogger */
+            $eventLogger = \OC::$server->get(IEventLogger::class);
+            $eventLogger->start('runtime', 'DAV Runtime');
+        }
+
+        $this->request = $request;
+        $this->baseUri = $baseUri;
+        $logger = \OC::$server->get(LoggerInterface::class);
+        $dispatcher = \OC::$server->getEventDispatcher();
+        /** @var IEventDispatcher $newDispatcher */
+        $newDispatcher = \OC::$server->query(IEventDispatcher::class);
+
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+
+        // Add maintenance plugin
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig(), \OC::$server->getL10N('dav')));
+
+        // Backends
+        $authBackend = new Auth(
+            \OC::$server->getSession(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getRequest(),
+            \OC::$server->getTwoFactorAuthManager(),
+            \OC::$server->getBruteForceThrottler()
+        );
+
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
+
+        $this->server->addPlugin(new ProfilerPlugin($this->request));
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
+
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+
+        $newAuthEvent = new SabrePluginAuthInitEvent($this->server);
+        $newDispatcher->dispatchTyped($newAuthEvent);
+
+        $bearerAuthBackend = new BearerAuth(
+            \OC::$server->getUserSession(),
+            \OC::$server->getSession(),
+            \OC::$server->getRequest()
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
+
+        // debugging
+        if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
+
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users',
+            'principals/groups',
+            'principals/calendar-resources',
+            'principals/calendar-rooms',
+        ];
+        $this->server->addPlugin($acl);
+
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\ICSExportPlugin\ICSExportPlugin(\OC::$server->getConfig(), $logger));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class)));
+            if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                $this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+            }
+
+            $this->server->addPlugin(\OC::$server->get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($request));
+            if (\OC::$server->getConfig()->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
+                $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+            }
+
+            $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig()));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+                \OC::$server->getConfig(),
+                \OC::$server->getURLGenerator()
+            ));
+        }
+
+        // addressbook plugins
+        if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig()));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new MultiGetExportPlugin());
+            $this->server->addPlugin(new HasPhotoPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(
+                \OC::$server->getAppDataDir('dav-photocache'),
+                $logger)
+            ));
+        }
+
+        // system tags plugins
+        $this->server->addPlugin(new SystemTagPlugin(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getGroupManager(),
+            \OC::$server->getUserSession()
+        ));
+
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OC::$server->getCommentsManager(),
+            \OC::$server->getUserSession()
+        ));
+
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new RequestIdHeaderPlugin(\OC::$server->get(IRequest::class)));
+        $this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
+        $this->server->addPlugin(new ChunkingPlugin());
+
+        // allow setup of additional plugins
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if ($request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
+
+        // Allow view-only plugin for webdav requests
+        $this->server->addPlugin(new ViewOnlyPlugin(
+            $logger
+        ));
+
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
+
+        $lazySearchBackend = new LazySearchBackend();
+        $this->server->addPlugin(new SearchPlugin($lazySearchBackend));
+
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger) {
+            // custom properties plugin must be the last one
+            $userSession = \OC::$server->getUserSession();
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = \OC\Files\Filesystem::getView();
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        \OC::$server->getConfig(),
+                        $this->request,
+                        \OC::$server->getPreviewManager(),
+                        \OC::$server->getUserSession(),
+                        false,
+                        !\OC::$server->getConfig()->getSystemValue('debug', false)
+                    )
+                );
+                $this->server->addPlugin(new ChecksumUpdatePlugin());
+
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server->tree,
+                            \OC::$server->getDatabaseConnection(),
+                            \OC::$server->getUserSession()->getUser()
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OC::$server->getTagManager()
+                    )
+                );
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    \OC::$server->getShareManager()
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OC::$server->getCommentsManager(),
+                    $userSession
+                ));
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OC::$server->getSystemTagManager(),
+                        \OC::$server->getSystemTagObjectMapper(),
+                        \OC::$server->getTagManager(),
+                        $userSession,
+                        \OC::$server->getGroupManager(),
+                        $userFolder,
+                        \OC::$server->getAppManager()
+                    ));
+                    $lazySearchBackend->setBackend(new \OCA\DAV\Files\FileSearchBackend(
+                        $this->server->tree,
+                        $user,
+                        \OC::$server->getRootFolder(),
+                        \OC::$server->getShareManager(),
+                        $view
+                    ));
+                    $this->server->addPlugin(
+                        new BulkUploadPlugin(
+                            $userFolder,
+                            $logger
+                        )
+                    );
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
+                    \OC::$server->getConfig(),
+                    \OC::$server->query(BirthdayService::class)
+                ));
+                $this->server->addPlugin(new AppleProvisioningPlugin(
+                    \OC::$server->getUserSession(),
+                    \OC::$server->getURLGenerator(),
+                    \OC::$server->getThemingDefaults(),
+                    \OC::$server->getRequest(),
+                    \OC::$server->getL10N('dav'),
+                    function () {
+                        return UUIDUtil::getUUID();
+                    }
+                ));
+            }
+
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OC::$server->getAppManager()
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+
+        $this->server->addPlugin(
+            new PropfindCompressionPlugin()
+        );
+    }
+
+    public function exec() {
+        /** @var IEventLogger $eventLogger */
+        $eventLogger = \OC::$server->get(IEventLogger::class);
+        $eventLogger->start('dav_server_exec', '');
+        $this->server->exec();
+        $eventLogger->end('dav_server_exec');
+        if ($this->profiler->isEnabled()) {
+            $eventLogger->end('runtime');
+            $profile = $this->profiler->collect(\OC::$server->get(IRequest::class), new Response());
+            $this->profiler->saveProfile($profile);
+        }
+    }
+
+    private function requestIsForSubtree(array $subTrees): bool {
+        foreach ($subTrees as $subTree) {
+            $subTree = trim($subTree, ' /');
+            if (strpos($this->server->getRequestUri(), $subTree.'/') === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

apps/dav/lib/Upload/UploadFile.php

Indentation +62 added lines, -62 removed lines

@@ -29,66 +29,66 @@
 use Sabre\DAV\IFile;
 
 class UploadFile implements IFile {
-	/**  @var File */
-	private $file;
-
-	public function __construct(File $file) {
-		$this->file = $file;
-	}
-
-	public function put($data) {
-		return $this->file->put($data);
-	}
-
-	public function get() {
-		return $this->file->get();
-	}
-
-	public function getId() {
-		return $this->file->getId();
-	}
-
-	public function getContentType() {
-		return $this->file->getContentType();
-	}
-
-	public function getETag() {
-		return $this->file->getETag();
-	}
-
-	/**
-	 * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
-	 * @return int|float
-	 */
-	public function getSize() {
-		return $this->file->getSize();
-	}
-
-	public function delete() {
-		$this->file->delete();
-	}
-
-	public function getName() {
-		return $this->file->getName();
-	}
-
-	public function setName($name) {
-		$this->file->setName($name);
-	}
-
-	public function getLastModified() {
-		return $this->file->getLastModified();
-	}
-
-	public function getInternalPath(): string {
-		return $this->file->getInternalPath();
-	}
-
-	public function getFile(): File {
-		return $this->file;
-	}
-
-	public function getNode() {
-		return $this->file->getNode();
-	}
+    /**  @var File */
+    private $file;
+
+    public function __construct(File $file) {
+        $this->file = $file;
+    }
+
+    public function put($data) {
+        return $this->file->put($data);
+    }
+
+    public function get() {
+        return $this->file->get();
+    }
+
+    public function getId() {
+        return $this->file->getId();
+    }
+
+    public function getContentType() {
+        return $this->file->getContentType();
+    }
+
+    public function getETag() {
+        return $this->file->getETag();
+    }
+
+    /**
+     * @psalm-suppress ImplementedReturnTypeMismatch \Sabre\DAV\IFile::getSize signature does not support 32bit
+     * @return int|float
+     */
+    public function getSize() {
+        return $this->file->getSize();
+    }
+
+    public function delete() {
+        $this->file->delete();
+    }
+
+    public function getName() {
+        return $this->file->getName();
+    }
+
+    public function setName($name) {
+        $this->file->setName($name);
+    }
+
+    public function getLastModified() {
+        return $this->file->getLastModified();
+    }
+
+    public function getInternalPath(): string {
+        return $this->file->getInternalPath();
+    }
+
+    public function getFile(): File {
+        return $this->file;
+    }
+
+    public function getNode() {
+        return $this->file->getNode();
+    }
 }

apps/dav/lib/Upload/PartFile.php

Indentation +65 added lines, -65 removed lines

@@ -32,80 +32,80 @@
  * but handled directly by external storage services like S3 with Multipart Upload
  */
 class PartFile implements IFile {
-	/** @var Directory */
-	private $root;
-	/** @var array */
-	private $partInfo;
+    /** @var Directory */
+    private $root;
+    /** @var array */
+    private $partInfo;
 
-	public function __construct(Directory $root, array $partInfo) {
-		$this->root = $root;
-		$this->partInfo = $partInfo;
-	}
+    public function __construct(Directory $root, array $partInfo) {
+        $this->root = $root;
+        $this->partInfo = $partInfo;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function put($data) {
-		throw new Forbidden('Permission denied to put into this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function put($data) {
+        throw new Forbidden('Permission denied to put into this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		throw new Forbidden('Permission denied to get this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        throw new Forbidden('Permission denied to get this file');
+    }
 
-	public function getPath() {
-		return $this->root->getFileInfo()->getInternalPath() . '/' . $this->partInfo['PartNumber'];
-	}
+    public function getPath() {
+        return $this->root->getFileInfo()->getInternalPath() . '/' . $this->partInfo['PartNumber'];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getContentType() {
-		return 'application/octet-stream';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getContentType() {
+        return 'application/octet-stream';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getETag() {
-		return $this->partInfo['ETag'];
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getETag() {
+        return $this->partInfo['ETag'];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getSize() {
-		return $this->partInfo['Size'];
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getSize() {
+        return $this->partInfo['Size'];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function delete() {
-		$this->root->delete();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function delete() {
+        $this->root->delete();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return $this->partInfo['PartNumber'];
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return $this->partInfo['PartNumber'];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getLastModified() {
-		return $this->partInfo['LastModified'];
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getLastModified() {
+        return $this->partInfo['LastModified'];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	}
 
 	public function getPath() {
-		return $this->root->getFileInfo()->getInternalPath() . '/' . $this->partInfo['PartNumber'];
+		return $this->root->getFileInfo()->getInternalPath().'/'.$this->partInfo['PartNumber'];
 	}
 
 	/**

apps/dav/lib/Upload/FutureFile.php

Indentation +75 added lines, -75 removed lines

@@ -36,91 +36,91 @@
  * @package OCA\DAV\Upload
  */
 class FutureFile implements \Sabre\DAV\IFile {
-	/** @var Directory */
-	private $root;
-	/** @var string */
-	private $name;
+    /** @var Directory */
+    private $root;
+    /** @var string */
+    private $name;
 
-	/**
-	 * @param Directory $root
-	 * @param string $name
-	 */
-	public function __construct(Directory $root, $name) {
-		$this->root = $root;
-		$this->name = $name;
-	}
+    /**
+     * @param Directory $root
+     * @param string $name
+     */
+    public function __construct(Directory $root, $name) {
+        $this->root = $root;
+        $this->name = $name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function put($data) {
-		throw new Forbidden('Permission denied to put into this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function put($data) {
+        throw new Forbidden('Permission denied to put into this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		$nodes = $this->root->getChildren();
-		return AssemblyStream::wrap($nodes);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        $nodes = $this->root->getChildren();
+        return AssemblyStream::wrap($nodes);
+    }
 
-	public function getPath() {
-		return $this->root->getFileInfo()->getInternalPath() . '/.file';
-	}
+    public function getPath() {
+        return $this->root->getFileInfo()->getInternalPath() . '/.file';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getContentType() {
-		return 'application/octet-stream';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getContentType() {
+        return 'application/octet-stream';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getETag() {
-		return $this->root->getETag();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getETag() {
+        return $this->root->getETag();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getSize() {
-		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
-			/** @var IFile $node */
-			return $node->getSize();
-		}, $children);
+    /**
+     * @inheritdoc
+     */
+    public function getSize() {
+        $children = $this->root->getChildren();
+        $sizes = array_map(function ($node) {
+            /** @var IFile $node */
+            return $node->getSize();
+        }, $children);
 
-		return array_sum($sizes);
-	}
+        return array_sum($sizes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function delete() {
-		$this->root->delete();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function delete() {
+        $this->root->delete();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getLastModified() {
-		return $this->root->getLastModified();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getLastModified() {
+        return $this->root->getLastModified();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 	}
 
 	public function getPath() {
-		return $this->root->getFileInfo()->getInternalPath() . '/.file';
+		return $this->root->getFileInfo()->getInternalPath().'/.file';
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function getSize() {
 		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
+		$sizes = array_map(function($node) {
 			/** @var IFile $node */
 			return $node->getSize();
 		}, $children);