nextcloud / server

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

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 			return;
 		}
 
-		return $this->checkQuota($parent->getPath() . '/' . basename($uri));
+		return $this->checkQuota($parent->getPath().'/'.basename($uri));
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 				// there is still enough space for the remaining chunks
 				$length -= $chunkHandler->getCurrentSize();
 				// use target file name for free space check in case of shared files
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
+				$path = rtrim($parentPath, '/').'/'.$info['name'];
 			}
 			$freeSpace = $this->getFreeSpace($path);
 			if ($freeSpace >= 0 && $length > $freeSpace) {

Indentation +203 added lines, -203 removed lines

@@ -44,207 +44,207 @@
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
-	/** @var \OC\Files\View */
-	private $view;
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @param \OC\Files\View $view
-	 */
-	public function __construct($view) {
-		$this->view = $view;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the requires event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-
-		$server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
-		$server->on('beforeCreateFile', [$this, 'beforeCreateFile'], 10);
-		$server->on('beforeMove', [$this, 'beforeMove'], 10);
-		$server->on('beforeCopy', [$this, 'beforeCopy'], 10);
-	}
-
-	/**
-	 * Check quota before creating file
-	 *
-	 * @param string $uri target file URI
-	 * @param resource $data data
-	 * @param INode $parent Sabre Node
-	 * @param bool $modified modified
-	 */
-	public function beforeCreateFile($uri, $data, INode $parent, $modified) {
-		if (!$parent instanceof Node) {
-			return;
-		}
-
-		return $this->checkQuota($parent->getPath() . '/' . basename($uri));
-	}
-
-	/**
-	 * Check quota before writing content
-	 *
-	 * @param string $uri target file URI
-	 * @param INode $node Sabre Node
-	 * @param resource $data data
-	 * @param bool $modified modified
-	 */
-	public function beforeWriteContent($uri, INode $node, $data, $modified) {
-		if (!$node instanceof Node) {
-			return;
-		}
-
-		return $this->checkQuota($node->getPath());
-	}
-
-	/**
-	 * Check if we're moving a Futurefile in which case we need to check
-	 * the quota on the target destination.
-	 *
-	 * @param string $source source path
-	 * @param string $destination destination path
-	 */
-	public function beforeMove($source, $destination) {
-		$sourceNode = $this->server->tree->getNodeForPath($source);
-		if (!$sourceNode instanceof FutureFile) {
-			return;
-		}
-
-		// get target node for proper path conversion
-		if ($this->server->tree->nodeExists($destination)) {
-			$destinationNode = $this->server->tree->getNodeForPath($destination);
-			$path = $destinationNode->getPath();
-		} else {
-			$parent = dirname($destination);
-			if ($parent === '.') {
-				$parent = '';
-			}
-			$parentNode = $this->server->tree->getNodeForPath($parent);
-			$path = $parentNode->getPath();
-		}
-
-		return $this->checkQuota($path, $sourceNode->getSize());
-	}
-
-	/**
-	 * Check quota on the target destination before a copy.
-	 */
-	public function beforeCopy(string $sourcePath, string $destinationPath): bool {
-		$sourceNode = $this->server->tree->getNodeForPath($sourcePath);
-		if (!$sourceNode instanceof Node) {
-			return true;
-		}
-
-		// get target node for proper path conversion
-		if ($this->server->tree->nodeExists($destinationPath)) {
-			$destinationNode = $this->server->tree->getNodeForPath($destinationPath);
-			if (!$destinationNode instanceof Node) {
-				return true;
-			}
-			$path = $destinationNode->getPath();
-		} else {
-			$parent = dirname($destinationPath);
-			if ($parent === '.') {
-				$parent = '';
-			}
-			$parentNode = $this->server->tree->getNodeForPath($parent);
-			if (!$parentNode instanceof Node) {
-				return true;
-			}
-			$path = $parentNode->getPath();
-		}
-
-		return $this->checkQuota($path, $sourceNode->getSize());
-	}
-
-
-	/**
-	 * This method is called before any HTTP method and validates there is enough free space to store the file
-	 *
-	 * @param string $path relative to the users home
-	 * @param int|float|null $length
-	 * @throws InsufficientStorage
-	 * @return bool
-	 */
-	public function checkQuota($path, $length = null) {
-		if ($length === null) {
-			$length = $this->getLength();
-		}
-
-		if ($length) {
-			[$parentPath, $newName] = \Sabre\Uri\split($path);
-			if (is_null($parentPath)) {
-				$parentPath = '';
-			}
-			$req = $this->server->httpRequest;
-			if ($req->getHeader('OC-Chunked')) {
-				$info = \OC_FileChunking::decodeName($newName);
-				$chunkHandler = $this->getFileChunking($info);
-				// subtract the already uploaded size to see whether
-				// there is still enough space for the remaining chunks
-				$length -= $chunkHandler->getCurrentSize();
-				// use target file name for free space check in case of shared files
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
-			}
-			$freeSpace = $this->getFreeSpace($path);
-			if ($freeSpace >= 0 && $length > $freeSpace) {
-				if (isset($chunkHandler)) {
-					$chunkHandler->cleanup();
-				}
-				throw new InsufficientStorage("Insufficient space in $path, $length required, $freeSpace available");
-			}
-		}
-		return true;
-	}
-
-	public function getFileChunking($info) {
-		// FIXME: need a factory for better mocking support
-		return new \OC_FileChunking($info);
-	}
-
-	public function getLength() {
-		$req = $this->server->httpRequest;
-		$length = $req->getHeader('X-Expected-Entity-Length');
-		if (!is_numeric($length)) {
-			$length = $req->getHeader('Content-Length');
-			$length = is_numeric($length) ? $length : null;
-		}
-
-		$ocLength = $req->getHeader('OC-Total-Length');
-		if (is_numeric($length) && is_numeric($ocLength)) {
-			return max($length, $ocLength);
-		}
-
-		return $length;
-	}
-
-	/**
-	 * @param string $uri
-	 * @return mixed
-	 * @throws ServiceUnavailable
-	 */
-	public function getFreeSpace($uri) {
-		try {
-			$freeSpace = $this->view->free_space(ltrim($uri, '/'));
-			return $freeSpace;
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($e->getMessage());
-		}
-	}
+    /** @var \OC\Files\View */
+    private $view;
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @param \OC\Files\View $view
+     */
+    public function __construct($view) {
+        $this->view = $view;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the requires event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+
+        $server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
+        $server->on('beforeCreateFile', [$this, 'beforeCreateFile'], 10);
+        $server->on('beforeMove', [$this, 'beforeMove'], 10);
+        $server->on('beforeCopy', [$this, 'beforeCopy'], 10);
+    }
+
+    /**
+     * Check quota before creating file
+     *
+     * @param string $uri target file URI
+     * @param resource $data data
+     * @param INode $parent Sabre Node
+     * @param bool $modified modified
+     */
+    public function beforeCreateFile($uri, $data, INode $parent, $modified) {
+        if (!$parent instanceof Node) {
+            return;
+        }
+
+        return $this->checkQuota($parent->getPath() . '/' . basename($uri));
+    }
+
+    /**
+     * Check quota before writing content
+     *
+     * @param string $uri target file URI
+     * @param INode $node Sabre Node
+     * @param resource $data data
+     * @param bool $modified modified
+     */
+    public function beforeWriteContent($uri, INode $node, $data, $modified) {
+        if (!$node instanceof Node) {
+            return;
+        }
+
+        return $this->checkQuota($node->getPath());
+    }
+
+    /**
+     * Check if we're moving a Futurefile in which case we need to check
+     * the quota on the target destination.
+     *
+     * @param string $source source path
+     * @param string $destination destination path
+     */
+    public function beforeMove($source, $destination) {
+        $sourceNode = $this->server->tree->getNodeForPath($source);
+        if (!$sourceNode instanceof FutureFile) {
+            return;
+        }
+
+        // get target node for proper path conversion
+        if ($this->server->tree->nodeExists($destination)) {
+            $destinationNode = $this->server->tree->getNodeForPath($destination);
+            $path = $destinationNode->getPath();
+        } else {
+            $parent = dirname($destination);
+            if ($parent === '.') {
+                $parent = '';
+            }
+            $parentNode = $this->server->tree->getNodeForPath($parent);
+            $path = $parentNode->getPath();
+        }
+
+        return $this->checkQuota($path, $sourceNode->getSize());
+    }
+
+    /**
+     * Check quota on the target destination before a copy.
+     */
+    public function beforeCopy(string $sourcePath, string $destinationPath): bool {
+        $sourceNode = $this->server->tree->getNodeForPath($sourcePath);
+        if (!$sourceNode instanceof Node) {
+            return true;
+        }
+
+        // get target node for proper path conversion
+        if ($this->server->tree->nodeExists($destinationPath)) {
+            $destinationNode = $this->server->tree->getNodeForPath($destinationPath);
+            if (!$destinationNode instanceof Node) {
+                return true;
+            }
+            $path = $destinationNode->getPath();
+        } else {
+            $parent = dirname($destinationPath);
+            if ($parent === '.') {
+                $parent = '';
+            }
+            $parentNode = $this->server->tree->getNodeForPath($parent);
+            if (!$parentNode instanceof Node) {
+                return true;
+            }
+            $path = $parentNode->getPath();
+        }
+
+        return $this->checkQuota($path, $sourceNode->getSize());
+    }
+
+
+    /**
+     * This method is called before any HTTP method and validates there is enough free space to store the file
+     *
+     * @param string $path relative to the users home
+     * @param int|float|null $length
+     * @throws InsufficientStorage
+     * @return bool
+     */
+    public function checkQuota($path, $length = null) {
+        if ($length === null) {
+            $length = $this->getLength();
+        }
+
+        if ($length) {
+            [$parentPath, $newName] = \Sabre\Uri\split($path);
+            if (is_null($parentPath)) {
+                $parentPath = '';
+            }
+            $req = $this->server->httpRequest;
+            if ($req->getHeader('OC-Chunked')) {
+                $info = \OC_FileChunking::decodeName($newName);
+                $chunkHandler = $this->getFileChunking($info);
+                // subtract the already uploaded size to see whether
+                // there is still enough space for the remaining chunks
+                $length -= $chunkHandler->getCurrentSize();
+                // use target file name for free space check in case of shared files
+                $path = rtrim($parentPath, '/') . '/' . $info['name'];
+            }
+            $freeSpace = $this->getFreeSpace($path);
+            if ($freeSpace >= 0 && $length > $freeSpace) {
+                if (isset($chunkHandler)) {
+                    $chunkHandler->cleanup();
+                }
+                throw new InsufficientStorage("Insufficient space in $path, $length required, $freeSpace available");
+            }
+        }
+        return true;
+    }
+
+    public function getFileChunking($info) {
+        // FIXME: need a factory for better mocking support
+        return new \OC_FileChunking($info);
+    }
+
+    public function getLength() {
+        $req = $this->server->httpRequest;
+        $length = $req->getHeader('X-Expected-Entity-Length');
+        if (!is_numeric($length)) {
+            $length = $req->getHeader('Content-Length');
+            $length = is_numeric($length) ? $length : null;
+        }
+
+        $ocLength = $req->getHeader('OC-Total-Length');
+        if (is_numeric($length) && is_numeric($ocLength)) {
+            return max($length, $ocLength);
+        }
+
+        return $length;
+    }
+
+    /**
+     * @param string $uri
+     * @return mixed
+     * @throws ServiceUnavailable
+     */
+    public function getFreeSpace($uri) {
+        try {
+            $freeSpace = $this->view->free_space(ltrim($uri, '/'));
+            return $freeSpace;
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($e->getMessage());
+        }
+    }
 }

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

Indentation +59 added lines, -59 removed lines

@@ -34,67 +34,67 @@
 use Sabre\HTTP\RequestInterface;
 
 class LockPlugin extends ServerPlugin {
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * State of the lock
-	 *
-	 * @var bool
-	 */
-	private $isLocked;
+    /**
+     * State of the lock
+     *
+     * @var bool
+     */
+    private $isLocked;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod:*', [$this, 'getLock'], 50);
-		$this->server->on('afterMethod:*', [$this, 'releaseLock'], 50);
-		$this->isLocked = false;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod:*', [$this, 'getLock'], 50);
+        $this->server->on('afterMethod:*', [$this, 'releaseLock'], 50);
+        $this->isLocked = false;
+    }
 
-	public function getLock(RequestInterface $request) {
-		// we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
-		// so instead we limit ourselves to the PUT method manually
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			try {
-				$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			} catch (LockedException $e) {
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-			}
-			$this->isLocked = true;
-		}
-	}
+    public function getLock(RequestInterface $request) {
+        // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+        // so instead we limit ourselves to the PUT method manually
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            try {
+                $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            } catch (LockedException $e) {
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+            }
+            $this->isLocked = true;
+        }
+    }
 
-	public function releaseLock(RequestInterface $request) {
-		// don't try to release the lock if we never locked one
-		if ($this->isLocked === false) {
-			return;
-		}
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
-			$this->isLocked = false;
-		}
-	}
+    public function releaseLock(RequestInterface $request) {
+        // don't try to release the lock if we never locked one
+        if ($this->isLocked === false) {
+            return;
+        }
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
+            $this->isLocked = false;
+        }
+    }
 }

lib/private/legacy/OC_FileChunking.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	public function isComplete() {
 		$prefix = $this->getPrefix();
 		$cache = $this->getCache();
-		$chunkcount = (int)$this->info['chunkcount'];
+		$chunkcount = (int) $this->info['chunkcount'];
 
 		for ($i = ($chunkcount - 1); $i >= 0; $i--) {
 			if (!$cache->hasKey($prefix.$i)) {

Indentation +152 added lines, -152 removed lines

@@ -29,156 +29,156 @@
  *
  */
 class OC_FileChunking {
-	protected $info;
-	protected $cache;
-
-	/**
-	 * TTL of chunks
-	 *
-	 * @var int
-	 */
-	protected $ttl;
-
-	public static function decodeName($name) {
-		preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
-		return $matches;
-	}
-
-	/**
-	 * @param string[] $info
-	 */
-	public function __construct($info) {
-		$this->info = $info;
-		$this->ttl = \OC::$server->getConfig()->getSystemValue('cache_chunk_gc_ttl', 86400);
-	}
-
-	public function getPrefix() {
-		$name = $this->info['name'];
-		$transferid = $this->info['transferid'];
-
-		return $name.'-chunking-'.$transferid.'-';
-	}
-
-	protected function getCache() {
-		if (!isset($this->cache)) {
-			$this->cache = new \OC\Cache\File();
-		}
-		return $this->cache;
-	}
-
-	/**
-	 * Stores the given $data under the given $key - the number of stored bytes is returned
-	 *
-	 * @param string $index
-	 * @param resource $data
-	 * @return int
-	 */
-	public function store($index, $data) {
-		$cache = $this->getCache();
-		$name = $this->getPrefix().$index;
-		$cache->set($name, $data, $this->ttl);
-
-		return $cache->size($name);
-	}
-
-	public function isComplete() {
-		$prefix = $this->getPrefix();
-		$cache = $this->getCache();
-		$chunkcount = (int)$this->info['chunkcount'];
-
-		for ($i = ($chunkcount - 1); $i >= 0; $i--) {
-			if (!$cache->hasKey($prefix.$i)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Assembles the chunks into the file specified by the path.
-	 * Chunks are deleted afterwards.
-	 *
-	 * @param resource $f target path
-	 *
-	 * @return integer assembled file size
-	 *
-	 * @throws \OC\InsufficientStorageException when file could not be fully
-	 * assembled due to lack of free space
-	 */
-	public function assemble($f) {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		$count = 0;
-		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
-			$chunk = $cache->get($prefix.$i);
-			// remove after reading to directly save space
-			$cache->remove($prefix.$i);
-			$count += fwrite($f, $chunk);
-			// let php release the memory to work around memory exhausted error with php 5.6
-			$chunk = null;
-		}
-
-		return $count;
-	}
-
-	/**
-	 * Returns the size of the chunks already present
-	 * @return integer size in bytes
-	 */
-	public function getCurrentSize() {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		$total = 0;
-		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
-			$total += $cache->size($prefix.$i);
-		}
-		return $total;
-	}
-
-	/**
-	 * Removes all chunks which belong to this transmission
-	 */
-	public function cleanup() {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
-			$cache->remove($prefix.$i);
-		}
-	}
-
-	/**
-	 * Removes one specific chunk
-	 * @param string $index
-	 */
-	public function remove($index) {
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		$cache->remove($prefix.$index);
-	}
-
-	/**
-	 * Assembles the chunks into the file specified by the path.
-	 * Also triggers the relevant hooks and proxies.
-	 *
-	 * @param \OC\Files\Storage\Storage $storage storage
-	 * @param string $path target path relative to the storage
-	 * @return bool true on success or false if file could not be created
-	 *
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function file_assemble($storage, $path) {
-		// use file_put_contents as method because that best matches what this function does
-		if (\OC\Files\Filesystem::isValidPath($path)) {
-			$target = $storage->fopen($path, 'w');
-			if ($target) {
-				$count = $this->assemble($target);
-				fclose($target);
-				return $count > 0;
-			} else {
-				return false;
-			}
-		}
-		return false;
-	}
+    protected $info;
+    protected $cache;
+
+    /**
+     * TTL of chunks
+     *
+     * @var int
+     */
+    protected $ttl;
+
+    public static function decodeName($name) {
+        preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches);
+        return $matches;
+    }
+
+    /**
+     * @param string[] $info
+     */
+    public function __construct($info) {
+        $this->info = $info;
+        $this->ttl = \OC::$server->getConfig()->getSystemValue('cache_chunk_gc_ttl', 86400);
+    }
+
+    public function getPrefix() {
+        $name = $this->info['name'];
+        $transferid = $this->info['transferid'];
+
+        return $name.'-chunking-'.$transferid.'-';
+    }
+
+    protected function getCache() {
+        if (!isset($this->cache)) {
+            $this->cache = new \OC\Cache\File();
+        }
+        return $this->cache;
+    }
+
+    /**
+     * Stores the given $data under the given $key - the number of stored bytes is returned
+     *
+     * @param string $index
+     * @param resource $data
+     * @return int
+     */
+    public function store($index, $data) {
+        $cache = $this->getCache();
+        $name = $this->getPrefix().$index;
+        $cache->set($name, $data, $this->ttl);
+
+        return $cache->size($name);
+    }
+
+    public function isComplete() {
+        $prefix = $this->getPrefix();
+        $cache = $this->getCache();
+        $chunkcount = (int)$this->info['chunkcount'];
+
+        for ($i = ($chunkcount - 1); $i >= 0; $i--) {
+            if (!$cache->hasKey($prefix.$i)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Assembles the chunks into the file specified by the path.
+     * Chunks are deleted afterwards.
+     *
+     * @param resource $f target path
+     *
+     * @return integer assembled file size
+     *
+     * @throws \OC\InsufficientStorageException when file could not be fully
+     * assembled due to lack of free space
+     */
+    public function assemble($f) {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        $count = 0;
+        for ($i = 0; $i < $this->info['chunkcount']; $i++) {
+            $chunk = $cache->get($prefix.$i);
+            // remove after reading to directly save space
+            $cache->remove($prefix.$i);
+            $count += fwrite($f, $chunk);
+            // let php release the memory to work around memory exhausted error with php 5.6
+            $chunk = null;
+        }
+
+        return $count;
+    }
+
+    /**
+     * Returns the size of the chunks already present
+     * @return integer size in bytes
+     */
+    public function getCurrentSize() {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        $total = 0;
+        for ($i = 0; $i < $this->info['chunkcount']; $i++) {
+            $total += $cache->size($prefix.$i);
+        }
+        return $total;
+    }
+
+    /**
+     * Removes all chunks which belong to this transmission
+     */
+    public function cleanup() {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        for ($i = 0; $i < $this->info['chunkcount']; $i++) {
+            $cache->remove($prefix.$i);
+        }
+    }
+
+    /**
+     * Removes one specific chunk
+     * @param string $index
+     */
+    public function remove($index) {
+        $cache = $this->getCache();
+        $prefix = $this->getPrefix();
+        $cache->remove($prefix.$index);
+    }
+
+    /**
+     * Assembles the chunks into the file specified by the path.
+     * Also triggers the relevant hooks and proxies.
+     *
+     * @param \OC\Files\Storage\Storage $storage storage
+     * @param string $path target path relative to the storage
+     * @return bool true on success or false if file could not be created
+     *
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function file_assemble($storage, $path) {
+        // use file_put_contents as method because that best matches what this function does
+        if (\OC\Files\Filesystem::isValidPath($path)) {
+            $target = $storage->fopen($path, 'w');
+            if ($target) {
+                $count = $this->assemble($target);
+                fclose($target);
+                return $count > 0;
+            } else {
+                return false;
+            }
+        }
+        return false;
+    }
 }

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

Indentation +199 added lines, -199 removed lines

@@ -41,203 +41,203 @@
 
 class ObjectTree extends CachingTree {
 
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $fileView;
-
-	/**
-	 * @var  \OCP\Files\Mount\IMountManager
-	 */
-	protected $mountManager;
-
-	/**
-	 * Creates the object
-	 */
-	public function __construct() {
-	}
-
-	/**
-	 * @param \Sabre\DAV\INode $rootNode
-	 * @param \OC\Files\View $view
-	 * @param  \OCP\Files\Mount\IMountManager $mountManager
-	 */
-	public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OCP\Files\Mount\IMountManager $mountManager) {
-		$this->rootNode = $rootNode;
-		$this->fileView = $view;
-		$this->mountManager = $mountManager;
-	}
-
-	/**
-	 * If the given path is a chunked file name, converts it
-	 * to the real file name. Only applies if the OC-CHUNKED header
-	 * is present.
-	 *
-	 * @param string $path chunk file path to convert
-	 *
-	 * @return string path to real file
-	 */
-	private function resolveChunkFile($path) {
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			// resolve to real file name to find the proper node
-			[$dir, $name] = \Sabre\Uri\split($path);
-			if ($dir === '/' || $dir === '.') {
-				$dir = '';
-			}
-
-			$info = \OC_FileChunking::decodeName($name);
-			// only replace path if it was really the chunked file
-			if (isset($info['transferid'])) {
-				// getNodePath is called for multiple nodes within a chunk
-				// upload call
-				$path = $dir . '/' . $info['name'];
-				$path = ltrim($path, '/');
-			}
-		}
-		return $path;
-	}
-
-	/**
-	 * Returns the INode object for the requested path
-	 *
-	 * @param string $path
-	 * @return \Sabre\DAV\INode
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function getNodeForPath($path) {
-		if (!$this->fileView) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
-		}
-
-		$path = trim($path, '/');
-
-		if (isset($this->cache[$path])) {
-			return $this->cache[$path];
-		}
-
-		if ($path) {
-			try {
-				$this->fileView->verifyPath($path, basename($path));
-			} catch (\OCP\Files\InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			}
-		}
-
-		// Is it the root node?
-		if (!strlen($path)) {
-			return $this->rootNode;
-		}
-
-		if (pathinfo($path, PATHINFO_EXTENSION) === 'part') {
-			// read from storage
-			$absPath = $this->fileView->getAbsolutePath($path);
-			$mount = $this->fileView->getMount($path);
-			$storage = $mount->getStorage();
-			$internalPath = $mount->getInternalPath($absPath);
-			if ($storage && $storage->file_exists($internalPath)) {
-				/**
-				 * @var \OC\Files\Storage\Storage $storage
-				 */
-				// get data directly
-				$data = $storage->getMetaData($internalPath);
-				$info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
-			} else {
-				$info = null;
-			}
-		} else {
-			// resolve chunk file name to real name, if applicable
-			$path = $this->resolveChunkFile($path);
-
-			// read from cache
-			try {
-				$info = $this->fileView->getFileInfo($path);
-
-				if ($info instanceof \OCP\Files\FileInfo && $info->getStorage()->instanceOfStorage(FailedStorage::class)) {
-					throw new StorageNotAvailableException();
-				}
-			} catch (StorageNotAvailableException $e) {
-				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available', 0, $e);
-			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
-			} catch (LockedException $e) {
-				throw new \Sabre\DAV\Exception\Locked();
-			} catch (ForbiddenException $e) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		}
-
-		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
-		}
-
-		if ($info->getType() === 'dir') {
-			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this);
-		} else {
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
-		}
-
-		$this->cache[$path] = $node;
-		return $node;
-	}
-
-	/**
-	 * Copies a file or directory.
-	 *
-	 * This method must work recursively and delete the destination
-	 * if it exists
-	 *
-	 * @param string $sourcePath
-	 * @param string $destinationPath
-	 * @throws FileLocked
-	 * @throws Forbidden
-	 * @throws InvalidPath
-	 * @throws \Exception
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 * @return void
-	 */
-	public function copy($sourcePath, $destinationPath) {
-		if (!$this->fileView) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
-		}
-
-
-		$info = $this->fileView->getFileInfo(dirname($destinationPath));
-		if ($this->fileView->file_exists($destinationPath)) {
-			$destinationPermission = $info && $info->isUpdateable();
-		} else {
-			$destinationPermission = $info && $info->isCreatable();
-		}
-		if (!$destinationPermission) {
-			throw new Forbidden('No permissions to copy object.');
-		}
-
-		// this will trigger existence check
-		$this->getNodeForPath($sourcePath);
-
-		[$destinationDir, $destinationName] = \Sabre\Uri\split($destinationPath);
-		try {
-			$this->fileView->verifyPath($destinationDir, $destinationName);
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		}
-
-		try {
-			$this->fileView->copy($sourcePath, $destinationPath);
-		} catch (StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
-		[$destinationDir,] = \Sabre\Uri\split($destinationPath);
-		$this->markDirty($destinationDir);
-	}
+    /**
+     * @var \OC\Files\View
+     */
+    protected $fileView;
+
+    /**
+     * @var  \OCP\Files\Mount\IMountManager
+     */
+    protected $mountManager;
+
+    /**
+     * Creates the object
+     */
+    public function __construct() {
+    }
+
+    /**
+     * @param \Sabre\DAV\INode $rootNode
+     * @param \OC\Files\View $view
+     * @param  \OCP\Files\Mount\IMountManager $mountManager
+     */
+    public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OCP\Files\Mount\IMountManager $mountManager) {
+        $this->rootNode = $rootNode;
+        $this->fileView = $view;
+        $this->mountManager = $mountManager;
+    }
+
+    /**
+     * If the given path is a chunked file name, converts it
+     * to the real file name. Only applies if the OC-CHUNKED header
+     * is present.
+     *
+     * @param string $path chunk file path to convert
+     *
+     * @return string path to real file
+     */
+    private function resolveChunkFile($path) {
+        if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            // resolve to real file name to find the proper node
+            [$dir, $name] = \Sabre\Uri\split($path);
+            if ($dir === '/' || $dir === '.') {
+                $dir = '';
+            }
+
+            $info = \OC_FileChunking::decodeName($name);
+            // only replace path if it was really the chunked file
+            if (isset($info['transferid'])) {
+                // getNodePath is called for multiple nodes within a chunk
+                // upload call
+                $path = $dir . '/' . $info['name'];
+                $path = ltrim($path, '/');
+            }
+        }
+        return $path;
+    }
+
+    /**
+     * Returns the INode object for the requested path
+     *
+     * @param string $path
+     * @return \Sabre\DAV\INode
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function getNodeForPath($path) {
+        if (!$this->fileView) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
+        }
+
+        $path = trim($path, '/');
+
+        if (isset($this->cache[$path])) {
+            return $this->cache[$path];
+        }
+
+        if ($path) {
+            try {
+                $this->fileView->verifyPath($path, basename($path));
+            } catch (\OCP\Files\InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            }
+        }
+
+        // Is it the root node?
+        if (!strlen($path)) {
+            return $this->rootNode;
+        }
+
+        if (pathinfo($path, PATHINFO_EXTENSION) === 'part') {
+            // read from storage
+            $absPath = $this->fileView->getAbsolutePath($path);
+            $mount = $this->fileView->getMount($path);
+            $storage = $mount->getStorage();
+            $internalPath = $mount->getInternalPath($absPath);
+            if ($storage && $storage->file_exists($internalPath)) {
+                /**
+                 * @var \OC\Files\Storage\Storage $storage
+                 */
+                // get data directly
+                $data = $storage->getMetaData($internalPath);
+                $info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
+            } else {
+                $info = null;
+            }
+        } else {
+            // resolve chunk file name to real name, if applicable
+            $path = $this->resolveChunkFile($path);
+
+            // read from cache
+            try {
+                $info = $this->fileView->getFileInfo($path);
+
+                if ($info instanceof \OCP\Files\FileInfo && $info->getStorage()->instanceOfStorage(FailedStorage::class)) {
+                    throw new StorageNotAvailableException();
+                }
+            } catch (StorageNotAvailableException $e) {
+                throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available', 0, $e);
+            } catch (StorageInvalidException $e) {
+                throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+            } catch (LockedException $e) {
+                throw new \Sabre\DAV\Exception\Locked();
+            } catch (ForbiddenException $e) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        }
+
+        if (!$info) {
+            throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+        }
+
+        if ($info->getType() === 'dir') {
+            $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this);
+        } else {
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
+        }
+
+        $this->cache[$path] = $node;
+        return $node;
+    }
+
+    /**
+     * Copies a file or directory.
+     *
+     * This method must work recursively and delete the destination
+     * if it exists
+     *
+     * @param string $sourcePath
+     * @param string $destinationPath
+     * @throws FileLocked
+     * @throws Forbidden
+     * @throws InvalidPath
+     * @throws \Exception
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     * @return void
+     */
+    public function copy($sourcePath, $destinationPath) {
+        if (!$this->fileView) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
+        }
+
+
+        $info = $this->fileView->getFileInfo(dirname($destinationPath));
+        if ($this->fileView->file_exists($destinationPath)) {
+            $destinationPermission = $info && $info->isUpdateable();
+        } else {
+            $destinationPermission = $info && $info->isCreatable();
+        }
+        if (!$destinationPermission) {
+            throw new Forbidden('No permissions to copy object.');
+        }
+
+        // this will trigger existence check
+        $this->getNodeForPath($sourcePath);
+
+        [$destinationDir, $destinationName] = \Sabre\Uri\split($destinationPath);
+        try {
+            $this->fileView->verifyPath($destinationDir, $destinationName);
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        }
+
+        try {
+            $this->fileView->copy($sourcePath, $destinationPath);
+        } catch (StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+
+        [$destinationDir,] = \Sabre\Uri\split($destinationPath);
+        $this->markDirty($destinationDir);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
 			if (isset($info['transferid'])) {
 				// getNodePath is called for multiple nodes within a chunk
 				// upload call
-				$path = $dir . '/' . $info['name'];
+				$path = $dir.'/'.$info['name'];
 				$path = ltrim($path, '/');
 			}
 		}
@@ -161,7 +161,7 @@ 
 			} catch (StorageNotAvailableException $e) {
 				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available', 0, $e);
 			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+				throw new \Sabre\DAV\Exception\NotFound('Storage '.$path.' is invalid');
 			} catch (LockedException $e) {
 				throw new \Sabre\DAV\Exception\Locked();
 			} catch (ForbiddenException $e) {
@@ -170,7 +170,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info->getType() === 'dir') {
@@ -237,7 +237,7 @@ 
 			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
 		}
 
-		[$destinationDir,] = \Sabre\Uri\split($destinationPath);
+		[$destinationDir, ] = \Sabre\Uri\split($destinationPath);
 		$this->markDirty($destinationDir);
 	}
 }

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

Spacing +14 added lines, -14 removed lines

@@ -127,7 +127,7 @@ 
 				// exit if we can't create a new file and we don't updatable existing file
 				$chunkInfo = \OC_FileChunking::decodeName($name);
 				if (!$this->fileView->isCreatable($this->path) &&
-					!$this->fileView->isUpdatable($this->path . '/' . $chunkInfo['name'])
+					!$this->fileView->isUpdatable($this->path.'/'.$chunkInfo['name'])
 				) {
 					throw new \Sabre\DAV\Exception\Forbidden();
 				}
@@ -140,9 +140,9 @@ 
 
 			$this->fileView->verifyPath($this->path, $name);
 
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
+			$path = $this->fileView->getAbsolutePath($this->path).'/'.$name;
 			// in case the file already exists/overwriting
-			$info = $this->fileView->getFileInfo($this->path . '/' . $name);
+			$info = $this->fileView->getFileInfo($this->path.'/'.$name);
 			if (!$info) {
 				// use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
 				$info = new \OC\Files\FileInfo($path, null, null, [
@@ -153,11 +153,11 @@ 
 
 			// only allow 1 process to upload a file at once but still allow reading the file while writing the part file
 			$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			$this->fileView->lockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
+			$this->fileView->lockFile($path.'.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
 
 			$result = $node->put($data);
 
-			$this->fileView->unlockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
+			$this->fileView->unlockFile($path.'.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
 			$node->releaseLock(ILockingProvider::LOCK_SHARED);
 			return $result;
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
@@ -187,9 +187,9 @@ 
 			}
 
 			$this->fileView->verifyPath($this->path, $name);
-			$newPath = $this->path . '/' . $name;
+			$newPath = $this->path.'/'.$name;
 			if (!$this->fileView->mkdir($newPath)) {
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
+				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
 			}
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
@@ -218,7 +218,7 @@ 
 			throw new NotFound();
 		}
 
-		$path = $this->path . '/' . $name;
+		$path = $this->path.'/'.$name;
 		if (is_null($info)) {
 			try {
 				$this->fileView->verifyPath($this->path, $name);
@@ -233,7 +233,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
@@ -292,7 +292,7 @@ 
 		// (required old code) instead of "updateFile".
 		//
 		// TODO: resolve chunk file name here and implement "updateFile"
-		$path = $this->path . '/' . $name;
+		$path = $this->path.'/'.$name;
 		return $this->fileView->file_exists($path);
 	}
 
@@ -389,7 +389,7 @@ 
 			throw new ServiceUnavailable('filesystem not setup');
 		}
 
-		$destinationPath = $this->getPath() . '/' . $targetName;
+		$destinationPath = $this->getPath().'/'.$targetName;
 
 
 		$targetNodeExists = $this->childExists($targetName);
@@ -397,10 +397,10 @@ 
 		// at getNodeForPath we also check the path for isForbiddenFileOrDir
 		// with that we have covered both source and destination
 		if ($sourceNode instanceof Directory && $targetNodeExists) {
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
+			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory '.$sourceNode->getName().', target exists');
 		}
 
-		[$sourceDir,] = \Sabre\Uri\split($sourceNode->getPath());
+		[$sourceDir, ] = \Sabre\Uri\split($sourceNode->getPath());
 		$destinationDir = $this->getPath();
 
 		$sourcePath = $sourceNode->getPath();
@@ -459,7 +459,7 @@ 
 
 	public function copyInto($targetName, $sourcePath, INode $sourceNode) {
 		if ($sourceNode instanceof File || $sourceNode instanceof Directory) {
-			$destinationPath = $this->getPath() . '/' . $targetName;
+			$destinationPath = $this->getPath().'/'.$targetName;
 			$sourcePath = $sourceNode->getPath();
 
 			if (!$this->fileView->isCreatable($this->getPath())) {

Indentation +425 added lines, -425 removed lines

@@ -58,429 +58,429 @@
 
 class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget, \Sabre\DAV\ICopyTarget {
 
-	/**
-	 * Cached directory content
-	 * @var \OCP\Files\FileInfo[]
-	 */
-	private ?array $dirContent = null;
-
-	/** Cached quota info */
-	private ?array $quotaInfo = null;
-	private ?CachingTree $tree = null;
-
-	/** @var array<string, array<int, FileMetadata>> */
-	private array $metadata = [];
-
-	/**
-	 * Sets up the node, expects a full path name
-	 */
-	public function __construct(View $view, FileInfo $info, ?CachingTree $tree = null, IShareManager $shareManager = null) {
-		parent::__construct($view, $info, $shareManager);
-		$this->tree = $tree;
-	}
-
-	/**
-	 * Creates a new file in the directory
-	 *
-	 * Data will either be supplied as a stream resource, or in certain cases
-	 * as a string. Keep in mind that you may have to support either.
-	 *
-	 * After successful creation of the file, you may choose to return the ETag
-	 * of the new file here.
-	 *
-	 * The returned ETag must be surrounded by double-quotes (The quotes should
-	 * be part of the actual string).
-	 *
-	 * If you cannot accurately determine the ETag, you should not return it.
-	 * If you don't store the file exactly as-is (you're transforming it
-	 * somehow) you should also not return an ETag.
-	 *
-	 * This means that if a subsequent GET to this new file does not exactly
-	 * return the same contents of what was submitted here, you are strongly
-	 * recommended to omit the ETag.
-	 *
-	 * @param string $name Name of the file
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Exception\EntityTooLarge
-	 * @throws Exception\UnsupportedMediaType
-	 * @throws FileLocked
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function createFile($name, $data = null) {
-		try {
-			// for chunked upload also updating a existing file is a "createFile"
-			// because we create all the chunks before re-assemble them to the existing file.
-			if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-
-				// exit if we can't create a new file and we don't updatable existing file
-				$chunkInfo = \OC_FileChunking::decodeName($name);
-				if (!$this->fileView->isCreatable($this->path) &&
-					!$this->fileView->isUpdatable($this->path . '/' . $chunkInfo['name'])
-				) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			} else {
-				// For non-chunked upload it is enough to check if we can create a new file
-				if (!$this->fileView->isCreatable($this->path)) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
-
-			$this->fileView->verifyPath($this->path, $name);
-
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
-			// in case the file already exists/overwriting
-			$info = $this->fileView->getFileInfo($this->path . '/' . $name);
-			if (!$info) {
-				// use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
-				$info = new \OC\Files\FileInfo($path, null, null, [
-					'type' => FileInfo::TYPE_FILE
-				], null);
-			}
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
-
-			// only allow 1 process to upload a file at once but still allow reading the file while writing the part file
-			$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			$this->fileView->lockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
-
-			$result = $node->put($data);
-
-			$this->fileView->unlockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
-			return $result;
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
-		} catch (InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage(), false, $ex);
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * Creates a new subdirectory
-	 *
-	 * @param string $name
-	 * @throws FileLocked
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function createDirectory($name) {
-		try {
-			if (!$this->info->isCreatable()) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-
-			$this->fileView->verifyPath($this->path, $name);
-			$newPath = $this->path . '/' . $name;
-			if (!$this->fileView->mkdir($newPath)) {
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
-			}
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-		} catch (InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * @param string $name
-	 * @param \OCP\Files\FileInfo $info
-	 * @return \Sabre\DAV\INode
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function getChild($name, $info = null) {
-		if (!$this->info->isReadable()) {
-			// avoid detecting files through this way
-			throw new NotFound();
-		}
-
-		$path = $this->path . '/' . $name;
-		if (is_null($info)) {
-			try {
-				$this->fileView->verifyPath($this->path, $name);
-				$info = $this->fileView->getFileInfo($path);
-			} catch (\OCP\Files\StorageNotAvailableException $e) {
-				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-			} catch (InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			} catch (ForbiddenException $e) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		}
-
-		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
-		}
-
-		if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
-		} else {
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
-		}
-		if ($this->tree) {
-			$this->tree->cacheNode($node);
-		}
-		return $node;
-	}
-
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \OCA\DAV\Connector\Sabre\Exception\Forbidden
-	 */
-	public function getChildren() {
-		if (!is_null($this->dirContent)) {
-			return $this->dirContent;
-		}
-		try {
-			if (!$this->info->isReadable()) {
-				// return 403 instead of 404 because a 404 would make
-				// the caller believe that the collection itself does not exist
-				if (\OCP\Server::get(\OCP\App\IAppManager::class)->isInstalled('files_accesscontrol')) {
-					throw new Forbidden('No read permissions. This might be caused by files_accesscontrol, check your configured rules');
-				} else {
-					throw new Forbidden('No read permissions');
-				}
-			}
-			$folderContent = $this->getNode()->getDirectoryListing();
-		} catch (LockedException $e) {
-			throw new Locked();
-		}
-
-		$nodes = [];
-		foreach ($folderContent as $info) {
-			$node = $this->getChild($info->getName(), $info);
-			$nodes[] = $node;
-		}
-		$this->dirContent = $nodes;
-		return $this->dirContent;
-	}
-
-	/**
-	 * Checks if a child exists.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		// note: here we do NOT resolve the chunk file name to the real file name
-		// to make sure we return false when checking for file existence with a chunk
-		// file name.
-		// This is to make sure that "createFile" is still triggered
-		// (required old code) instead of "updateFile".
-		//
-		// TODO: resolve chunk file name here and implement "updateFile"
-		$path = $this->path . '/' . $name;
-		return $this->fileView->file_exists($path);
-	}
-
-	/**
-	 * Deletes all files in this directory, and then itself
-	 *
-	 * @return void
-	 * @throws FileLocked
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function delete() {
-		if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-
-		try {
-			if (!$this->fileView->rmdir($this->path)) {
-				// assume it wasn't possible to remove due to permission issue
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * Returns available diskspace information
-	 *
-	 * @return array
-	 */
-	public function getQuotaInfo() {
-		/** @var LoggerInterface $logger */
-		$logger = \OC::$server->get(LoggerInterface::class);
-		if ($this->quotaInfo) {
-			return $this->quotaInfo;
-		}
-		try {
-			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info, false);
-			if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-				$free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
-			} else {
-				$free = $storageInfo['free'];
-			}
-			$this->quotaInfo = [
-				$storageInfo['used'],
-				$free
-			];
-			return $this->quotaInfo;
-		} catch (\OCP\Files\NotFoundException $e) {
-			$logger->warning("error while getting quota into", ['exception' => $e]);
-			return [0, 0];
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			$logger->warning("error while getting quota into", ['exception' => $e]);
-			return [0, 0];
-		} catch (NotPermittedException $e) {
-			$logger->warning("error while getting quota into", ['exception' => $e]);
-			return [0, 0];
-		}
-	}
-
-	/**
-	 * Moves a node into this collection.
-	 *
-	 * It is up to the implementors to:
-	 *   1. Create the new resource.
-	 *   2. Remove the old resource.
-	 *   3. Transfer any properties or other data.
-	 *
-	 * Generally you should make very sure that your collection can easily move
-	 * the move.
-	 *
-	 * If you don't, just return false, which will trigger sabre/dav to handle
-	 * the move itself. If you return true from this function, the assumption
-	 * is that the move was successful.
-	 *
-	 * @param string $targetName New local file/collection name.
-	 * @param string $fullSourcePath Full path to source node
-	 * @param INode $sourceNode Source node itself
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws ServiceUnavailable
-	 * @throws Forbidden
-	 * @throws FileLocked
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function moveInto($targetName, $fullSourcePath, INode $sourceNode) {
-		if (!$sourceNode instanceof Node) {
-			// it's a file of another kind, like FutureFile
-			if ($sourceNode instanceof IFile) {
-				// fallback to default copy+delete handling
-				return false;
-			}
-			throw new BadRequest('Incompatible node types');
-		}
-
-		if (!$this->fileView) {
-			throw new ServiceUnavailable('filesystem not setup');
-		}
-
-		$destinationPath = $this->getPath() . '/' . $targetName;
-
-
-		$targetNodeExists = $this->childExists($targetName);
-
-		// at getNodeForPath we also check the path for isForbiddenFileOrDir
-		// with that we have covered both source and destination
-		if ($sourceNode instanceof Directory && $targetNodeExists) {
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
-		}
-
-		[$sourceDir,] = \Sabre\Uri\split($sourceNode->getPath());
-		$destinationDir = $this->getPath();
-
-		$sourcePath = $sourceNode->getPath();
-
-		$isMovableMount = false;
-		$sourceMount = \OC::$server->getMountManager()->find($this->fileView->getAbsolutePath($sourcePath));
-		$internalPath = $sourceMount->getInternalPath($this->fileView->getAbsolutePath($sourcePath));
-		if ($sourceMount instanceof MoveableMount && $internalPath === '') {
-			$isMovableMount = true;
-		}
-
-		try {
-			$sameFolder = ($sourceDir === $destinationDir);
-			// if we're overwriting or same folder
-			if ($targetNodeExists || $sameFolder) {
-				// note that renaming a share mount point is always allowed
-				if (!$this->fileView->isUpdatable($destinationDir) && !$isMovableMount) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			} else {
-				if (!$this->fileView->isCreatable($destinationDir)) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
-
-			if (!$sameFolder) {
-				// moving to a different folder, source will be gone, like a deletion
-				// note that moving a share mount point is always allowed
-				if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
-
-			$fileName = basename($destinationPath);
-			try {
-				$this->fileView->verifyPath($destinationDir, $fileName);
-			} catch (InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			}
-
-			$renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
-			if (!$renameOkay) {
-				throw new \Sabre\DAV\Exception\Forbidden('');
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($e->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
-		return true;
-	}
-
-
-	public function copyInto($targetName, $sourcePath, INode $sourceNode) {
-		if ($sourceNode instanceof File || $sourceNode instanceof Directory) {
-			$destinationPath = $this->getPath() . '/' . $targetName;
-			$sourcePath = $sourceNode->getPath();
-
-			if (!$this->fileView->isCreatable($this->getPath())) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-
-			try {
-				$this->fileView->verifyPath($this->getPath(), $targetName);
-			} catch (InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			}
-
-			return $this->fileView->copy($sourcePath, $destinationPath);
-		}
-
-		return false;
-	}
-
-	public function getNode(): Folder {
-		return $this->node;
-	}
+    /**
+     * Cached directory content
+     * @var \OCP\Files\FileInfo[]
+     */
+    private ?array $dirContent = null;
+
+    /** Cached quota info */
+    private ?array $quotaInfo = null;
+    private ?CachingTree $tree = null;
+
+    /** @var array<string, array<int, FileMetadata>> */
+    private array $metadata = [];
+
+    /**
+     * Sets up the node, expects a full path name
+     */
+    public function __construct(View $view, FileInfo $info, ?CachingTree $tree = null, IShareManager $shareManager = null) {
+        parent::__construct($view, $info, $shareManager);
+        $this->tree = $tree;
+    }
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After successful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Exception\EntityTooLarge
+     * @throws Exception\UnsupportedMediaType
+     * @throws FileLocked
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception
+     * @throws \Sabre\DAV\Exception\BadRequest
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function createFile($name, $data = null) {
+        try {
+            // for chunked upload also updating a existing file is a "createFile"
+            // because we create all the chunks before re-assemble them to the existing file.
+            if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+
+                // exit if we can't create a new file and we don't updatable existing file
+                $chunkInfo = \OC_FileChunking::decodeName($name);
+                if (!$this->fileView->isCreatable($this->path) &&
+                    !$this->fileView->isUpdatable($this->path . '/' . $chunkInfo['name'])
+                ) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            } else {
+                // For non-chunked upload it is enough to check if we can create a new file
+                if (!$this->fileView->isCreatable($this->path)) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
+
+            $this->fileView->verifyPath($this->path, $name);
+
+            $path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
+            // in case the file already exists/overwriting
+            $info = $this->fileView->getFileInfo($this->path . '/' . $name);
+            if (!$info) {
+                // use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
+                $info = new \OC\Files\FileInfo($path, null, null, [
+                    'type' => FileInfo::TYPE_FILE
+                ], null);
+            }
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
+
+            // only allow 1 process to upload a file at once but still allow reading the file while writing the part file
+            $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            $this->fileView->lockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
+
+            $result = $node->put($data);
+
+            $this->fileView->unlockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
+            return $result;
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
+        } catch (InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage(), false, $ex);
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws FileLocked
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function createDirectory($name) {
+        try {
+            if (!$this->info->isCreatable()) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+
+            $this->fileView->verifyPath($this->path, $name);
+            $newPath = $this->path . '/' . $name;
+            if (!$this->fileView->mkdir($newPath)) {
+                throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
+            }
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+        } catch (InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @param \OCP\Files\FileInfo $info
+     * @return \Sabre\DAV\INode
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function getChild($name, $info = null) {
+        if (!$this->info->isReadable()) {
+            // avoid detecting files through this way
+            throw new NotFound();
+        }
+
+        $path = $this->path . '/' . $name;
+        if (is_null($info)) {
+            try {
+                $this->fileView->verifyPath($this->path, $name);
+                $info = $this->fileView->getFileInfo($path);
+            } catch (\OCP\Files\StorageNotAvailableException $e) {
+                throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+            } catch (InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            } catch (ForbiddenException $e) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        }
+
+        if (!$info) {
+            throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+        }
+
+        if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
+            $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
+        } else {
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
+        }
+        if ($this->tree) {
+            $this->tree->cacheNode($node);
+        }
+        return $node;
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \OCA\DAV\Connector\Sabre\Exception\Forbidden
+     */
+    public function getChildren() {
+        if (!is_null($this->dirContent)) {
+            return $this->dirContent;
+        }
+        try {
+            if (!$this->info->isReadable()) {
+                // return 403 instead of 404 because a 404 would make
+                // the caller believe that the collection itself does not exist
+                if (\OCP\Server::get(\OCP\App\IAppManager::class)->isInstalled('files_accesscontrol')) {
+                    throw new Forbidden('No read permissions. This might be caused by files_accesscontrol, check your configured rules');
+                } else {
+                    throw new Forbidden('No read permissions');
+                }
+            }
+            $folderContent = $this->getNode()->getDirectoryListing();
+        } catch (LockedException $e) {
+            throw new Locked();
+        }
+
+        $nodes = [];
+        foreach ($folderContent as $info) {
+            $node = $this->getChild($info->getName(), $info);
+            $nodes[] = $node;
+        }
+        $this->dirContent = $nodes;
+        return $this->dirContent;
+    }
+
+    /**
+     * Checks if a child exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        // note: here we do NOT resolve the chunk file name to the real file name
+        // to make sure we return false when checking for file existence with a chunk
+        // file name.
+        // This is to make sure that "createFile" is still triggered
+        // (required old code) instead of "updateFile".
+        //
+        // TODO: resolve chunk file name here and implement "updateFile"
+        $path = $this->path . '/' . $name;
+        return $this->fileView->file_exists($path);
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself
+     *
+     * @return void
+     * @throws FileLocked
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function delete() {
+        if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+
+        try {
+            if (!$this->fileView->rmdir($this->path)) {
+                // assume it wasn't possible to remove due to permission issue
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Returns available diskspace information
+     *
+     * @return array
+     */
+    public function getQuotaInfo() {
+        /** @var LoggerInterface $logger */
+        $logger = \OC::$server->get(LoggerInterface::class);
+        if ($this->quotaInfo) {
+            return $this->quotaInfo;
+        }
+        try {
+            $storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info, false);
+            if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                $free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+            } else {
+                $free = $storageInfo['free'];
+            }
+            $this->quotaInfo = [
+                $storageInfo['used'],
+                $free
+            ];
+            return $this->quotaInfo;
+        } catch (\OCP\Files\NotFoundException $e) {
+            $logger->warning("error while getting quota into", ['exception' => $e]);
+            return [0, 0];
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            $logger->warning("error while getting quota into", ['exception' => $e]);
+            return [0, 0];
+        } catch (NotPermittedException $e) {
+            $logger->warning("error while getting quota into", ['exception' => $e]);
+            return [0, 0];
+        }
+    }
+
+    /**
+     * Moves a node into this collection.
+     *
+     * It is up to the implementors to:
+     *   1. Create the new resource.
+     *   2. Remove the old resource.
+     *   3. Transfer any properties or other data.
+     *
+     * Generally you should make very sure that your collection can easily move
+     * the move.
+     *
+     * If you don't, just return false, which will trigger sabre/dav to handle
+     * the move itself. If you return true from this function, the assumption
+     * is that the move was successful.
+     *
+     * @param string $targetName New local file/collection name.
+     * @param string $fullSourcePath Full path to source node
+     * @param INode $sourceNode Source node itself
+     * @return bool
+     * @throws BadRequest
+     * @throws ServiceUnavailable
+     * @throws Forbidden
+     * @throws FileLocked
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function moveInto($targetName, $fullSourcePath, INode $sourceNode) {
+        if (!$sourceNode instanceof Node) {
+            // it's a file of another kind, like FutureFile
+            if ($sourceNode instanceof IFile) {
+                // fallback to default copy+delete handling
+                return false;
+            }
+            throw new BadRequest('Incompatible node types');
+        }
+
+        if (!$this->fileView) {
+            throw new ServiceUnavailable('filesystem not setup');
+        }
+
+        $destinationPath = $this->getPath() . '/' . $targetName;
+
+
+        $targetNodeExists = $this->childExists($targetName);
+
+        // at getNodeForPath we also check the path for isForbiddenFileOrDir
+        // with that we have covered both source and destination
+        if ($sourceNode instanceof Directory && $targetNodeExists) {
+            throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
+        }
+
+        [$sourceDir,] = \Sabre\Uri\split($sourceNode->getPath());
+        $destinationDir = $this->getPath();
+
+        $sourcePath = $sourceNode->getPath();
+
+        $isMovableMount = false;
+        $sourceMount = \OC::$server->getMountManager()->find($this->fileView->getAbsolutePath($sourcePath));
+        $internalPath = $sourceMount->getInternalPath($this->fileView->getAbsolutePath($sourcePath));
+        if ($sourceMount instanceof MoveableMount && $internalPath === '') {
+            $isMovableMount = true;
+        }
+
+        try {
+            $sameFolder = ($sourceDir === $destinationDir);
+            // if we're overwriting or same folder
+            if ($targetNodeExists || $sameFolder) {
+                // note that renaming a share mount point is always allowed
+                if (!$this->fileView->isUpdatable($destinationDir) && !$isMovableMount) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            } else {
+                if (!$this->fileView->isCreatable($destinationDir)) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
+
+            if (!$sameFolder) {
+                // moving to a different folder, source will be gone, like a deletion
+                // note that moving a share mount point is always allowed
+                if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
+
+            $fileName = basename($destinationPath);
+            try {
+                $this->fileView->verifyPath($destinationDir, $fileName);
+            } catch (InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            }
+
+            $renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
+            if (!$renameOkay) {
+                throw new \Sabre\DAV\Exception\Forbidden('');
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($e->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+
+        return true;
+    }
+
+
+    public function copyInto($targetName, $sourcePath, INode $sourceNode) {
+        if ($sourceNode instanceof File || $sourceNode instanceof Directory) {
+            $destinationPath = $this->getPath() . '/' . $targetName;
+            $sourcePath = $sourceNode->getPath();
+
+            if (!$this->fileView->isCreatable($this->getPath())) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+
+            try {
+                $this->fileView->verifyPath($this->getPath(), $targetName);
+            } catch (InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            }
+
+            return $this->fileView->copy($sourcePath, $destinationPath);
+        }
+
+        return false;
+    }
+
+    public function getNode(): Folder {
+        return $this->node;
+    }
 }

lib/private/Cache/File.php

Spacing +10 added lines, -10 removed lines

@@ -55,10 +55,10 @@ 
 			$rootView = new View();
 			$user = \OC::$server->getUserSession()->getUser();
 			Filesystem::initMountPoints($user->getUID());
-			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
-				$rootView->mkdir('/' . $user->getUID() . '/cache');
+			if (!$rootView->file_exists('/'.$user->getUID().'/cache')) {
+				$rootView->mkdir('/'.$user->getUID().'/cache');
 			}
-			$this->storage = new View('/' . $user->getUID() . '/cache');
+			$this->storage = new View('/'.$user->getUID().'/cache');
 			return $this->storage;
 		} else {
 			\OC::$server->get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
@@ -113,7 +113,7 @@ 
 
 		// use part file to prevent hasKey() to find the key
 		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
+		$keyPart = $key.'.'.$uniqueId.'.part';
 		if ($storage and $storage->file_put_contents($keyPart, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -162,7 +162,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 					if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
-						$storage->unlink('/' . $file);
+						$storage->unlink('/'.$file);
 					}
 				}
 			}
@@ -187,17 +187,17 @@ 
 			while (($file = readdir($dh)) !== false) {
 				if ($file != '.' and $file != '..') {
 					try {
-						$mtime = $storage->filemtime('/' . $file);
+						$mtime = $storage->filemtime('/'.$file);
 						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
+							$storage->unlink('/'.$file);
 						}
 					} catch (\OCP\Lock\LockedException $e) {
 						// ignore locked chunks
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\ForbiddenException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					}
 				}
 			}

Indentation +160 added lines, -160 removed lines

@@ -36,174 +36,174 @@
 use Psr\Log\LoggerInterface;
 
 class File implements ICache {
-	/** @var View */
-	protected $storage;
+    /** @var View */
+    protected $storage;
 
-	/**
-	 * Returns the cache storage for the logged in user
-	 *
-	 * @return \OC\Files\View cache storage
-	 * @throws \OC\ForbiddenException
-	 * @throws \OC\User\NoUserException
-	 */
-	protected function getStorage() {
-		if ($this->storage !== null) {
-			return $this->storage;
-		}
-		if (\OC::$server->getUserSession()->isLoggedIn()) {
-			$rootView = new View();
-			$user = \OC::$server->getUserSession()->getUser();
-			Filesystem::initMountPoints($user->getUID());
-			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
-				$rootView->mkdir('/' . $user->getUID() . '/cache');
-			}
-			$this->storage = new View('/' . $user->getUID() . '/cache');
-			return $this->storage;
-		} else {
-			\OC::$server->get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
-			throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
-		}
-	}
+    /**
+     * Returns the cache storage for the logged in user
+     *
+     * @return \OC\Files\View cache storage
+     * @throws \OC\ForbiddenException
+     * @throws \OC\User\NoUserException
+     */
+    protected function getStorage() {
+        if ($this->storage !== null) {
+            return $this->storage;
+        }
+        if (\OC::$server->getUserSession()->isLoggedIn()) {
+            $rootView = new View();
+            $user = \OC::$server->getUserSession()->getUser();
+            Filesystem::initMountPoints($user->getUID());
+            if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
+                $rootView->mkdir('/' . $user->getUID() . '/cache');
+            }
+            $this->storage = new View('/' . $user->getUID() . '/cache');
+            return $this->storage;
+        } else {
+            \OC::$server->get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
+            throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
+        }
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 * @throws \OC\ForbiddenException
-	 */
-	public function get($key) {
-		$result = null;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->file_get_contents($key);
-		}
-		return $result;
-	}
+    /**
+     * @param string $key
+     * @return mixed|null
+     * @throws \OC\ForbiddenException
+     */
+    public function get($key) {
+        $result = null;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->file_get_contents($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * Returns the size of the stored/cached data
-	 *
-	 * @param string $key
-	 * @return int
-	 */
-	public function size($key) {
-		$result = 0;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->filesize($key);
-		}
-		return $result;
-	}
+    /**
+     * Returns the size of the stored/cached data
+     *
+     * @param string $key
+     * @return int
+     */
+    public function size($key) {
+        $result = 0;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->filesize($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function set($key, $value, $ttl = 0) {
-		$storage = $this->getStorage();
-		$result = false;
-		// unique id to avoid chunk collision, just in case
-		$uniqueId = \OC::$server->getSecureRandom()->generate(
-			16,
-			ISecureRandom::CHAR_ALPHANUMERIC
-		);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function set($key, $value, $ttl = 0) {
+        $storage = $this->getStorage();
+        $result = false;
+        // unique id to avoid chunk collision, just in case
+        $uniqueId = \OC::$server->getSecureRandom()->generate(
+            16,
+            ISecureRandom::CHAR_ALPHANUMERIC
+        );
 
-		// use part file to prevent hasKey() to find the key
-		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
-		if ($storage and $storage->file_put_contents($keyPart, $value)) {
-			if ($ttl === 0) {
-				$ttl = 86400; // 60*60*24
-			}
-			$result = $storage->touch($keyPart, time() + $ttl);
-			$result &= $storage->rename($keyPart, $key);
-		}
-		return $result;
-	}
+        // use part file to prevent hasKey() to find the key
+        // while it is being written
+        $keyPart = $key . '.' . $uniqueId . '.part';
+        if ($storage and $storage->file_put_contents($keyPart, $value)) {
+            if ($ttl === 0) {
+                $ttl = 86400; // 60*60*24
+            }
+            $result = $storage->touch($keyPart, time() + $ttl);
+            $result &= $storage->rename($keyPart, $key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function hasKey($key) {
-		$storage = $this->getStorage();
-		if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $key
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function hasKey($key) {
+        $storage = $this->getStorage();
+        if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function remove($key) {
-		$storage = $this->getStorage();
-		if (!$storage) {
-			return false;
-		}
-		return $storage->unlink($key);
-	}
+    /**
+     * @param string $key
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function remove($key) {
+        $storage = $this->getStorage();
+        if (!$storage) {
+            return false;
+        }
+        return $storage->unlink($key);
+    }
 
-	/**
-	 * @param string $prefix
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function clear($prefix = '') {
-		$storage = $this->getStorage();
-		if ($storage and $storage->is_dir('/')) {
-			$dh = $storage->opendir('/');
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
-						$storage->unlink('/' . $file);
-					}
-				}
-			}
-		}
-		return true;
-	}
+    /**
+     * @param string $prefix
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function clear($prefix = '') {
+        $storage = $this->getStorage();
+        if ($storage and $storage->is_dir('/')) {
+            $dh = $storage->opendir('/');
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
+                        $storage->unlink('/' . $file);
+                    }
+                }
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * Runs GC
-	 * @throws \OC\ForbiddenException
-	 */
-	public function gc() {
-		$storage = $this->getStorage();
-		if ($storage) {
-			// extra hour safety, in case of stray part chunks that take longer to write,
-			// because touch() is only called after the chunk was finished
-			$now = time() - 3600;
-			$dh = $storage->opendir('/');
-			if (!is_resource($dh)) {
-				return null;
-			}
-			while (($file = readdir($dh)) !== false) {
-				if ($file != '.' and $file != '..') {
-					try {
-						$mtime = $storage->filemtime('/' . $file);
-						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
-						}
-					} catch (\OCP\Lock\LockedException $e) {
-						// ignore locked chunks
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
-					} catch (\OCP\Files\ForbiddenException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
-					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Runs GC
+     * @throws \OC\ForbiddenException
+     */
+    public function gc() {
+        $storage = $this->getStorage();
+        if ($storage) {
+            // extra hour safety, in case of stray part chunks that take longer to write,
+            // because touch() is only called after the chunk was finished
+            $now = time() - 3600;
+            $dh = $storage->opendir('/');
+            if (!is_resource($dh)) {
+                return null;
+            }
+            while (($file = readdir($dh)) !== false) {
+                if ($file != '.' and $file != '..') {
+                    try {
+                        $mtime = $storage->filemtime('/' . $file);
+                        if ($mtime < $now) {
+                            $storage->unlink('/' . $file);
+                        }
+                    } catch (\OCP\Lock\LockedException $e) {
+                        // ignore locked chunks
+                        \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+                    } catch (\OCP\Files\ForbiddenException $e) {
+                        \OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+                    } catch (\OCP\Files\LockNotAcquiredException $e) {
+                        \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+                    }
+                }
+            }
+        }
+    }
 
-	public static function isAvailable(): bool {
-		return true;
-	}
+    public static function isAvailable(): bool {
+        return true;
+    }
 }

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

Spacing +17 added lines, -17 removed lines

@@ -165,7 +165,7 @@ 
 
 		if ($needsPartFile) {
 			// mark file as partial while uploading (ignored by the scanner)
-			$partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
+			$partFilePath = $this->getPartFileBasePath($this->path).'.ocTransferId'.rand().'.part';
 
 			if (!$view->isCreatable($partFilePath) && $view->isUpdatable($this->path)) {
 				$needsPartFile = false;
@@ -218,27 +218,27 @@ 
 			if ($this->request->getHeader('X-HASH') !== '') {
 				$hash = $this->request->getHeader('X-HASH');
 				if ($hash === 'all' || $hash === 'md5') {
-					$data = HashWrapper::wrap($data, 'md5', function ($hash) {
-						$this->header('X-Hash-MD5: ' . $hash);
+					$data = HashWrapper::wrap($data, 'md5', function($hash) {
+						$this->header('X-Hash-MD5: '.$hash);
 					});
 				}
 
 				if ($hash === 'all' || $hash === 'sha1') {
-					$data = HashWrapper::wrap($data, 'sha1', function ($hash) {
-						$this->header('X-Hash-SHA1: ' . $hash);
+					$data = HashWrapper::wrap($data, 'sha1', function($hash) {
+						$this->header('X-Hash-SHA1: '.$hash);
 					});
 				}
 
 				if ($hash === 'all' || $hash === 'sha256') {
-					$data = HashWrapper::wrap($data, 'sha256', function ($hash) {
-						$this->header('X-Hash-SHA256: ' . $hash);
+					$data = HashWrapper::wrap($data, 'sha256', function($hash) {
+						$this->header('X-Hash-SHA256: '.$hash);
 					});
 				}
 			}
 
 			if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
 				$isEOF = false;
-				$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function ($stream) use (&$isEOF) {
+				$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function($stream) use (&$isEOF) {
 					$isEOF = feof($stream);
 				});
 
@@ -273,7 +273,7 @@ 
 			if ($result === false) {
 				$expected = -1;
 				if (isset($_SERVER['CONTENT_LENGTH'])) {
-					$expected = (int)$_SERVER['CONTENT_LENGTH'];
+					$expected = (int) $_SERVER['CONTENT_LENGTH'];
 				}
 				if ($expected !== 0) {
 					throw new Exception(
@@ -292,7 +292,7 @@ 
 			// double check if the file was fully received
 			// compare expected and actual size
 			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
-				$expected = (int)$_SERVER['CONTENT_LENGTH'];
+				$expected = (int) $_SERVER['CONTENT_LENGTH'];
 				if ($count !== $expected) {
 					throw new BadRequest(
 						$this->l10n->t(
@@ -350,7 +350,7 @@ 
 					$renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
 					$fileExists = $storage->file_exists($internalPath);
 					if ($renameOkay === false || $fileExists === false) {
-						\OC::$server->get(LoggerInterface::class)->error('renaming part file to final file failed $renameOkay: ' . ($renameOkay ? 'true' : 'false') . ', $fileExists: ' . ($fileExists ? 'true' : 'false') . ')', ['app' => 'webdav']);
+						\OC::$server->get(LoggerInterface::class)->error('renaming part file to final file failed $renameOkay: '.($renameOkay ? 'true' : 'false').', $fileExists: '.($fileExists ? 'true' : 'false').')', ['app' => 'webdav']);
 						throw new Exception($this->l10n->t('Could not rename part file to final file'));
 					}
 				} catch (ForbiddenException $ex) {
@@ -410,7 +410,7 @@ 
 			throw new ServiceUnavailable($this->l10n->t('Failed to check file size: %1$s', [$e->getMessage()]), 0, $e);
 		}
 
-		return '"' . $this->info->getEtag() . '"';
+		return '"'.$this->info->getEtag().'"';
 	}
 
 	private function getPartFileBasePath($path) {
@@ -500,7 +500,7 @@ 
 			// if different, fix DB and refresh cache.
 			if ($this->getSize() !== $this->fileView->filesize($this->getPath())) {
 				$logger = \OC::$server->get(LoggerInterface::class);
-				$logger->warning('fixing cached size of file id=' . $this->getId());
+				$logger->warning('fixing cached size of file id='.$this->getId());
 
 				$this->getFileInfo()->getStorage()->getUpdater()->update($this->getFileInfo()->getInternalPath());
 				$this->refreshInfo();
@@ -599,7 +599,7 @@ 
 		//detect aborted upload
 		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 			if (isset($_SERVER['CONTENT_LENGTH'])) {
-				$expected = (int)$_SERVER['CONTENT_LENGTH'];
+				$expected = (int) $_SERVER['CONTENT_LENGTH'];
 				if ($bytesWritten !== $expected) {
 					$chunk_handler->remove($info['index']);
 					throw new BadRequest(
@@ -617,11 +617,11 @@ 
 
 		if ($chunk_handler->isComplete()) {
 			/** @var Storage $storage */
-			[$storage,] = $this->fileView->resolvePath($path);
+			[$storage, ] = $this->fileView->resolvePath($path);
 			$needsPartFile = $storage->needsPartFile();
 			$partFile = null;
 
-			$targetPath = $path . '/' . $info['name'];
+			$targetPath = $path.'/'.$info['name'];
 			/** @var \OC\Files\Storage\Storage $targetStorage */
 			[$targetStorage, $targetInternalPath] = $this->fileView->resolvePath($targetPath);
 
@@ -637,7 +637,7 @@ 
 
 				if ($needsPartFile) {
 					// we first assembly the target file as a part file
-					$partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part';
+					$partFile = $this->getPartFileBasePath($path.'/'.$info['name']).'.ocTransferId'.$info['transferid'].'.part';
 					/** @var \OC\Files\Storage\Storage $targetStorage */
 					[$partStorage, $partInternalPath] = $this->fileView->resolvePath($partFile);
 

Indentation +715 added lines, -715 removed lines

@@ -77,719 +77,719 @@
 use Sabre\DAV\IFile;
 
 class File extends Node implements IFile {
-	protected $request;
-
-	protected IL10N $l10n;
-
-	/** @var array<string, FileMetadata> */
-	private array $metadata = [];
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\FileInfo $info
-	 * @param \OCP\Share\IManager $shareManager
-	 * @param \OC\AppFramework\Http\Request $request
-	 */
-	public function __construct(View $view, FileInfo $info, IManager $shareManager = null, Request $request = null) {
-		parent::__construct($view, $info, $shareManager);
-
-		// Querying IL10N directly results in a dependency loop
-		/** @var IL10NFactory $l10nFactory */
-		$l10nFactory = \OC::$server->get(IL10NFactory::class);
-		$this->l10n = $l10nFactory->get(Application::APP_ID);
-
-		if (isset($request)) {
-			$this->request = $request;
-		} else {
-			$this->request = \OC::$server->getRequest();
-		}
-	}
-
-	/**
-	 * Updates the data
-	 *
-	 * The data argument is a readable stream resource.
-	 *
-	 * After a successful put operation, you may choose to return an ETag. The
-	 * etag must always be surrounded by double-quotes. These quotes must
-	 * appear in the actual string you're returning.
-	 *
-	 * Clients may use the ETag from a PUT request to later on make sure that
-	 * when they update the file, the contents haven't changed in the mean
-	 * time.
-	 *
-	 * If you don't plan to store the file byte-by-byte, and you return a
-	 * different object on a subsequent GET you are strongly recommended to not
-	 * return an ETag, and just return null.
-	 *
-	 * @param resource $data
-	 *
-	 * @throws Forbidden
-	 * @throws UnsupportedMediaType
-	 * @throws BadRequest
-	 * @throws Exception
-	 * @throws EntityTooLarge
-	 * @throws ServiceUnavailable
-	 * @throws FileLocked
-	 * @return string|null
-	 */
-	public function put($data) {
-		try {
-			$exists = $this->fileView->file_exists($this->path);
-			if ($exists && !$this->info->isUpdateable()) {
-				throw new Forbidden();
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($this->l10n->t('File is not updatable: %1$s', [$e->getMessage()]));
-		}
-
-		// verify path of the target
-		$this->verifyPath();
-
-		// chunked handling
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			try {
-				return $this->createFileChunked($data);
-			} catch (\Exception $e) {
-				$this->convertToSabreException($e);
-			}
-		}
-
-		/** @var Storage $partStorage */
-		[$partStorage] = $this->fileView->resolvePath($this->path);
-		$needsPartFile = $partStorage->needsPartFile() && (strlen($this->path) > 1);
-
-		$view = \OC\Files\Filesystem::getView();
-
-		if ($needsPartFile) {
-			// mark file as partial while uploading (ignored by the scanner)
-			$partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
-
-			if (!$view->isCreatable($partFilePath) && $view->isUpdatable($this->path)) {
-				$needsPartFile = false;
-			}
-		}
-		if (!$needsPartFile) {
-			// upload file directly as the final path
-			$partFilePath = $this->path;
-
-			if ($view && !$this->emitPreHooks($exists)) {
-				throw new Exception($this->l10n->t('Could not write to final file, canceled by hook'));
-			}
-		}
-
-		// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
-		/** @var \OC\Files\Storage\Storage $partStorage */
-		[$partStorage, $internalPartPath] = $this->fileView->resolvePath($partFilePath);
-		/** @var \OC\Files\Storage\Storage $storage */
-		[$storage, $internalPath] = $this->fileView->resolvePath($this->path);
-		try {
-			if (!$needsPartFile) {
-				try {
-					$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
-				} catch (LockedException $e) {
-					// during very large uploads, the shared lock we got at the start might have been expired
-					// meaning that the above lock can fail not just only because somebody else got a shared lock
-					// or because there is no existing shared lock to make exclusive
-					//
-					// Thus we try to get a new exclusive lock, if the original lock failed because of a different shared
-					// lock this will still fail, if our original shared lock expired the new lock will be successful and
-					// the entire operation will be safe
-
-					try {
-						$this->acquireLock(ILockingProvider::LOCK_EXCLUSIVE);
-					} catch (LockedException $ex) {
-						throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-					}
-				}
-			}
-
-			if (!is_resource($data)) {
-				$tmpData = fopen('php://temp', 'r+');
-				if ($data !== null) {
-					fwrite($tmpData, $data);
-					rewind($tmpData);
-				}
-				$data = $tmpData;
-			}
-
-			if ($this->request->getHeader('X-HASH') !== '') {
-				$hash = $this->request->getHeader('X-HASH');
-				if ($hash === 'all' || $hash === 'md5') {
-					$data = HashWrapper::wrap($data, 'md5', function ($hash) {
-						$this->header('X-Hash-MD5: ' . $hash);
-					});
-				}
-
-				if ($hash === 'all' || $hash === 'sha1') {
-					$data = HashWrapper::wrap($data, 'sha1', function ($hash) {
-						$this->header('X-Hash-SHA1: ' . $hash);
-					});
-				}
-
-				if ($hash === 'all' || $hash === 'sha256') {
-					$data = HashWrapper::wrap($data, 'sha256', function ($hash) {
-						$this->header('X-Hash-SHA256: ' . $hash);
-					});
-				}
-			}
-
-			if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
-				$isEOF = false;
-				$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function ($stream) use (&$isEOF) {
-					$isEOF = feof($stream);
-				});
-
-				$result = true;
-				$count = -1;
-				try {
-					$count = $partStorage->writeStream($internalPartPath, $wrappedData);
-				} catch (GenericFileException $e) {
-					$result = false;
-				} catch (BadGateway $e) {
-					throw $e;
-				}
-
-
-				if ($result === false) {
-					$result = $isEOF;
-					if (is_resource($wrappedData)) {
-						$result = feof($wrappedData);
-					}
-				}
-			} else {
-				$target = $partStorage->fopen($internalPartPath, 'wb');
-				if ($target === false) {
-					\OC::$server->get(LoggerInterface::class)->error('\OC\Files\Filesystem::fopen() failed', ['app' => 'webdav']);
-					// because we have no clue about the cause we can only throw back a 500/Internal Server Error
-					throw new Exception($this->l10n->t('Could not write file contents'));
-				}
-				[$count, $result] = \OC_Helper::streamCopy($data, $target);
-				fclose($target);
-			}
-
-			if ($result === false) {
-				$expected = -1;
-				if (isset($_SERVER['CONTENT_LENGTH'])) {
-					$expected = (int)$_SERVER['CONTENT_LENGTH'];
-				}
-				if ($expected !== 0) {
-					throw new Exception(
-						$this->l10n->t(
-							'Error while copying file to target location (copied: %1$s, expected filesize: %2$s)',
-							[
-								$this->l10n->n('%n byte', '%n bytes', $count),
-								$this->l10n->n('%n byte', '%n bytes', $expected),
-							],
-						)
-					);
-				}
-			}
-
-			// if content length is sent by client:
-			// double check if the file was fully received
-			// compare expected and actual size
-			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
-				$expected = (int)$_SERVER['CONTENT_LENGTH'];
-				if ($count !== $expected) {
-					throw new BadRequest(
-						$this->l10n->t(
-							'Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side.',
-							[
-								$this->l10n->n('%n byte', '%n bytes', $expected),
-								$this->l10n->n('%n byte', '%n bytes', $count),
-							],
-						)
-					);
-				}
-			}
-		} catch (\Exception $e) {
-			if ($e instanceof LockedException) {
-				\OC::$server->get(LoggerInterface::class)->debug($e->getMessage(), ['exception' => $e]);
-			} else {
-				\OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
-			}
-
-			if ($needsPartFile) {
-				$partStorage->unlink($internalPartPath);
-			}
-			$this->convertToSabreException($e);
-		}
-
-		try {
-			if ($needsPartFile) {
-				if ($view && !$this->emitPreHooks($exists)) {
-					$partStorage->unlink($internalPartPath);
-					throw new Exception($this->l10n->t('Could not rename part file to final file, canceled by hook'));
-				}
-				try {
-					$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
-				} catch (LockedException $e) {
-					// during very large uploads, the shared lock we got at the start might have been expired
-					// meaning that the above lock can fail not just only because somebody else got a shared lock
-					// or because there is no existing shared lock to make exclusive
-					//
-					// Thus we try to get a new exclusive lock, if the original lock failed because of a different shared
-					// lock this will still fail, if our original shared lock expired the new lock will be successful and
-					// the entire operation will be safe
-
-					try {
-						$this->acquireLock(ILockingProvider::LOCK_EXCLUSIVE);
-					} catch (LockedException $ex) {
-						if ($needsPartFile) {
-							$partStorage->unlink($internalPartPath);
-						}
-						throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-					}
-				}
-
-				// rename to correct path
-				try {
-					$renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
-					$fileExists = $storage->file_exists($internalPath);
-					if ($renameOkay === false || $fileExists === false) {
-						\OC::$server->get(LoggerInterface::class)->error('renaming part file to final file failed $renameOkay: ' . ($renameOkay ? 'true' : 'false') . ', $fileExists: ' . ($fileExists ? 'true' : 'false') . ')', ['app' => 'webdav']);
-						throw new Exception($this->l10n->t('Could not rename part file to final file'));
-					}
-				} catch (ForbiddenException $ex) {
-					if (!$ex->getRetry()) {
-						$partStorage->unlink($internalPartPath);
-					}
-					throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
-				} catch (\Exception $e) {
-					$partStorage->unlink($internalPartPath);
-					$this->convertToSabreException($e);
-				}
-			}
-
-			// since we skipped the view we need to scan and emit the hooks ourselves
-			$storage->getUpdater()->update($internalPath);
-
-			try {
-				$this->changeLock(ILockingProvider::LOCK_SHARED);
-			} catch (LockedException $e) {
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-			}
-
-			// allow sync clients to send the mtime along in a header
-			if (isset($this->request->server['HTTP_X_OC_MTIME'])) {
-				$mtime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_MTIME']);
-				if ($this->fileView->touch($this->path, $mtime)) {
-					$this->header('X-OC-MTime: accepted');
-				}
-			}
-
-			$fileInfoUpdate = [
-				'upload_time' => time()
-			];
-
-			// allow sync clients to send the creation time along in a header
-			if (isset($this->request->server['HTTP_X_OC_CTIME'])) {
-				$ctime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_CTIME']);
-				$fileInfoUpdate['creation_time'] = $ctime;
-				$this->header('X-OC-CTime: accepted');
-			}
-
-			$this->fileView->putFileInfo($this->path, $fileInfoUpdate);
-
-			if ($view) {
-				$this->emitPostHooks($exists);
-			}
-
-			$this->refreshInfo();
-
-			if (isset($this->request->server['HTTP_OC_CHECKSUM'])) {
-				$checksum = trim($this->request->server['HTTP_OC_CHECKSUM']);
-				$this->setChecksum($checksum);
-			} elseif ($this->getChecksum() !== null && $this->getChecksum() !== '') {
-				$this->setChecksum('');
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($this->l10n->t('Failed to check file size: %1$s', [$e->getMessage()]), 0, $e);
-		}
-
-		return '"' . $this->info->getEtag() . '"';
-	}
-
-	private function getPartFileBasePath($path) {
-		$partFileInStorage = \OC::$server->getConfig()->getSystemValue('part_file_in_storage', true);
-		if ($partFileInStorage) {
-			return $path;
-		} else {
-			return md5($path); // will place it in the root of the view with a unique name
-		}
-	}
-
-	/**
-	 * @param string $path
-	 */
-	private function emitPreHooks($exists, $path = null) {
-		if (is_null($path)) {
-			$path = $this->path;
-		}
-		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
-		$run = true;
-
-		if (!$exists) {
-			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_create, [
-				\OC\Files\Filesystem::signal_param_path => $hookPath,
-				\OC\Files\Filesystem::signal_param_run => &$run,
-			]);
-		} else {
-			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_update, [
-				\OC\Files\Filesystem::signal_param_path => $hookPath,
-				\OC\Files\Filesystem::signal_param_run => &$run,
-			]);
-		}
-		\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_write, [
-			\OC\Files\Filesystem::signal_param_path => $hookPath,
-			\OC\Files\Filesystem::signal_param_run => &$run,
-		]);
-		return $run;
-	}
-
-	/**
-	 * @param string $path
-	 */
-	private function emitPostHooks($exists, $path = null) {
-		if (is_null($path)) {
-			$path = $this->path;
-		}
-		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
-		if (!$exists) {
-			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, [
-				\OC\Files\Filesystem::signal_param_path => $hookPath
-			]);
-		} else {
-			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_update, [
-				\OC\Files\Filesystem::signal_param_path => $hookPath
-			]);
-		}
-		\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_write, [
-			\OC\Files\Filesystem::signal_param_path => $hookPath
-		]);
-	}
-
-	/**
-	 * Returns the data
-	 *
-	 * @return resource
-	 * @throws Forbidden
-	 * @throws ServiceUnavailable
-	 */
-	public function get() {
-		//throw exception if encryption is disabled but files are still encrypted
-		try {
-			if (!$this->info->isReadable()) {
-				// do a if the file did not exist
-				throw new NotFound();
-			}
-			try {
-				$res = $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
-			} catch (\Exception $e) {
-				$this->convertToSabreException($e);
-			}
-
-			if ($res === false) {
-				throw new ServiceUnavailable($this->l10n->t('Could not open file'));
-			}
-
-			// comparing current file size with the one in DB
-			// if different, fix DB and refresh cache.
-			if ($this->getSize() !== $this->fileView->filesize($this->getPath())) {
-				$logger = \OC::$server->get(LoggerInterface::class);
-				$logger->warning('fixing cached size of file id=' . $this->getId());
-
-				$this->getFileInfo()->getStorage()->getUpdater()->update($this->getFileInfo()->getInternalPath());
-				$this->refreshInfo();
-			}
-
-			return $res;
-		} catch (GenericEncryptionException $e) {
-			// returning 503 will allow retry of the operation at a later point in time
-			throw new ServiceUnavailable($this->l10n->t('Encryption not ready: %1$s', [$e->getMessage()]));
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($this->l10n->t('Failed to open file: %1$s', [$e->getMessage()]));
-		} catch (ForbiddenException $ex) {
-			throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * Delete the current file
-	 *
-	 * @throws Forbidden
-	 * @throws ServiceUnavailable
-	 */
-	public function delete() {
-		if (!$this->info->isDeletable()) {
-			throw new Forbidden();
-		}
-
-		try {
-			if (!$this->fileView->unlink($this->path)) {
-				// assume it wasn't possible to delete due to permissions
-				throw new Forbidden();
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($this->l10n->t('Failed to unlink: %1$s', [$e->getMessage()]));
-		} catch (ForbiddenException $ex) {
-			throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * Returns the mime-type for a file
-	 *
-	 * If null is returned, we'll assume application/octet-stream
-	 *
-	 * @return string
-	 */
-	public function getContentType() {
-		$mimeType = $this->info->getMimetype();
-
-		// PROPFIND needs to return the correct mime type, for consistency with the web UI
-		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
-			return $mimeType;
-		}
-		return \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType);
-	}
-
-	/**
-	 * @return array|bool
-	 */
-	public function getDirectDownload() {
-		if (\OCP\Server::get(\OCP\App\IAppManager::class)->isEnabledForUser('encryption')) {
-			return [];
-		}
-		/** @var \OCP\Files\Storage $storage */
-		[$storage, $internalPath] = $this->fileView->resolvePath($this->path);
-		if (is_null($storage)) {
-			return [];
-		}
-
-		return $storage->getDirectDownload($internalPath);
-	}
-
-	/**
-	 * @param resource $data
-	 * @return null|string
-	 * @throws Exception
-	 * @throws BadRequest
-	 * @throws NotImplemented
-	 * @throws ServiceUnavailable
-	 */
-	private function createFileChunked($data) {
-		[$path, $name] = \Sabre\Uri\split($this->path);
-
-		$info = \OC_FileChunking::decodeName($name);
-		if (empty($info)) {
-			throw new NotImplemented($this->l10n->t('Invalid chunk name'));
-		}
-
-		$chunk_handler = new \OC_FileChunking($info);
-		$bytesWritten = $chunk_handler->store($info['index'], $data);
-
-		//detect aborted upload
-		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
-			if (isset($_SERVER['CONTENT_LENGTH'])) {
-				$expected = (int)$_SERVER['CONTENT_LENGTH'];
-				if ($bytesWritten !== $expected) {
-					$chunk_handler->remove($info['index']);
-					throw new BadRequest(
-						$this->l10n->t(
-							'Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side.',
-							[
-								$this->l10n->n('%n byte', '%n bytes', $expected),
-								$this->l10n->n('%n byte', '%n bytes', $bytesWritten),
-							],
-						)
-					);
-				}
-			}
-		}
-
-		if ($chunk_handler->isComplete()) {
-			/** @var Storage $storage */
-			[$storage,] = $this->fileView->resolvePath($path);
-			$needsPartFile = $storage->needsPartFile();
-			$partFile = null;
-
-			$targetPath = $path . '/' . $info['name'];
-			/** @var \OC\Files\Storage\Storage $targetStorage */
-			[$targetStorage, $targetInternalPath] = $this->fileView->resolvePath($targetPath);
-
-			$exists = $this->fileView->file_exists($targetPath);
-
-			try {
-				$this->fileView->lockFile($targetPath, ILockingProvider::LOCK_SHARED);
-
-				$this->emitPreHooks($exists, $targetPath);
-				$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_EXCLUSIVE);
-				/** @var \OC\Files\Storage\Storage $targetStorage */
-				[$targetStorage, $targetInternalPath] = $this->fileView->resolvePath($targetPath);
-
-				if ($needsPartFile) {
-					// we first assembly the target file as a part file
-					$partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part';
-					/** @var \OC\Files\Storage\Storage $targetStorage */
-					[$partStorage, $partInternalPath] = $this->fileView->resolvePath($partFile);
-
-
-					$chunk_handler->file_assemble($partStorage, $partInternalPath);
-
-					// here is the final atomic rename
-					$renameOkay = $targetStorage->moveFromStorage($partStorage, $partInternalPath, $targetInternalPath);
-					$fileExists = $targetStorage->file_exists($targetInternalPath);
-					if ($renameOkay === false || $fileExists === false) {
-						\OC::$server->get(LoggerInterface::class)->error('\OC\Files\Filesystem::rename() failed', ['app' => 'webdav']);
-						// only delete if an error occurred and the target file was already created
-						if ($fileExists) {
-							// set to null to avoid double-deletion when handling exception
-							// stray part file
-							$partFile = null;
-							$targetStorage->unlink($targetInternalPath);
-						}
-						$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_SHARED);
-						throw new Exception($this->l10n->t('Could not rename part file assembled from chunks'));
-					}
-				} else {
-					// assemble directly into the final file
-					$chunk_handler->file_assemble($targetStorage, $targetInternalPath);
-				}
-
-				// allow sync clients to send the mtime along in a header
-				if (isset($this->request->server['HTTP_X_OC_MTIME'])) {
-					$mtime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_MTIME']);
-					if ($targetStorage->touch($targetInternalPath, $mtime)) {
-						$this->header('X-OC-MTime: accepted');
-					}
-				}
-
-				// since we skipped the view we need to scan and emit the hooks ourselves
-				$targetStorage->getUpdater()->update($targetInternalPath);
-
-				$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_SHARED);
-
-				$this->emitPostHooks($exists, $targetPath);
-
-				// FIXME: should call refreshInfo but can't because $this->path is not the of the final file
-				$info = $this->fileView->getFileInfo($targetPath);
-
-				if (isset($this->request->server['HTTP_OC_CHECKSUM'])) {
-					$checksum = trim($this->request->server['HTTP_OC_CHECKSUM']);
-					$this->fileView->putFileInfo($targetPath, ['checksum' => $checksum]);
-				} elseif ($info->getChecksum() !== null && $info->getChecksum() !== '') {
-					$this->fileView->putFileInfo($this->path, ['checksum' => '']);
-				}
-
-				$this->fileView->unlockFile($targetPath, ILockingProvider::LOCK_SHARED);
-
-				return $info->getEtag();
-			} catch (\Exception $e) {
-				if ($partFile !== null) {
-					$targetStorage->unlink($targetInternalPath);
-				}
-				$this->convertToSabreException($e);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Convert the given exception to a SabreException instance
-	 *
-	 * @param \Exception $e
-	 *
-	 * @throws \Sabre\DAV\Exception
-	 */
-	private function convertToSabreException(\Exception $e) {
-		if ($e instanceof \Sabre\DAV\Exception) {
-			throw $e;
-		}
-		if ($e instanceof NotPermittedException) {
-			// a more general case - due to whatever reason the content could not be written
-			throw new Forbidden($e->getMessage(), 0, $e);
-		}
-		if ($e instanceof ForbiddenException) {
-			// the path for the file was forbidden
-			throw new DAVForbiddenException($e->getMessage(), $e->getRetry(), $e);
-		}
-		if ($e instanceof EntityTooLargeException) {
-			// the file is too big to be stored
-			throw new EntityTooLarge($e->getMessage(), 0, $e);
-		}
-		if ($e instanceof InvalidContentException) {
-			// the file content is not permitted
-			throw new UnsupportedMediaType($e->getMessage(), 0, $e);
-		}
-		if ($e instanceof InvalidPathException) {
-			// the path for the file was not valid
-			// TODO: find proper http status code for this case
-			throw new Forbidden($e->getMessage(), 0, $e);
-		}
-		if ($e instanceof LockedException || $e instanceof LockNotAcquiredException) {
-			// the file is currently being written to by another process
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-		if ($e instanceof GenericEncryptionException) {
-			// returning 503 will allow retry of the operation at a later point in time
-			throw new ServiceUnavailable($this->l10n->t('Encryption not ready: %1$s', [$e->getMessage()]), 0, $e);
-		}
-		if ($e instanceof StorageNotAvailableException) {
-			throw new ServiceUnavailable($this->l10n->t('Failed to write file contents: %1$s', [$e->getMessage()]), 0, $e);
-		}
-		if ($e instanceof NotFoundException) {
-			throw new NotFound($this->l10n->t('File not found: %1$s', [$e->getMessage()]), 0, $e);
-		}
-
-		throw new \Sabre\DAV\Exception($e->getMessage(), 0, $e);
-	}
-
-	/**
-	 * Get the checksum for this file
-	 *
-	 * @return string|null
-	 */
-	public function getChecksum() {
-		return $this->info->getChecksum();
-	}
-
-	public function setChecksum(string $checksum) {
-		$this->fileView->putFileInfo($this->path, ['checksum' => $checksum]);
-		$this->refreshInfo();
-	}
-
-	protected function header($string) {
-		if (!\OC::$CLI) {
-			\header($string);
-		}
-	}
-
-	public function hash(string $type) {
-		return $this->fileView->hash($type, $this->path);
-	}
-
-	public function getNode(): \OCP\Files\File {
-		return $this->node;
-	}
-
-	public function getMetadata(string $group): FileMetadata {
-		return $this->metadata[$group];
-	}
-
-	public function setMetadata(string $group, FileMetadata $metadata): void {
-		$this->metadata[$group] = $metadata;
-	}
-
-	public function hasMetadata(string $group) {
-		return array_key_exists($group, $this->metadata);
-	}
+    protected $request;
+
+    protected IL10N $l10n;
+
+    /** @var array<string, FileMetadata> */
+    private array $metadata = [];
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param \OC\Files\View $view
+     * @param \OCP\Files\FileInfo $info
+     * @param \OCP\Share\IManager $shareManager
+     * @param \OC\AppFramework\Http\Request $request
+     */
+    public function __construct(View $view, FileInfo $info, IManager $shareManager = null, Request $request = null) {
+        parent::__construct($view, $info, $shareManager);
+
+        // Querying IL10N directly results in a dependency loop
+        /** @var IL10NFactory $l10nFactory */
+        $l10nFactory = \OC::$server->get(IL10NFactory::class);
+        $this->l10n = $l10nFactory->get(Application::APP_ID);
+
+        if (isset($request)) {
+            $this->request = $request;
+        } else {
+            $this->request = \OC::$server->getRequest();
+        }
+    }
+
+    /**
+     * Updates the data
+     *
+     * The data argument is a readable stream resource.
+     *
+     * After a successful put operation, you may choose to return an ETag. The
+     * etag must always be surrounded by double-quotes. These quotes must
+     * appear in the actual string you're returning.
+     *
+     * Clients may use the ETag from a PUT request to later on make sure that
+     * when they update the file, the contents haven't changed in the mean
+     * time.
+     *
+     * If you don't plan to store the file byte-by-byte, and you return a
+     * different object on a subsequent GET you are strongly recommended to not
+     * return an ETag, and just return null.
+     *
+     * @param resource $data
+     *
+     * @throws Forbidden
+     * @throws UnsupportedMediaType
+     * @throws BadRequest
+     * @throws Exception
+     * @throws EntityTooLarge
+     * @throws ServiceUnavailable
+     * @throws FileLocked
+     * @return string|null
+     */
+    public function put($data) {
+        try {
+            $exists = $this->fileView->file_exists($this->path);
+            if ($exists && !$this->info->isUpdateable()) {
+                throw new Forbidden();
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($this->l10n->t('File is not updatable: %1$s', [$e->getMessage()]));
+        }
+
+        // verify path of the target
+        $this->verifyPath();
+
+        // chunked handling
+        if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            try {
+                return $this->createFileChunked($data);
+            } catch (\Exception $e) {
+                $this->convertToSabreException($e);
+            }
+        }
+
+        /** @var Storage $partStorage */
+        [$partStorage] = $this->fileView->resolvePath($this->path);
+        $needsPartFile = $partStorage->needsPartFile() && (strlen($this->path) > 1);
+
+        $view = \OC\Files\Filesystem::getView();
+
+        if ($needsPartFile) {
+            // mark file as partial while uploading (ignored by the scanner)
+            $partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
+
+            if (!$view->isCreatable($partFilePath) && $view->isUpdatable($this->path)) {
+                $needsPartFile = false;
+            }
+        }
+        if (!$needsPartFile) {
+            // upload file directly as the final path
+            $partFilePath = $this->path;
+
+            if ($view && !$this->emitPreHooks($exists)) {
+                throw new Exception($this->l10n->t('Could not write to final file, canceled by hook'));
+            }
+        }
+
+        // the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
+        /** @var \OC\Files\Storage\Storage $partStorage */
+        [$partStorage, $internalPartPath] = $this->fileView->resolvePath($partFilePath);
+        /** @var \OC\Files\Storage\Storage $storage */
+        [$storage, $internalPath] = $this->fileView->resolvePath($this->path);
+        try {
+            if (!$needsPartFile) {
+                try {
+                    $this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
+                } catch (LockedException $e) {
+                    // during very large uploads, the shared lock we got at the start might have been expired
+                    // meaning that the above lock can fail not just only because somebody else got a shared lock
+                    // or because there is no existing shared lock to make exclusive
+                    //
+                    // Thus we try to get a new exclusive lock, if the original lock failed because of a different shared
+                    // lock this will still fail, if our original shared lock expired the new lock will be successful and
+                    // the entire operation will be safe
+
+                    try {
+                        $this->acquireLock(ILockingProvider::LOCK_EXCLUSIVE);
+                    } catch (LockedException $ex) {
+                        throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+                    }
+                }
+            }
+
+            if (!is_resource($data)) {
+                $tmpData = fopen('php://temp', 'r+');
+                if ($data !== null) {
+                    fwrite($tmpData, $data);
+                    rewind($tmpData);
+                }
+                $data = $tmpData;
+            }
+
+            if ($this->request->getHeader('X-HASH') !== '') {
+                $hash = $this->request->getHeader('X-HASH');
+                if ($hash === 'all' || $hash === 'md5') {
+                    $data = HashWrapper::wrap($data, 'md5', function ($hash) {
+                        $this->header('X-Hash-MD5: ' . $hash);
+                    });
+                }
+
+                if ($hash === 'all' || $hash === 'sha1') {
+                    $data = HashWrapper::wrap($data, 'sha1', function ($hash) {
+                        $this->header('X-Hash-SHA1: ' . $hash);
+                    });
+                }
+
+                if ($hash === 'all' || $hash === 'sha256') {
+                    $data = HashWrapper::wrap($data, 'sha256', function ($hash) {
+                        $this->header('X-Hash-SHA256: ' . $hash);
+                    });
+                }
+            }
+
+            if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
+                $isEOF = false;
+                $wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function ($stream) use (&$isEOF) {
+                    $isEOF = feof($stream);
+                });
+
+                $result = true;
+                $count = -1;
+                try {
+                    $count = $partStorage->writeStream($internalPartPath, $wrappedData);
+                } catch (GenericFileException $e) {
+                    $result = false;
+                } catch (BadGateway $e) {
+                    throw $e;
+                }
+
+
+                if ($result === false) {
+                    $result = $isEOF;
+                    if (is_resource($wrappedData)) {
+                        $result = feof($wrappedData);
+                    }
+                }
+            } else {
+                $target = $partStorage->fopen($internalPartPath, 'wb');
+                if ($target === false) {
+                    \OC::$server->get(LoggerInterface::class)->error('\OC\Files\Filesystem::fopen() failed', ['app' => 'webdav']);
+                    // because we have no clue about the cause we can only throw back a 500/Internal Server Error
+                    throw new Exception($this->l10n->t('Could not write file contents'));
+                }
+                [$count, $result] = \OC_Helper::streamCopy($data, $target);
+                fclose($target);
+            }
+
+            if ($result === false) {
+                $expected = -1;
+                if (isset($_SERVER['CONTENT_LENGTH'])) {
+                    $expected = (int)$_SERVER['CONTENT_LENGTH'];
+                }
+                if ($expected !== 0) {
+                    throw new Exception(
+                        $this->l10n->t(
+                            'Error while copying file to target location (copied: %1$s, expected filesize: %2$s)',
+                            [
+                                $this->l10n->n('%n byte', '%n bytes', $count),
+                                $this->l10n->n('%n byte', '%n bytes', $expected),
+                            ],
+                        )
+                    );
+                }
+            }
+
+            // if content length is sent by client:
+            // double check if the file was fully received
+            // compare expected and actual size
+            if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
+                $expected = (int)$_SERVER['CONTENT_LENGTH'];
+                if ($count !== $expected) {
+                    throw new BadRequest(
+                        $this->l10n->t(
+                            'Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side.',
+                            [
+                                $this->l10n->n('%n byte', '%n bytes', $expected),
+                                $this->l10n->n('%n byte', '%n bytes', $count),
+                            ],
+                        )
+                    );
+                }
+            }
+        } catch (\Exception $e) {
+            if ($e instanceof LockedException) {
+                \OC::$server->get(LoggerInterface::class)->debug($e->getMessage(), ['exception' => $e]);
+            } else {
+                \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+            }
+
+            if ($needsPartFile) {
+                $partStorage->unlink($internalPartPath);
+            }
+            $this->convertToSabreException($e);
+        }
+
+        try {
+            if ($needsPartFile) {
+                if ($view && !$this->emitPreHooks($exists)) {
+                    $partStorage->unlink($internalPartPath);
+                    throw new Exception($this->l10n->t('Could not rename part file to final file, canceled by hook'));
+                }
+                try {
+                    $this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
+                } catch (LockedException $e) {
+                    // during very large uploads, the shared lock we got at the start might have been expired
+                    // meaning that the above lock can fail not just only because somebody else got a shared lock
+                    // or because there is no existing shared lock to make exclusive
+                    //
+                    // Thus we try to get a new exclusive lock, if the original lock failed because of a different shared
+                    // lock this will still fail, if our original shared lock expired the new lock will be successful and
+                    // the entire operation will be safe
+
+                    try {
+                        $this->acquireLock(ILockingProvider::LOCK_EXCLUSIVE);
+                    } catch (LockedException $ex) {
+                        if ($needsPartFile) {
+                            $partStorage->unlink($internalPartPath);
+                        }
+                        throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+                    }
+                }
+
+                // rename to correct path
+                try {
+                    $renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
+                    $fileExists = $storage->file_exists($internalPath);
+                    if ($renameOkay === false || $fileExists === false) {
+                        \OC::$server->get(LoggerInterface::class)->error('renaming part file to final file failed $renameOkay: ' . ($renameOkay ? 'true' : 'false') . ', $fileExists: ' . ($fileExists ? 'true' : 'false') . ')', ['app' => 'webdav']);
+                        throw new Exception($this->l10n->t('Could not rename part file to final file'));
+                    }
+                } catch (ForbiddenException $ex) {
+                    if (!$ex->getRetry()) {
+                        $partStorage->unlink($internalPartPath);
+                    }
+                    throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
+                } catch (\Exception $e) {
+                    $partStorage->unlink($internalPartPath);
+                    $this->convertToSabreException($e);
+                }
+            }
+
+            // since we skipped the view we need to scan and emit the hooks ourselves
+            $storage->getUpdater()->update($internalPath);
+
+            try {
+                $this->changeLock(ILockingProvider::LOCK_SHARED);
+            } catch (LockedException $e) {
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+            }
+
+            // allow sync clients to send the mtime along in a header
+            if (isset($this->request->server['HTTP_X_OC_MTIME'])) {
+                $mtime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_MTIME']);
+                if ($this->fileView->touch($this->path, $mtime)) {
+                    $this->header('X-OC-MTime: accepted');
+                }
+            }
+
+            $fileInfoUpdate = [
+                'upload_time' => time()
+            ];
+
+            // allow sync clients to send the creation time along in a header
+            if (isset($this->request->server['HTTP_X_OC_CTIME'])) {
+                $ctime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_CTIME']);
+                $fileInfoUpdate['creation_time'] = $ctime;
+                $this->header('X-OC-CTime: accepted');
+            }
+
+            $this->fileView->putFileInfo($this->path, $fileInfoUpdate);
+
+            if ($view) {
+                $this->emitPostHooks($exists);
+            }
+
+            $this->refreshInfo();
+
+            if (isset($this->request->server['HTTP_OC_CHECKSUM'])) {
+                $checksum = trim($this->request->server['HTTP_OC_CHECKSUM']);
+                $this->setChecksum($checksum);
+            } elseif ($this->getChecksum() !== null && $this->getChecksum() !== '') {
+                $this->setChecksum('');
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($this->l10n->t('Failed to check file size: %1$s', [$e->getMessage()]), 0, $e);
+        }
+
+        return '"' . $this->info->getEtag() . '"';
+    }
+
+    private function getPartFileBasePath($path) {
+        $partFileInStorage = \OC::$server->getConfig()->getSystemValue('part_file_in_storage', true);
+        if ($partFileInStorage) {
+            return $path;
+        } else {
+            return md5($path); // will place it in the root of the view with a unique name
+        }
+    }
+
+    /**
+     * @param string $path
+     */
+    private function emitPreHooks($exists, $path = null) {
+        if (is_null($path)) {
+            $path = $this->path;
+        }
+        $hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
+        $run = true;
+
+        if (!$exists) {
+            \OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_create, [
+                \OC\Files\Filesystem::signal_param_path => $hookPath,
+                \OC\Files\Filesystem::signal_param_run => &$run,
+            ]);
+        } else {
+            \OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_update, [
+                \OC\Files\Filesystem::signal_param_path => $hookPath,
+                \OC\Files\Filesystem::signal_param_run => &$run,
+            ]);
+        }
+        \OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_write, [
+            \OC\Files\Filesystem::signal_param_path => $hookPath,
+            \OC\Files\Filesystem::signal_param_run => &$run,
+        ]);
+        return $run;
+    }
+
+    /**
+     * @param string $path
+     */
+    private function emitPostHooks($exists, $path = null) {
+        if (is_null($path)) {
+            $path = $this->path;
+        }
+        $hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
+        if (!$exists) {
+            \OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, [
+                \OC\Files\Filesystem::signal_param_path => $hookPath
+            ]);
+        } else {
+            \OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_update, [
+                \OC\Files\Filesystem::signal_param_path => $hookPath
+            ]);
+        }
+        \OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_write, [
+            \OC\Files\Filesystem::signal_param_path => $hookPath
+        ]);
+    }
+
+    /**
+     * Returns the data
+     *
+     * @return resource
+     * @throws Forbidden
+     * @throws ServiceUnavailable
+     */
+    public function get() {
+        //throw exception if encryption is disabled but files are still encrypted
+        try {
+            if (!$this->info->isReadable()) {
+                // do a if the file did not exist
+                throw new NotFound();
+            }
+            try {
+                $res = $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+            } catch (\Exception $e) {
+                $this->convertToSabreException($e);
+            }
+
+            if ($res === false) {
+                throw new ServiceUnavailable($this->l10n->t('Could not open file'));
+            }
+
+            // comparing current file size with the one in DB
+            // if different, fix DB and refresh cache.
+            if ($this->getSize() !== $this->fileView->filesize($this->getPath())) {
+                $logger = \OC::$server->get(LoggerInterface::class);
+                $logger->warning('fixing cached size of file id=' . $this->getId());
+
+                $this->getFileInfo()->getStorage()->getUpdater()->update($this->getFileInfo()->getInternalPath());
+                $this->refreshInfo();
+            }
+
+            return $res;
+        } catch (GenericEncryptionException $e) {
+            // returning 503 will allow retry of the operation at a later point in time
+            throw new ServiceUnavailable($this->l10n->t('Encryption not ready: %1$s', [$e->getMessage()]));
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($this->l10n->t('Failed to open file: %1$s', [$e->getMessage()]));
+        } catch (ForbiddenException $ex) {
+            throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @throws Forbidden
+     * @throws ServiceUnavailable
+     */
+    public function delete() {
+        if (!$this->info->isDeletable()) {
+            throw new Forbidden();
+        }
+
+        try {
+            if (!$this->fileView->unlink($this->path)) {
+                // assume it wasn't possible to delete due to permissions
+                throw new Forbidden();
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($this->l10n->t('Failed to unlink: %1$s', [$e->getMessage()]));
+        } catch (ForbiddenException $ex) {
+            throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string
+     */
+    public function getContentType() {
+        $mimeType = $this->info->getMimetype();
+
+        // PROPFIND needs to return the correct mime type, for consistency with the web UI
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
+            return $mimeType;
+        }
+        return \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType);
+    }
+
+    /**
+     * @return array|bool
+     */
+    public function getDirectDownload() {
+        if (\OCP\Server::get(\OCP\App\IAppManager::class)->isEnabledForUser('encryption')) {
+            return [];
+        }
+        /** @var \OCP\Files\Storage $storage */
+        [$storage, $internalPath] = $this->fileView->resolvePath($this->path);
+        if (is_null($storage)) {
+            return [];
+        }
+
+        return $storage->getDirectDownload($internalPath);
+    }
+
+    /**
+     * @param resource $data
+     * @return null|string
+     * @throws Exception
+     * @throws BadRequest
+     * @throws NotImplemented
+     * @throws ServiceUnavailable
+     */
+    private function createFileChunked($data) {
+        [$path, $name] = \Sabre\Uri\split($this->path);
+
+        $info = \OC_FileChunking::decodeName($name);
+        if (empty($info)) {
+            throw new NotImplemented($this->l10n->t('Invalid chunk name'));
+        }
+
+        $chunk_handler = new \OC_FileChunking($info);
+        $bytesWritten = $chunk_handler->store($info['index'], $data);
+
+        //detect aborted upload
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
+            if (isset($_SERVER['CONTENT_LENGTH'])) {
+                $expected = (int)$_SERVER['CONTENT_LENGTH'];
+                if ($bytesWritten !== $expected) {
+                    $chunk_handler->remove($info['index']);
+                    throw new BadRequest(
+                        $this->l10n->t(
+                            'Expected filesize of %1$s but read (from Nextcloud client) and wrote (to Nextcloud storage) %2$s. Could either be a network problem on the sending side or a problem writing to the storage on the server side.',
+                            [
+                                $this->l10n->n('%n byte', '%n bytes', $expected),
+                                $this->l10n->n('%n byte', '%n bytes', $bytesWritten),
+                            ],
+                        )
+                    );
+                }
+            }
+        }
+
+        if ($chunk_handler->isComplete()) {
+            /** @var Storage $storage */
+            [$storage,] = $this->fileView->resolvePath($path);
+            $needsPartFile = $storage->needsPartFile();
+            $partFile = null;
+
+            $targetPath = $path . '/' . $info['name'];
+            /** @var \OC\Files\Storage\Storage $targetStorage */
+            [$targetStorage, $targetInternalPath] = $this->fileView->resolvePath($targetPath);
+
+            $exists = $this->fileView->file_exists($targetPath);
+
+            try {
+                $this->fileView->lockFile($targetPath, ILockingProvider::LOCK_SHARED);
+
+                $this->emitPreHooks($exists, $targetPath);
+                $this->fileView->changeLock($targetPath, ILockingProvider::LOCK_EXCLUSIVE);
+                /** @var \OC\Files\Storage\Storage $targetStorage */
+                [$targetStorage, $targetInternalPath] = $this->fileView->resolvePath($targetPath);
+
+                if ($needsPartFile) {
+                    // we first assembly the target file as a part file
+                    $partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part';
+                    /** @var \OC\Files\Storage\Storage $targetStorage */
+                    [$partStorage, $partInternalPath] = $this->fileView->resolvePath($partFile);
+
+
+                    $chunk_handler->file_assemble($partStorage, $partInternalPath);
+
+                    // here is the final atomic rename
+                    $renameOkay = $targetStorage->moveFromStorage($partStorage, $partInternalPath, $targetInternalPath);
+                    $fileExists = $targetStorage->file_exists($targetInternalPath);
+                    if ($renameOkay === false || $fileExists === false) {
+                        \OC::$server->get(LoggerInterface::class)->error('\OC\Files\Filesystem::rename() failed', ['app' => 'webdav']);
+                        // only delete if an error occurred and the target file was already created
+                        if ($fileExists) {
+                            // set to null to avoid double-deletion when handling exception
+                            // stray part file
+                            $partFile = null;
+                            $targetStorage->unlink($targetInternalPath);
+                        }
+                        $this->fileView->changeLock($targetPath, ILockingProvider::LOCK_SHARED);
+                        throw new Exception($this->l10n->t('Could not rename part file assembled from chunks'));
+                    }
+                } else {
+                    // assemble directly into the final file
+                    $chunk_handler->file_assemble($targetStorage, $targetInternalPath);
+                }
+
+                // allow sync clients to send the mtime along in a header
+                if (isset($this->request->server['HTTP_X_OC_MTIME'])) {
+                    $mtime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_MTIME']);
+                    if ($targetStorage->touch($targetInternalPath, $mtime)) {
+                        $this->header('X-OC-MTime: accepted');
+                    }
+                }
+
+                // since we skipped the view we need to scan and emit the hooks ourselves
+                $targetStorage->getUpdater()->update($targetInternalPath);
+
+                $this->fileView->changeLock($targetPath, ILockingProvider::LOCK_SHARED);
+
+                $this->emitPostHooks($exists, $targetPath);
+
+                // FIXME: should call refreshInfo but can't because $this->path is not the of the final file
+                $info = $this->fileView->getFileInfo($targetPath);
+
+                if (isset($this->request->server['HTTP_OC_CHECKSUM'])) {
+                    $checksum = trim($this->request->server['HTTP_OC_CHECKSUM']);
+                    $this->fileView->putFileInfo($targetPath, ['checksum' => $checksum]);
+                } elseif ($info->getChecksum() !== null && $info->getChecksum() !== '') {
+                    $this->fileView->putFileInfo($this->path, ['checksum' => '']);
+                }
+
+                $this->fileView->unlockFile($targetPath, ILockingProvider::LOCK_SHARED);
+
+                return $info->getEtag();
+            } catch (\Exception $e) {
+                if ($partFile !== null) {
+                    $targetStorage->unlink($targetInternalPath);
+                }
+                $this->convertToSabreException($e);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Convert the given exception to a SabreException instance
+     *
+     * @param \Exception $e
+     *
+     * @throws \Sabre\DAV\Exception
+     */
+    private function convertToSabreException(\Exception $e) {
+        if ($e instanceof \Sabre\DAV\Exception) {
+            throw $e;
+        }
+        if ($e instanceof NotPermittedException) {
+            // a more general case - due to whatever reason the content could not be written
+            throw new Forbidden($e->getMessage(), 0, $e);
+        }
+        if ($e instanceof ForbiddenException) {
+            // the path for the file was forbidden
+            throw new DAVForbiddenException($e->getMessage(), $e->getRetry(), $e);
+        }
+        if ($e instanceof EntityTooLargeException) {
+            // the file is too big to be stored
+            throw new EntityTooLarge($e->getMessage(), 0, $e);
+        }
+        if ($e instanceof InvalidContentException) {
+            // the file content is not permitted
+            throw new UnsupportedMediaType($e->getMessage(), 0, $e);
+        }
+        if ($e instanceof InvalidPathException) {
+            // the path for the file was not valid
+            // TODO: find proper http status code for this case
+            throw new Forbidden($e->getMessage(), 0, $e);
+        }
+        if ($e instanceof LockedException || $e instanceof LockNotAcquiredException) {
+            // the file is currently being written to by another process
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+        if ($e instanceof GenericEncryptionException) {
+            // returning 503 will allow retry of the operation at a later point in time
+            throw new ServiceUnavailable($this->l10n->t('Encryption not ready: %1$s', [$e->getMessage()]), 0, $e);
+        }
+        if ($e instanceof StorageNotAvailableException) {
+            throw new ServiceUnavailable($this->l10n->t('Failed to write file contents: %1$s', [$e->getMessage()]), 0, $e);
+        }
+        if ($e instanceof NotFoundException) {
+            throw new NotFound($this->l10n->t('File not found: %1$s', [$e->getMessage()]), 0, $e);
+        }
+
+        throw new \Sabre\DAV\Exception($e->getMessage(), 0, $e);
+    }
+
+    /**
+     * Get the checksum for this file
+     *
+     * @return string|null
+     */
+    public function getChecksum() {
+        return $this->info->getChecksum();
+    }
+
+    public function setChecksum(string $checksum) {
+        $this->fileView->putFileInfo($this->path, ['checksum' => $checksum]);
+        $this->refreshInfo();
+    }
+
+    protected function header($string) {
+        if (!\OC::$CLI) {
+            \header($string);
+        }
+    }
+
+    public function hash(string $type) {
+        return $this->fileView->hash($type, $this->path);
+    }
+
+    public function getNode(): \OCP\Files\File {
+        return $this->node;
+    }
+
+    public function getMetadata(string $group): FileMetadata {
+        return $this->metadata[$group];
+    }
+
+    public function setMetadata(string $group, FileMetadata $metadata): void {
+        $this->metadata[$group] = $metadata;
+    }
+
+    public function hasMetadata(string $group) {
+        return array_key_exists($group, $this->metadata);
+    }
 }

apps/files/composer/composer/autoload_classmap.php

Spacing +53 added lines, -53 removed lines

@@ -6,57 +6,57 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
-    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
-    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
-    'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
-    'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
-    'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
-    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
-    'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
-    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
-    'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
-    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
-    'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => $baseDir . '/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
-    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
-    'OCA\\Files\\BackgroundJob\\TransferOwnership' => $baseDir . '/../lib/BackgroundJob/TransferOwnership.php',
-    'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir . '/../lib/Collaboration/Resources/Listener.php',
-    'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir . '/../lib/Collaboration/Resources/ResourceProvider.php',
-    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
-    'OCA\\Files\\Command\\RepairTree' => $baseDir . '/../lib/Command/RepairTree.php',
-    'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
-    'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
-    'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
-    'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
-    'OCA\\Files\\Controller\\DirectEditingController' => $baseDir . '/../lib/Controller/DirectEditingController.php',
-    'OCA\\Files\\Controller\\DirectEditingViewController' => $baseDir . '/../lib/Controller/DirectEditingViewController.php',
-    'OCA\\Files\\Controller\\OpenLocalEditorController' => $baseDir . '/../lib/Controller/OpenLocalEditorController.php',
-    'OCA\\Files\\Controller\\TemplateController' => $baseDir . '/../lib/Controller/TemplateController.php',
-    'OCA\\Files\\Controller\\TransferOwnershipController' => $baseDir . '/../lib/Controller/TransferOwnershipController.php',
-    'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
-    'OCA\\Files\\Db\\OpenLocalEditor' => $baseDir . '/../lib/Db/OpenLocalEditor.php',
-    'OCA\\Files\\Db\\OpenLocalEditorMapper' => $baseDir . '/../lib/Db/OpenLocalEditorMapper.php',
-    'OCA\\Files\\Db\\TransferOwnership' => $baseDir . '/../lib/Db/TransferOwnership.php',
-    'OCA\\Files\\Db\\TransferOwnershipMapper' => $baseDir . '/../lib/Db/TransferOwnershipMapper.php',
-    'OCA\\Files\\DirectEditingCapabilities' => $baseDir . '/../lib/DirectEditingCapabilities.php',
-    'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir . '/../lib/Event/LoadAdditionalScriptsEvent.php',
-    'OCA\\Files\\Event\\LoadSidebar' => $baseDir . '/../lib/Event/LoadSidebar.php',
-    'OCA\\Files\\Exception\\TransferOwnershipException' => $baseDir . '/../lib/Exception/TransferOwnershipException.php',
-    'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => $baseDir . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
-    'OCA\\Files\\Listener\\LoadSidebarListener' => $baseDir . '/../lib/Listener/LoadSidebarListener.php',
-    'OCA\\Files\\Migration\\Version11301Date20191205150729' => $baseDir . '/../lib/Migration/Version11301Date20191205150729.php',
-    'OCA\\Files\\Migration\\Version12101Date20221011153334' => $baseDir . '/../lib/Migration/Version12101Date20221011153334.php',
-    'OCA\\Files\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
-    'OCA\\Files\\Search\\FilesSearchProvider' => $baseDir . '/../lib/Search/FilesSearchProvider.php',
-    'OCA\\Files\\Service\\DirectEditingService' => $baseDir . '/../lib/Service/DirectEditingService.php',
-    'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir . '/../lib/Service/OwnershipTransferService.php',
-    'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
-    'OCA\\Files\\Service\\UserConfig' => $baseDir . '/../lib/Service/UserConfig.php',
-    'OCA\\Files\\Settings\\PersonalSettings' => $baseDir . '/../lib/Settings/PersonalSettings.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir.'/../lib/Activity/FavoriteProvider.php',
+    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir.'/../lib/Activity/Filter/Favorites.php',
+    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir.'/../lib/Activity/Filter/FileChanges.php',
+    'OCA\\Files\\Activity\\Helper' => $baseDir.'/../lib/Activity/Helper.php',
+    'OCA\\Files\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir.'/../lib/Activity/Settings/FavoriteAction.php',
+    'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir.'/../lib/Activity/Settings/FileActivitySettings.php',
+    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir.'/../lib/Activity/Settings/FileChanged.php',
+    'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir.'/../lib/Activity/Settings/FileFavoriteChanged.php',
+    'OCA\\Files\\App' => $baseDir.'/../lib/App.php',
+    'OCA\\Files\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir.'/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
+    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir.'/../lib/BackgroundJob/CleanupFileLocks.php',
+    'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => $baseDir.'/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
+    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir.'/../lib/BackgroundJob/ScanFiles.php',
+    'OCA\\Files\\BackgroundJob\\TransferOwnership' => $baseDir.'/../lib/BackgroundJob/TransferOwnership.php',
+    'OCA\\Files\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir.'/../lib/Collaboration/Resources/Listener.php',
+    'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir.'/../lib/Collaboration/Resources/ResourceProvider.php',
+    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir.'/../lib/Command/DeleteOrphanedFiles.php',
+    'OCA\\Files\\Command\\RepairTree' => $baseDir.'/../lib/Command/RepairTree.php',
+    'OCA\\Files\\Command\\Scan' => $baseDir.'/../lib/Command/Scan.php',
+    'OCA\\Files\\Command\\ScanAppData' => $baseDir.'/../lib/Command/ScanAppData.php',
+    'OCA\\Files\\Command\\TransferOwnership' => $baseDir.'/../lib/Command/TransferOwnership.php',
+    'OCA\\Files\\Controller\\ApiController' => $baseDir.'/../lib/Controller/ApiController.php',
+    'OCA\\Files\\Controller\\DirectEditingController' => $baseDir.'/../lib/Controller/DirectEditingController.php',
+    'OCA\\Files\\Controller\\DirectEditingViewController' => $baseDir.'/../lib/Controller/DirectEditingViewController.php',
+    'OCA\\Files\\Controller\\OpenLocalEditorController' => $baseDir.'/../lib/Controller/OpenLocalEditorController.php',
+    'OCA\\Files\\Controller\\TemplateController' => $baseDir.'/../lib/Controller/TemplateController.php',
+    'OCA\\Files\\Controller\\TransferOwnershipController' => $baseDir.'/../lib/Controller/TransferOwnershipController.php',
+    'OCA\\Files\\Controller\\ViewController' => $baseDir.'/../lib/Controller/ViewController.php',
+    'OCA\\Files\\Db\\OpenLocalEditor' => $baseDir.'/../lib/Db/OpenLocalEditor.php',
+    'OCA\\Files\\Db\\OpenLocalEditorMapper' => $baseDir.'/../lib/Db/OpenLocalEditorMapper.php',
+    'OCA\\Files\\Db\\TransferOwnership' => $baseDir.'/../lib/Db/TransferOwnership.php',
+    'OCA\\Files\\Db\\TransferOwnershipMapper' => $baseDir.'/../lib/Db/TransferOwnershipMapper.php',
+    'OCA\\Files\\DirectEditingCapabilities' => $baseDir.'/../lib/DirectEditingCapabilities.php',
+    'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir.'/../lib/Event/LoadAdditionalScriptsEvent.php',
+    'OCA\\Files\\Event\\LoadSidebar' => $baseDir.'/../lib/Event/LoadSidebar.php',
+    'OCA\\Files\\Exception\\TransferOwnershipException' => $baseDir.'/../lib/Exception/TransferOwnershipException.php',
+    'OCA\\Files\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => $baseDir.'/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
+    'OCA\\Files\\Listener\\LoadSidebarListener' => $baseDir.'/../lib/Listener/LoadSidebarListener.php',
+    'OCA\\Files\\Migration\\Version11301Date20191205150729' => $baseDir.'/../lib/Migration/Version11301Date20191205150729.php',
+    'OCA\\Files\\Migration\\Version12101Date20221011153334' => $baseDir.'/../lib/Migration/Version12101Date20221011153334.php',
+    'OCA\\Files\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
+    'OCA\\Files\\Search\\FilesSearchProvider' => $baseDir.'/../lib/Search/FilesSearchProvider.php',
+    'OCA\\Files\\Service\\DirectEditingService' => $baseDir.'/../lib/Service/DirectEditingService.php',
+    'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir.'/../lib/Service/OwnershipTransferService.php',
+    'OCA\\Files\\Service\\TagService' => $baseDir.'/../lib/Service/TagService.php',
+    'OCA\\Files\\Service\\UserConfig' => $baseDir.'/../lib/Service/UserConfig.php',
+    'OCA\\Files\\Settings\\PersonalSettings' => $baseDir.'/../lib/Settings/PersonalSettings.php',
 );

apps/files/composer/composer/autoload_static.php

Spacing +60 added lines, -60 removed lines

@@ -6,79 +6,79 @@
 
 class ComposerStaticInitFiles
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files\\' => 10,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
-        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
-        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
-        'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
-        'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
-        'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
-        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
-        'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
-        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
-        'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
-        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
-        'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
-        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
-        'OCA\\Files\\BackgroundJob\\TransferOwnership' => __DIR__ . '/..' . '/../lib/BackgroundJob/TransferOwnership.php',
-        'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/Listener.php',
-        'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/ResourceProvider.php',
-        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
-        'OCA\\Files\\Command\\RepairTree' => __DIR__ . '/..' . '/../lib/Command/RepairTree.php',
-        'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
-        'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
-        'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
-        'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
-        'OCA\\Files\\Controller\\DirectEditingController' => __DIR__ . '/..' . '/../lib/Controller/DirectEditingController.php',
-        'OCA\\Files\\Controller\\DirectEditingViewController' => __DIR__ . '/..' . '/../lib/Controller/DirectEditingViewController.php',
-        'OCA\\Files\\Controller\\OpenLocalEditorController' => __DIR__ . '/..' . '/../lib/Controller/OpenLocalEditorController.php',
-        'OCA\\Files\\Controller\\TemplateController' => __DIR__ . '/..' . '/../lib/Controller/TemplateController.php',
-        'OCA\\Files\\Controller\\TransferOwnershipController' => __DIR__ . '/..' . '/../lib/Controller/TransferOwnershipController.php',
-        'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
-        'OCA\\Files\\Db\\OpenLocalEditor' => __DIR__ . '/..' . '/../lib/Db/OpenLocalEditor.php',
-        'OCA\\Files\\Db\\OpenLocalEditorMapper' => __DIR__ . '/..' . '/../lib/Db/OpenLocalEditorMapper.php',
-        'OCA\\Files\\Db\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Db/TransferOwnership.php',
-        'OCA\\Files\\Db\\TransferOwnershipMapper' => __DIR__ . '/..' . '/../lib/Db/TransferOwnershipMapper.php',
-        'OCA\\Files\\DirectEditingCapabilities' => __DIR__ . '/..' . '/../lib/DirectEditingCapabilities.php',
-        'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__ . '/..' . '/../lib/Event/LoadAdditionalScriptsEvent.php',
-        'OCA\\Files\\Event\\LoadSidebar' => __DIR__ . '/..' . '/../lib/Event/LoadSidebar.php',
-        'OCA\\Files\\Exception\\TransferOwnershipException' => __DIR__ . '/..' . '/../lib/Exception/TransferOwnershipException.php',
-        'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => __DIR__ . '/..' . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
-        'OCA\\Files\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php',
-        'OCA\\Files\\Migration\\Version11301Date20191205150729' => __DIR__ . '/..' . '/../lib/Migration/Version11301Date20191205150729.php',
-        'OCA\\Files\\Migration\\Version12101Date20221011153334' => __DIR__ . '/..' . '/../lib/Migration/Version12101Date20221011153334.php',
-        'OCA\\Files\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
-        'OCA\\Files\\Search\\FilesSearchProvider' => __DIR__ . '/..' . '/../lib/Search/FilesSearchProvider.php',
-        'OCA\\Files\\Service\\DirectEditingService' => __DIR__ . '/..' . '/../lib/Service/DirectEditingService.php',
-        'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__ . '/..' . '/../lib/Service/OwnershipTransferService.php',
-        'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
-        'OCA\\Files\\Service\\UserConfig' => __DIR__ . '/..' . '/../lib/Service/UserConfig.php',
-        'OCA\\Files\\Settings\\PersonalSettings' => __DIR__ . '/..' . '/../lib/Settings/PersonalSettings.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__.'/..'.'/../lib/Activity/FavoriteProvider.php',
+        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__.'/..'.'/../lib/Activity/Filter/Favorites.php',
+        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__.'/..'.'/../lib/Activity/Filter/FileChanges.php',
+        'OCA\\Files\\Activity\\Helper' => __DIR__.'/..'.'/../lib/Activity/Helper.php',
+        'OCA\\Files\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__.'/..'.'/../lib/Activity/Settings/FavoriteAction.php',
+        'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__.'/..'.'/../lib/Activity/Settings/FileActivitySettings.php',
+        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileChanged.php',
+        'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileFavoriteChanged.php',
+        'OCA\\Files\\App' => __DIR__.'/..'.'/../lib/App.php',
+        'OCA\\Files\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
+        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupFileLocks.php',
+        'OCA\\Files\\BackgroundJob\\DeleteExpiredOpenLocalEditor' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php',
+        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__.'/..'.'/../lib/BackgroundJob/ScanFiles.php',
+        'OCA\\Files\\BackgroundJob\\TransferOwnership' => __DIR__.'/..'.'/../lib/BackgroundJob/TransferOwnership.php',
+        'OCA\\Files\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__.'/..'.'/../lib/Collaboration/Resources/Listener.php',
+        'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__.'/..'.'/../lib/Collaboration/Resources/ResourceProvider.php',
+        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanedFiles.php',
+        'OCA\\Files\\Command\\RepairTree' => __DIR__.'/..'.'/../lib/Command/RepairTree.php',
+        'OCA\\Files\\Command\\Scan' => __DIR__.'/..'.'/../lib/Command/Scan.php',
+        'OCA\\Files\\Command\\ScanAppData' => __DIR__.'/..'.'/../lib/Command/ScanAppData.php',
+        'OCA\\Files\\Command\\TransferOwnership' => __DIR__.'/..'.'/../lib/Command/TransferOwnership.php',
+        'OCA\\Files\\Controller\\ApiController' => __DIR__.'/..'.'/../lib/Controller/ApiController.php',
+        'OCA\\Files\\Controller\\DirectEditingController' => __DIR__.'/..'.'/../lib/Controller/DirectEditingController.php',
+        'OCA\\Files\\Controller\\DirectEditingViewController' => __DIR__.'/..'.'/../lib/Controller/DirectEditingViewController.php',
+        'OCA\\Files\\Controller\\OpenLocalEditorController' => __DIR__.'/..'.'/../lib/Controller/OpenLocalEditorController.php',
+        'OCA\\Files\\Controller\\TemplateController' => __DIR__.'/..'.'/../lib/Controller/TemplateController.php',
+        'OCA\\Files\\Controller\\TransferOwnershipController' => __DIR__.'/..'.'/../lib/Controller/TransferOwnershipController.php',
+        'OCA\\Files\\Controller\\ViewController' => __DIR__.'/..'.'/../lib/Controller/ViewController.php',
+        'OCA\\Files\\Db\\OpenLocalEditor' => __DIR__.'/..'.'/../lib/Db/OpenLocalEditor.php',
+        'OCA\\Files\\Db\\OpenLocalEditorMapper' => __DIR__.'/..'.'/../lib/Db/OpenLocalEditorMapper.php',
+        'OCA\\Files\\Db\\TransferOwnership' => __DIR__.'/..'.'/../lib/Db/TransferOwnership.php',
+        'OCA\\Files\\Db\\TransferOwnershipMapper' => __DIR__.'/..'.'/../lib/Db/TransferOwnershipMapper.php',
+        'OCA\\Files\\DirectEditingCapabilities' => __DIR__.'/..'.'/../lib/DirectEditingCapabilities.php',
+        'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__.'/..'.'/../lib/Event/LoadAdditionalScriptsEvent.php',
+        'OCA\\Files\\Event\\LoadSidebar' => __DIR__.'/..'.'/../lib/Event/LoadSidebar.php',
+        'OCA\\Files\\Exception\\TransferOwnershipException' => __DIR__.'/..'.'/../lib/Exception/TransferOwnershipException.php',
+        'OCA\\Files\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => __DIR__.'/..'.'/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
+        'OCA\\Files\\Listener\\LoadSidebarListener' => __DIR__.'/..'.'/../lib/Listener/LoadSidebarListener.php',
+        'OCA\\Files\\Migration\\Version11301Date20191205150729' => __DIR__.'/..'.'/../lib/Migration/Version11301Date20191205150729.php',
+        'OCA\\Files\\Migration\\Version12101Date20221011153334' => __DIR__.'/..'.'/../lib/Migration/Version12101Date20221011153334.php',
+        'OCA\\Files\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
+        'OCA\\Files\\Search\\FilesSearchProvider' => __DIR__.'/..'.'/../lib/Search/FilesSearchProvider.php',
+        'OCA\\Files\\Service\\DirectEditingService' => __DIR__.'/..'.'/../lib/Service/DirectEditingService.php',
+        'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__.'/..'.'/../lib/Service/OwnershipTransferService.php',
+        'OCA\\Files\\Service\\TagService' => __DIR__.'/..'.'/../lib/Service/TagService.php',
+        'OCA\\Files\\Service\\UserConfig' => __DIR__.'/..'.'/../lib/Service/UserConfig.php',
+        'OCA\\Files\\Settings\\PersonalSettings' => __DIR__.'/..'.'/../lib/Settings/PersonalSettings.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles::$classMap;