nextcloud / server

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

Indentation +363 added lines, -363 removed lines

@@ -49,373 +49,373 @@
 
 abstract class Node implements \Sabre\DAV\INode {
 
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $fileView;
-
-	/**
-	 * The path to the current node
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * node properties cache
-	 *
-	 * @var array
-	 */
-	protected $property_cache = null;
-
-	/**
-	 * @var \OCP\Files\FileInfo
-	 */
-	protected $info;
-
-	/**
-	 * @var IManager
-	 */
-	protected $shareManager;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\FileInfo $info
-	 * @param IManager $shareManager
-	 */
-	public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
-		$this->fileView = $view;
-		$this->path = $this->fileView->getRelativePath($info->getPath());
-		$this->info = $info;
-		if ($shareManager) {
-			$this->shareManager = $shareManager;
-		} else {
-			$this->shareManager = \OC::$server->getShareManager();
-		}
-	}
-
-	protected function refreshInfo() {
-		$this->info = $this->fileView->getFileInfo($this->path);
-	}
-
-	/**
-	 *  Returns the name of the node
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->info->getName();
-	}
-
-	/**
-	 * Returns the full path
-	 *
-	 * @return string
-	 */
-	public function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function setName($name) {
-
-		// rename is only allowed if the update privilege is granted
-		if (!$this->info->isUpdateable()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-
-		list($parentPath,) = \Sabre\Uri\split($this->path);
-		list(, $newName) = \Sabre\Uri\split($name);
-
-		// verify path of the target
-		$this->verifyPath();
-
-		$newPath = $parentPath . '/' . $newName;
-
-		if (!$this->fileView->rename($this->path, $newPath)) {
-			throw new \Sabre\DAV\Exception('Failed to rename '. $this->path . ' to ' . $newPath);
-		}
-
-		$this->path = $newPath;
-
-		$this->refreshInfo();
-	}
-
-	public function setPropertyCache($property_cache) {
-		$this->property_cache = $property_cache;
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int timestamp as integer
-	 */
-	public function getLastModified() {
-		$timestamp = $this->info->getMtime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
-	}
-
-	/**
-	 *  sets the last modification time of the file (mtime) to the value given
-	 *  in the second parameter or to now if the second param is empty.
-	 *  Even if the modification time is set to a custom value the access time is set to now.
-	 */
-	public function touch($mtime) {
-		$mtime = $this->sanitizeMtime($mtime);
-		$this->fileView->touch($this->path, $mtime);
-		$this->refreshInfo();
-	}
-
-	/**
-	 * Returns the ETag for a file
-	 *
-	 * An ETag is a unique identifier representing the current version of the
-	 * file. If the file changes, the ETag MUST change.  The ETag is an
-	 * arbitrary string, but MUST be surrounded by double-quotes.
-	 *
-	 * Return null if the ETag can not effectively be determined
-	 *
-	 * @return string
-	 */
-	public function getETag() {
-		return '"' . $this->info->getEtag() . '"';
-	}
-
-	/**
-	 * Sets the ETag
-	 *
-	 * @param string $etag
-	 *
-	 * @return int file id of updated file or -1 on failure
-	 */
-	public function setETag($etag) {
-		return $this->fileView->putFileInfo($this->path, ['etag' => $etag]);
-	}
-
-	public function setCreationTime(int $time) {
-		return $this->fileView->putFileInfo($this->path, ['creation_time' => $time]);
-	}
-
-	public function setUploadTime(int $time) {
-		return $this->fileView->putFileInfo($this->path, ['upload_time' => $time]);
-	}
-
-	/**
-	 * Returns the size of the node, in bytes
-	 *
-	 * @return integer
-	 */
-	public function getSize() {
-		return $this->info->getSize();
-	}
-
-	/**
-	 * Returns the cache's file id
-	 *
-	 * @return int
-	 */
-	public function getId() {
-		return $this->info->getId();
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getFileId() {
-		if ($this->info->getId()) {
-			$instanceId = \OC_Util::getInstanceId();
-			$id = sprintf('%08d', $this->info->getId());
-			return $id . $instanceId;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return integer
-	 */
-	public function getInternalFileId() {
-		return $this->info->getId();
-	}
-
-	/**
-	 * @param string $user
-	 * @return int
-	 */
-	public function getSharePermissions($user) {
-
-		// check of we access a federated share
-		if ($user !== null) {
-			try {
-				$share = $this->shareManager->getShareByToken($user);
-				return $share->getPermissions();
-			} catch (ShareNotFound $e) {
-				// ignore
-			}
-		}
-
-		try {
-			$storage = $this->info->getStorage();
-		} catch (StorageNotAvailableException $e) {
-			$storage = null;
-		}
-
-		if ($storage && $storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			/** @var \OCA\Files_Sharing\SharedStorage $storage */
-			$permissions = (int)$storage->getShare()->getPermissions();
-		} else {
-			$permissions = $this->info->getPermissions();
-		}
-
-		/*
+    /**
+     * @var \OC\Files\View
+     */
+    protected $fileView;
+
+    /**
+     * The path to the current node
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * node properties cache
+     *
+     * @var array
+     */
+    protected $property_cache = null;
+
+    /**
+     * @var \OCP\Files\FileInfo
+     */
+    protected $info;
+
+    /**
+     * @var IManager
+     */
+    protected $shareManager;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param \OC\Files\View $view
+     * @param \OCP\Files\FileInfo $info
+     * @param IManager $shareManager
+     */
+    public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
+        $this->fileView = $view;
+        $this->path = $this->fileView->getRelativePath($info->getPath());
+        $this->info = $info;
+        if ($shareManager) {
+            $this->shareManager = $shareManager;
+        } else {
+            $this->shareManager = \OC::$server->getShareManager();
+        }
+    }
+
+    protected function refreshInfo() {
+        $this->info = $this->fileView->getFileInfo($this->path);
+    }
+
+    /**
+     *  Returns the name of the node
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->info->getName();
+    }
+
+    /**
+     * Returns the full path
+     *
+     * @return string
+     */
+    public function getPath() {
+        return $this->path;
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws \Sabre\DAV\Exception\BadRequest
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function setName($name) {
+
+        // rename is only allowed if the update privilege is granted
+        if (!$this->info->isUpdateable()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+
+        list($parentPath,) = \Sabre\Uri\split($this->path);
+        list(, $newName) = \Sabre\Uri\split($name);
+
+        // verify path of the target
+        $this->verifyPath();
+
+        $newPath = $parentPath . '/' . $newName;
+
+        if (!$this->fileView->rename($this->path, $newPath)) {
+            throw new \Sabre\DAV\Exception('Failed to rename '. $this->path . ' to ' . $newPath);
+        }
+
+        $this->path = $newPath;
+
+        $this->refreshInfo();
+    }
+
+    public function setPropertyCache($property_cache) {
+        $this->property_cache = $property_cache;
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int timestamp as integer
+     */
+    public function getLastModified() {
+        $timestamp = $this->info->getMtime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
+    }
+
+    /**
+     *  sets the last modification time of the file (mtime) to the value given
+     *  in the second parameter or to now if the second param is empty.
+     *  Even if the modification time is set to a custom value the access time is set to now.
+     */
+    public function touch($mtime) {
+        $mtime = $this->sanitizeMtime($mtime);
+        $this->fileView->touch($this->path, $mtime);
+        $this->refreshInfo();
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the
+     * file. If the file changes, the ETag MUST change.  The ETag is an
+     * arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return string
+     */
+    public function getETag() {
+        return '"' . $this->info->getEtag() . '"';
+    }
+
+    /**
+     * Sets the ETag
+     *
+     * @param string $etag
+     *
+     * @return int file id of updated file or -1 on failure
+     */
+    public function setETag($etag) {
+        return $this->fileView->putFileInfo($this->path, ['etag' => $etag]);
+    }
+
+    public function setCreationTime(int $time) {
+        return $this->fileView->putFileInfo($this->path, ['creation_time' => $time]);
+    }
+
+    public function setUploadTime(int $time) {
+        return $this->fileView->putFileInfo($this->path, ['upload_time' => $time]);
+    }
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @return integer
+     */
+    public function getSize() {
+        return $this->info->getSize();
+    }
+
+    /**
+     * Returns the cache's file id
+     *
+     * @return int
+     */
+    public function getId() {
+        return $this->info->getId();
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getFileId() {
+        if ($this->info->getId()) {
+            $instanceId = \OC_Util::getInstanceId();
+            $id = sprintf('%08d', $this->info->getId());
+            return $id . $instanceId;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getInternalFileId() {
+        return $this->info->getId();
+    }
+
+    /**
+     * @param string $user
+     * @return int
+     */
+    public function getSharePermissions($user) {
+
+        // check of we access a federated share
+        if ($user !== null) {
+            try {
+                $share = $this->shareManager->getShareByToken($user);
+                return $share->getPermissions();
+            } catch (ShareNotFound $e) {
+                // ignore
+            }
+        }
+
+        try {
+            $storage = $this->info->getStorage();
+        } catch (StorageNotAvailableException $e) {
+            $storage = null;
+        }
+
+        if ($storage && $storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            /** @var \OCA\Files_Sharing\SharedStorage $storage */
+            $permissions = (int)$storage->getShare()->getPermissions();
+        } else {
+            $permissions = $this->info->getPermissions();
+        }
+
+        /*
 		 * We can always share non moveable mount points with DELETE and UPDATE
 		 * Eventually we need to do this properly
 		 */
-		$mountpoint = $this->info->getMountPoint();
-		if (!($mountpoint instanceof MoveableMount)) {
-			$mountpointpath = $mountpoint->getMountPoint();
-			if (substr($mountpointpath, -1) === '/') {
-				$mountpointpath = substr($mountpointpath, 0, -1);
-			}
-
-			if (!$mountpoint->getOption('readonly', false) && $mountpointpath === $this->info->getPath()) {
-				$permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
-			}
-		}
-
-		/*
+        $mountpoint = $this->info->getMountPoint();
+        if (!($mountpoint instanceof MoveableMount)) {
+            $mountpointpath = $mountpoint->getMountPoint();
+            if (substr($mountpointpath, -1) === '/') {
+                $mountpointpath = substr($mountpointpath, 0, -1);
+            }
+
+            if (!$mountpoint->getOption('readonly', false) && $mountpointpath === $this->info->getPath()) {
+                $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
+            }
+        }
+
+        /*
 		 * Files can't have create or delete permissions
 		 */
-		if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
-			$permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE);
-		}
-
-		return $permissions;
-	}
-
-	/**
-	 * @param string $user
-	 * @return string
-	 */
-	public function getNoteFromShare($user) {
-		if ($user === null) {
-			return '';
-		}
-
-		$types = [
-			Share::SHARE_TYPE_USER,
-			Share::SHARE_TYPE_GROUP,
-			Share::SHARE_TYPE_CIRCLE,
-			Share::SHARE_TYPE_ROOM
-		];
-
-		foreach ($types as $shareType) {
-			$shares = $this->shareManager->getSharedWith($user, $shareType, $this, -1);
-			foreach ($shares as $share) {
-				$note = $share->getNote();
-				if($share->getShareOwner() !== $user && !empty($note)) {
-					return $note;
-				}
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getDavPermissions() {
-		$p = '';
-		if ($this->info->isShared()) {
-			$p .= 'S';
-		}
-		if ($this->info->isShareable()) {
-			$p .= 'R';
-		}
-		if ($this->info->isMounted()) {
-			$p .= 'M';
-		}
-		if ($this->info->isReadable()) {
-			$p .= 'G';
-		}
-		if ($this->info->isDeletable()) {
-			$p .= 'D';
-		}
-		if ($this->info->isUpdateable()) {
-			$p .= 'NV'; // Renameable, Moveable
-		}
-		if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
-			if ($this->info->isUpdateable()) {
-				$p .= 'W';
-			}
-		} else {
-			if ($this->info->isCreatable()) {
-				$p .= 'CK';
-			}
-		}
-		return $p;
-	}
-
-	public function getOwner() {
-		return $this->info->getOwner();
-	}
-
-	protected function verifyPath() {
-		try {
-			$fileName = basename($this->info->getPath());
-			$this->fileView->verifyPath($this->path, $fileName);
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		}
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function acquireLock($type) {
-		$this->fileView->lockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock($type) {
-		$this->fileView->unlockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function changeLock($type) {
-		$this->fileView->changeLock($this->path, $type);
-	}
-
-	public function getFileInfo() {
-		return $this->info;
-	}
-
-	protected function sanitizeMtime($mtimeFromRequest) {
-		// In PHP 5.X "is_numeric" returns true for strings in hexadecimal
-		// notation. This is no longer the case in PHP 7.X, so this check
-		// ensures that strings with hexadecimal notations fail too in PHP 5.X.
-		$isHexadecimal = is_string($mtimeFromRequest) && preg_match('/^\s*0[xX]/', $mtimeFromRequest);
-		if ($isHexadecimal || !is_numeric($mtimeFromRequest)) {
-			throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
-		}
-
-		return (int)$mtimeFromRequest;
-	}
+        if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+            $permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE);
+        }
+
+        return $permissions;
+    }
+
+    /**
+     * @param string $user
+     * @return string
+     */
+    public function getNoteFromShare($user) {
+        if ($user === null) {
+            return '';
+        }
+
+        $types = [
+            Share::SHARE_TYPE_USER,
+            Share::SHARE_TYPE_GROUP,
+            Share::SHARE_TYPE_CIRCLE,
+            Share::SHARE_TYPE_ROOM
+        ];
+
+        foreach ($types as $shareType) {
+            $shares = $this->shareManager->getSharedWith($user, $shareType, $this, -1);
+            foreach ($shares as $share) {
+                $note = $share->getNote();
+                if($share->getShareOwner() !== $user && !empty($note)) {
+                    return $note;
+                }
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getDavPermissions() {
+        $p = '';
+        if ($this->info->isShared()) {
+            $p .= 'S';
+        }
+        if ($this->info->isShareable()) {
+            $p .= 'R';
+        }
+        if ($this->info->isMounted()) {
+            $p .= 'M';
+        }
+        if ($this->info->isReadable()) {
+            $p .= 'G';
+        }
+        if ($this->info->isDeletable()) {
+            $p .= 'D';
+        }
+        if ($this->info->isUpdateable()) {
+            $p .= 'NV'; // Renameable, Moveable
+        }
+        if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+            if ($this->info->isUpdateable()) {
+                $p .= 'W';
+            }
+        } else {
+            if ($this->info->isCreatable()) {
+                $p .= 'CK';
+            }
+        }
+        return $p;
+    }
+
+    public function getOwner() {
+        return $this->info->getOwner();
+    }
+
+    protected function verifyPath() {
+        try {
+            $fileName = basename($this->info->getPath());
+            $this->fileView->verifyPath($this->path, $fileName);
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        }
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function acquireLock($type) {
+        $this->fileView->lockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function releaseLock($type) {
+        $this->fileView->unlockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function changeLock($type) {
+        $this->fileView->changeLock($this->path, $type);
+    }
+
+    public function getFileInfo() {
+        return $this->info;
+    }
+
+    protected function sanitizeMtime($mtimeFromRequest) {
+        // In PHP 5.X "is_numeric" returns true for strings in hexadecimal
+        // notation. This is no longer the case in PHP 7.X, so this check
+        // ensures that strings with hexadecimal notations fail too in PHP 5.X.
+        $isHexadecimal = is_string($mtimeFromRequest) && preg_match('/^\s*0[xX]/', $mtimeFromRequest);
+        if ($isHexadecimal || !is_numeric($mtimeFromRequest)) {
+            throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
+        }
+
+        return (int)$mtimeFromRequest;
+    }
 
 }

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

Indentation +48 added lines, -48 removed lines

@@ -34,58 +34,58 @@
  */
 class AppEnabledPlugin extends ServerPlugin {
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var string
-	 */
-	private $app;
+    /**
+     * @var string
+     */
+    private $app;
 
-	/**
-	 * @var \OCP\App\IAppManager
-	 */
-	private $appManager;
+    /**
+     * @var \OCP\App\IAppManager
+     */
+    private $appManager;
 
-	/**
-	 * @param string $app
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($app, IAppManager $appManager) {
-		$this->app = $app;
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $app
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($app, IAppManager $appManager) {
+        $this->app = $app;
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$this->server = $server;
-		$this->server->on('beforeMethod', [$this, 'checkAppEnabled'], 30);
-	}
+        $this->server = $server;
+        $this->server->on('beforeMethod', [$this, 'checkAppEnabled'], 30);
+    }
 
-	/**
-	 * This method is called before any HTTP after auth and checks if the user has access to the app
-	 *
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @return bool
-	 */
-	public function checkAppEnabled() {
-		if (!$this->appManager->isEnabledForUser($this->app)) {
-			throw new Forbidden();
-		}
-	}
+    /**
+     * This method is called before any HTTP after auth and checks if the user has access to the app
+     *
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @return bool
+     */
+    public function checkAppEnabled() {
+        if (!$this->appManager->isEnabledForUser($this->app)) {
+            throw new Forbidden();
+        }
+    }
 }

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

Indentation +78 added lines, -78 removed lines

@@ -42,89 +42,89 @@
 use Sabre\DAV\Exception\ServiceUnavailable;
 
 class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
-	protected $nonFatalExceptions = [
-		NotAuthenticated::class => true,
-		// If tokenauth can throw this exception (which is basically as
-		// NotAuthenticated. So not fatal.
-		PasswordLoginForbidden::class => true,
-		// basically a NotAuthenticated
-		InvalidSyncToken::class => true,
-		// the sync client uses this to find out whether files exist,
-		// so it is not always an error, log it as debug
-		NotFound::class => true,
-		// this one mostly happens when the same file is uploaded at
-		// exactly the same time from two clients, only one client
-		// wins, the second one gets "Precondition failed"
-		PreconditionFailed::class => true,
-		// forbidden can be expected when trying to upload to
-		// read-only folders for example
-		Forbidden::class => true,
-		// Happens when an external storage or federated share is temporarily
-		// not available
-		StorageNotAvailableException::class => true,
-		// happens if some a client uses the wrong method for a given URL
-		// the error message itself is visible on the client side anyways
-		NotImplemented::class => true,
-		// happens when the parent directory is not present (for example when a
-		// move is done to a non-existent directory)
-		Conflict::class => true,
-		// happens when a certain method is not allowed to be called
-		// for example creating a folder that already exists
-		MethodNotAllowed::class => true,
-		// A locked file is perfectly valid and can happen in various cases
-		FileLocked::class => true,
-	];
+    protected $nonFatalExceptions = [
+        NotAuthenticated::class => true,
+        // If tokenauth can throw this exception (which is basically as
+        // NotAuthenticated. So not fatal.
+        PasswordLoginForbidden::class => true,
+        // basically a NotAuthenticated
+        InvalidSyncToken::class => true,
+        // the sync client uses this to find out whether files exist,
+        // so it is not always an error, log it as debug
+        NotFound::class => true,
+        // this one mostly happens when the same file is uploaded at
+        // exactly the same time from two clients, only one client
+        // wins, the second one gets "Precondition failed"
+        PreconditionFailed::class => true,
+        // forbidden can be expected when trying to upload to
+        // read-only folders for example
+        Forbidden::class => true,
+        // Happens when an external storage or federated share is temporarily
+        // not available
+        StorageNotAvailableException::class => true,
+        // happens if some a client uses the wrong method for a given URL
+        // the error message itself is visible on the client side anyways
+        NotImplemented::class => true,
+        // happens when the parent directory is not present (for example when a
+        // move is done to a non-existent directory)
+        Conflict::class => true,
+        // happens when a certain method is not allowed to be called
+        // for example creating a folder that already exists
+        MethodNotAllowed::class => true,
+        // A locked file is perfectly valid and can happen in various cases
+        FileLocked::class => true,
+    ];
 
-	/** @var string */
-	private $appName;
+    /** @var string */
+    private $appName;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param string $loggerAppName app name to use when logging
-	 * @param ILogger $logger
-	 */
-	public function __construct($loggerAppName, $logger) {
-		$this->appName = $loggerAppName;
-		$this->logger = $logger;
-	}
+    /**
+     * @param string $loggerAppName app name to use when logging
+     * @param ILogger $logger
+     */
+    public function __construct($loggerAppName, $logger) {
+        $this->appName = $loggerAppName;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$server->on('exception', [$this, 'logException'], 10);
-	}
+        $server->on('exception', [$this, 'logException'], 10);
+    }
 
-	/**
-	 * Log exception
-	 *
-	 */
-	public function logException(\Exception $ex) {
-		$exceptionClass = get_class($ex);
-		$level = ILogger::FATAL;
-		if (isset($this->nonFatalExceptions[$exceptionClass]) ||
-			(
-				$exceptionClass === ServiceUnavailable::class &&
-				$ex->getMessage() === 'System in maintenance mode.'
-			)
-		) {
-			$level = ILogger::DEBUG;
-		}
+    /**
+     * Log exception
+     *
+     */
+    public function logException(\Exception $ex) {
+        $exceptionClass = get_class($ex);
+        $level = ILogger::FATAL;
+        if (isset($this->nonFatalExceptions[$exceptionClass]) ||
+            (
+                $exceptionClass === ServiceUnavailable::class &&
+                $ex->getMessage() === 'System in maintenance mode.'
+            )
+        ) {
+            $level = ILogger::DEBUG;
+        }
 
-		$this->logger->logException($ex, [
-			'app' => $this->appName,
-			'level' => $level,
-		]);
-	}
+        $this->logger->logException($ex, [
+            'app' => $this->appName,
+            'level' => $level,
+        ]);
+    }
 }

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

Indentation +394 added lines, -394 removed lines

@@ -46,398 +46,398 @@
 
 class FilesReportPlugin extends ServerPlugin {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
-	const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
-	const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle';
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var View
-	 */
-	private $fileView;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * Manager for private tags
-	 *
-	 * @var ITagManager
-	 */
-	private $fileTagger;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var Folder
-	 */
-	private $userFolder;
-
-	/**
-	 * @var IAppManager
-	 */
-	private $appManager;
-
-	/**
-	 * @param Tree $tree
-	 * @param View $view
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param ITagManager $fileTagger manager for private tags
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param Folder $userFolder
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(Tree $tree,
-								View $view,
-								ISystemTagManager $tagManager,
-								ISystemTagObjectMapper $tagMapper,
-								ITagManager $fileTagger,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								Folder $userFolder,
-								IAppManager $appManager
-	) {
-		$this->tree = $tree;
-		$this->fileView = $view;
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->fileTagger = $fileTagger;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->userFolder = $userFolder;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-
-		$this->server = $server;
-		$this->server->on('report', [$this, 'onReport']);
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		return [self::REPORT_NAME];
-	}
-
-	/**
-	 * REPORT operations to look for files
-	 *
-	 * @param string $reportName
-	 * @param $report
-	 * @param string $uri
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws PreconditionFailed
-	 * @internal param $ [] $report
-	 */
-	public function onReport($reportName, $report, $uri) {
-		$reportTargetNode = $this->server->tree->getNodeForPath($uri);
-		if (!$reportTargetNode instanceof Directory || $reportName !== self::REPORT_NAME) {
-			return;
-		}
-
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		$requestedProps = [];
-		$filterRules = [];
-
-		// parse report properties and gather filter info
-		foreach ($report as $reportProps) {
-			$name = $reportProps['name'];
-			if ($name === $ns . 'filter-rules') {
-				$filterRules = $reportProps['value'];
-			} else if ($name === '{DAV:}prop') {
-				// propfind properties
-				foreach ($reportProps['value'] as $propVal) {
-					$requestedProps[] = $propVal['name'];
-				}
-			}
-		}
-
-		if (empty($filterRules)) {
-			// an empty filter would return all existing files which would be slow
-			throw new BadRequest('Missing filter-rule block in request');
-		}
-
-		// gather all file ids matching filter
-		try {
-			$resultFileIds = $this->processFilterRules($filterRules);
-		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Cannot filter by non-existing tag', 0, $e);
-		}
-
-		// find sabre nodes by file id, restricted to the root node path
-		$results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
-
-		$filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
-		$responses = $this->prepareResponses($filesUri, $requestedProps, $results);
-
-		$xml = $this->server->xml->write(
-			'{DAV:}multistatus',
-			new MultiStatus($responses)
-		);
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$this->server->httpResponse->setBody($xml);
-
-		return false;
-	}
-
-	/**
-	 * Returns the base uri of the files root by removing
-	 * the subpath from the URI
-	 *
-	 * @param string $uri URI from this request
-	 * @param string $subPath subpath to remove from the URI
-	 *
-	 * @return string files base uri
-	 */
-	private function getFilesBaseUri($uri, $subPath) {
-		$uri = trim($uri, '/');
-		$subPath = trim($subPath, '/');
-		if (empty($subPath)) {
-			$filesUri = $uri;
-		} else {
-			$filesUri = substr($uri, 0, strlen($uri) - strlen($subPath));
-		}
-		$filesUri = trim($filesUri, '/');
-		if (empty($filesUri)) {
-			return '';
-		}
-		return '/' . $filesUri;
-	}
-
-	/**
-	 * Find file ids matching the given filter rules
-	 *
-	 * @param array $filterRules
-	 * @return array array of unique file id results
-	 *
-	 * @throws TagNotFoundException whenever a tag was not found
-	 */
-	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		$resultFileIds = null;
-		$systemTagIds = [];
-		$circlesIds = [];
-		$favoriteFilter = null;
-		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
-				$systemTagIds[] = $filterRule['value'];
-			}
-			if ($filterRule['name'] === self::CIRCLE_PROPERTYNAME) {
-				$circlesIds[] = $filterRule['value'];
-			}
-			if ($filterRule['name'] === $ns . 'favorite') {
-				$favoriteFilter = true;
-			}
-
-		}
-
-		if ($favoriteFilter !== null) {
-			$resultFileIds = $this->fileTagger->load('files')->getFavorites();
-			if (empty($resultFileIds)) {
-				return [];
-			}
-		}
-
-		if (!empty($systemTagIds)) {
-			$fileIds = $this->getSystemTagFileIds($systemTagIds);
-			if (empty($resultFileIds)) {
-				$resultFileIds = $fileIds;
-			} else {
-				$resultFileIds = array_intersect($fileIds, $resultFileIds);
-			}
-		}
-
-		if (!empty($circlesIds)) {
-			$fileIds = $this->getCirclesFileIds($circlesIds);
-			if (empty($resultFileIds)) {
-				$resultFileIds = $fileIds;
-			} else {
-				$resultFileIds = array_intersect($fileIds, $resultFileIds);
-			}
-		}
-
-		return $resultFileIds;
-	}
-
-	private function getSystemTagFileIds($systemTagIds) {
-		$resultFileIds = null;
-
-		// check user permissions, if applicable
-		if (!$this->isAdmin()) {
-			// check visibility/permission
-			$tags = $this->tagManager->getTagsByIds($systemTagIds);
-			$unknownTagIds = [];
-			foreach ($tags as $tag) {
-				if (!$tag->isUserVisible()) {
-					$unknownTagIds[] = $tag->getId();
-				}
-			}
-
-			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
-			}
-		}
-
-		// fetch all file ids and intersect them
-		foreach ($systemTagIds as $systemTagId) {
-			$fileIds = $this->tagMapper->getObjectIdsForTags($systemTagId, 'files');
-
-			if (empty($fileIds)) {
-				// This tag has no files, nothing can ever show up
-				return [];
-			}
-
-			// first run ?
-			if ($resultFileIds === null) {
-				$resultFileIds = $fileIds;
-			} else {
-				$resultFileIds = array_intersect($resultFileIds, $fileIds);
-			}
-
-			if (empty($resultFileIds)) {
-				// Empty intersection, nothing can show up anymore
-				return [];
-			}
-		}
-		return $resultFileIds;
-	}
-
-	/**
-	 * @suppress PhanUndeclaredClassMethod
-	 * @param array $circlesIds
-	 * @return array
-	 */
-	private function getCirclesFileIds(array $circlesIds) {
-		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
-			return [];
-		}
-		return \OCA\Circles\Api\v1\Circles::getFilesForCircles($circlesIds);
-	}
-
-
-	/**
-	 * Prepare propfind response for the given nodes
-	 *
-	 * @param string $filesUri $filesUri URI leading to root of the files URI,
-	 * with a leading slash but no trailing slash
-	 * @param string[] $requestedProps requested properties
-	 * @param Node[] nodes nodes for which to fetch and prepare responses
-	 * @return Response[]
-	 */
-	public function prepareResponses($filesUri, $requestedProps, $nodes) {
-		$responses = [];
-		foreach ($nodes as $node) {
-			$propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
-
-			$this->server->getPropertiesByNode($propFind, $node);
-			// copied from Sabre Server's getPropertiesForPath
-			$result = $propFind->getResultForMultiStatus();
-			$result['href'] = $propFind->getPath();
-
-			$resourceType = $this->server->getResourceTypeForNode($node);
-			if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
-				$result['href'] .= '/';
-			}
-
-			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
-				$result,
-				200
-			);
-		}
-		return $responses;
-	}
-
-	/**
-	 * Find Sabre nodes by file ids
-	 *
-	 * @param Node $rootNode root node for search
-	 * @param array $fileIds file ids
-	 * @return Node[] array of Sabre nodes
-	 */
-	public function findNodesByFileIds($rootNode, $fileIds) {
-		$folder = $this->userFolder;
-		if (trim($rootNode->getPath(), '/') !== '') {
-			$folder = $folder->get($rootNode->getPath());
-		}
-
-		$results = [];
-		foreach ($fileIds as $fileId) {
-			$entry = $folder->getById($fileId);
-			if ($entry) {
-				$entry = current($entry);
-				if ($entry instanceof \OCP\Files\File) {
-					$results[] = new File($this->fileView, $entry);
-				} else if ($entry instanceof \OCP\Files\Folder) {
-					$results[] = new Directory($this->fileView, $entry);
-				}
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Returns whether the currently logged in user is an administrator
-	 */
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
+    const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
+    const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle';
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @var Tree
+     */
+    private $tree;
+
+    /**
+     * @var View
+     */
+    private $fileView;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * Manager for private tags
+     *
+     * @var ITagManager
+     */
+    private $fileTagger;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var Folder
+     */
+    private $userFolder;
+
+    /**
+     * @var IAppManager
+     */
+    private $appManager;
+
+    /**
+     * @param Tree $tree
+     * @param View $view
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param ITagManager $fileTagger manager for private tags
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param Folder $userFolder
+     * @param IAppManager $appManager
+     */
+    public function __construct(Tree $tree,
+                                View $view,
+                                ISystemTagManager $tagManager,
+                                ISystemTagObjectMapper $tagMapper,
+                                ITagManager $fileTagger,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                Folder $userFolder,
+                                IAppManager $appManager
+    ) {
+        $this->tree = $tree;
+        $this->fileView = $view;
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->fileTagger = $fileTagger;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->userFolder = $userFolder;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+
+        $this->server = $server;
+        $this->server->on('report', [$this, 'onReport']);
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        return [self::REPORT_NAME];
+    }
+
+    /**
+     * REPORT operations to look for files
+     *
+     * @param string $reportName
+     * @param $report
+     * @param string $uri
+     * @return bool
+     * @throws BadRequest
+     * @throws PreconditionFailed
+     * @internal param $ [] $report
+     */
+    public function onReport($reportName, $report, $uri) {
+        $reportTargetNode = $this->server->tree->getNodeForPath($uri);
+        if (!$reportTargetNode instanceof Directory || $reportName !== self::REPORT_NAME) {
+            return;
+        }
+
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        $requestedProps = [];
+        $filterRules = [];
+
+        // parse report properties and gather filter info
+        foreach ($report as $reportProps) {
+            $name = $reportProps['name'];
+            if ($name === $ns . 'filter-rules') {
+                $filterRules = $reportProps['value'];
+            } else if ($name === '{DAV:}prop') {
+                // propfind properties
+                foreach ($reportProps['value'] as $propVal) {
+                    $requestedProps[] = $propVal['name'];
+                }
+            }
+        }
+
+        if (empty($filterRules)) {
+            // an empty filter would return all existing files which would be slow
+            throw new BadRequest('Missing filter-rule block in request');
+        }
+
+        // gather all file ids matching filter
+        try {
+            $resultFileIds = $this->processFilterRules($filterRules);
+        } catch (TagNotFoundException $e) {
+            throw new PreconditionFailed('Cannot filter by non-existing tag', 0, $e);
+        }
+
+        // find sabre nodes by file id, restricted to the root node path
+        $results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
+
+        $filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
+        $responses = $this->prepareResponses($filesUri, $requestedProps, $results);
+
+        $xml = $this->server->xml->write(
+            '{DAV:}multistatus',
+            new MultiStatus($responses)
+        );
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody($xml);
+
+        return false;
+    }
+
+    /**
+     * Returns the base uri of the files root by removing
+     * the subpath from the URI
+     *
+     * @param string $uri URI from this request
+     * @param string $subPath subpath to remove from the URI
+     *
+     * @return string files base uri
+     */
+    private function getFilesBaseUri($uri, $subPath) {
+        $uri = trim($uri, '/');
+        $subPath = trim($subPath, '/');
+        if (empty($subPath)) {
+            $filesUri = $uri;
+        } else {
+            $filesUri = substr($uri, 0, strlen($uri) - strlen($subPath));
+        }
+        $filesUri = trim($filesUri, '/');
+        if (empty($filesUri)) {
+            return '';
+        }
+        return '/' . $filesUri;
+    }
+
+    /**
+     * Find file ids matching the given filter rules
+     *
+     * @param array $filterRules
+     * @return array array of unique file id results
+     *
+     * @throws TagNotFoundException whenever a tag was not found
+     */
+    protected function processFilterRules($filterRules) {
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        $resultFileIds = null;
+        $systemTagIds = [];
+        $circlesIds = [];
+        $favoriteFilter = null;
+        foreach ($filterRules as $filterRule) {
+            if ($filterRule['name'] === $ns . 'systemtag') {
+                $systemTagIds[] = $filterRule['value'];
+            }
+            if ($filterRule['name'] === self::CIRCLE_PROPERTYNAME) {
+                $circlesIds[] = $filterRule['value'];
+            }
+            if ($filterRule['name'] === $ns . 'favorite') {
+                $favoriteFilter = true;
+            }
+
+        }
+
+        if ($favoriteFilter !== null) {
+            $resultFileIds = $this->fileTagger->load('files')->getFavorites();
+            if (empty($resultFileIds)) {
+                return [];
+            }
+        }
+
+        if (!empty($systemTagIds)) {
+            $fileIds = $this->getSystemTagFileIds($systemTagIds);
+            if (empty($resultFileIds)) {
+                $resultFileIds = $fileIds;
+            } else {
+                $resultFileIds = array_intersect($fileIds, $resultFileIds);
+            }
+        }
+
+        if (!empty($circlesIds)) {
+            $fileIds = $this->getCirclesFileIds($circlesIds);
+            if (empty($resultFileIds)) {
+                $resultFileIds = $fileIds;
+            } else {
+                $resultFileIds = array_intersect($fileIds, $resultFileIds);
+            }
+        }
+
+        return $resultFileIds;
+    }
+
+    private function getSystemTagFileIds($systemTagIds) {
+        $resultFileIds = null;
+
+        // check user permissions, if applicable
+        if (!$this->isAdmin()) {
+            // check visibility/permission
+            $tags = $this->tagManager->getTagsByIds($systemTagIds);
+            $unknownTagIds = [];
+            foreach ($tags as $tag) {
+                if (!$tag->isUserVisible()) {
+                    $unknownTagIds[] = $tag->getId();
+                }
+            }
+
+            if (!empty($unknownTagIds)) {
+                throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+            }
+        }
+
+        // fetch all file ids and intersect them
+        foreach ($systemTagIds as $systemTagId) {
+            $fileIds = $this->tagMapper->getObjectIdsForTags($systemTagId, 'files');
+
+            if (empty($fileIds)) {
+                // This tag has no files, nothing can ever show up
+                return [];
+            }
+
+            // first run ?
+            if ($resultFileIds === null) {
+                $resultFileIds = $fileIds;
+            } else {
+                $resultFileIds = array_intersect($resultFileIds, $fileIds);
+            }
+
+            if (empty($resultFileIds)) {
+                // Empty intersection, nothing can show up anymore
+                return [];
+            }
+        }
+        return $resultFileIds;
+    }
+
+    /**
+     * @suppress PhanUndeclaredClassMethod
+     * @param array $circlesIds
+     * @return array
+     */
+    private function getCirclesFileIds(array $circlesIds) {
+        if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
+            return [];
+        }
+        return \OCA\Circles\Api\v1\Circles::getFilesForCircles($circlesIds);
+    }
+
+
+    /**
+     * Prepare propfind response for the given nodes
+     *
+     * @param string $filesUri $filesUri URI leading to root of the files URI,
+     * with a leading slash but no trailing slash
+     * @param string[] $requestedProps requested properties
+     * @param Node[] nodes nodes for which to fetch and prepare responses
+     * @return Response[]
+     */
+    public function prepareResponses($filesUri, $requestedProps, $nodes) {
+        $responses = [];
+        foreach ($nodes as $node) {
+            $propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
+
+            $this->server->getPropertiesByNode($propFind, $node);
+            // copied from Sabre Server's getPropertiesForPath
+            $result = $propFind->getResultForMultiStatus();
+            $result['href'] = $propFind->getPath();
+
+            $resourceType = $this->server->getResourceTypeForNode($node);
+            if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
+                $result['href'] .= '/';
+            }
+
+            $responses[] = new Response(
+                rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+                $result,
+                200
+            );
+        }
+        return $responses;
+    }
+
+    /**
+     * Find Sabre nodes by file ids
+     *
+     * @param Node $rootNode root node for search
+     * @param array $fileIds file ids
+     * @return Node[] array of Sabre nodes
+     */
+    public function findNodesByFileIds($rootNode, $fileIds) {
+        $folder = $this->userFolder;
+        if (trim($rootNode->getPath(), '/') !== '') {
+            $folder = $folder->get($rootNode->getPath());
+        }
+
+        $results = [];
+        foreach ($fileIds as $fileId) {
+            $entry = $folder->getById($fileId);
+            if ($entry) {
+                $entry = current($entry);
+                if ($entry instanceof \OCP\Files\File) {
+                    $results[] = new File($this->fileView, $entry);
+                } else if ($entry instanceof \OCP\Files\Folder) {
+                    $results[] = new Directory($this->fileView, $entry);
+                }
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Returns whether the currently logged in user is an administrator
+     */
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
 }

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

Indentation +217 added lines, -217 removed lines

@@ -54,246 +54,246 @@
 class TagsPlugin extends \Sabre\DAV\ServerPlugin
 {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
-	const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
-	const TAG_FAVORITE = '_$!<Favorite>!$_';
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
+    const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
+    const TAG_FAVORITE = '_$!<Favorite>!$_';
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var \OCP\ITagManager
-	 */
-	private $tagManager;
+    /**
+     * @var \OCP\ITagManager
+     */
+    private $tagManager;
 
-	/**
-	 * @var \OCP\ITags
-	 */
-	private $tagger;
+    /**
+     * @var \OCP\ITags
+     */
+    private $tagger;
 
-	/**
-	 * Array of file id to tags array
-	 * The null value means the cache wasn't initialized.
-	 *
-	 * @var array
-	 */
-	private $cachedTags;
+    /**
+     * Array of file id to tags array
+     * The null value means the cache wasn't initialized.
+     *
+     * @var array
+     */
+    private $cachedTags;
 
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
+    /**
+     * @var \Sabre\DAV\Tree
+     */
+    private $tree;
 
-	/**
-	 * @param \Sabre\DAV\Tree $tree tree
-	 * @param \OCP\ITagManager $tagManager tag manager
-	 */
-	public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
-		$this->tree = $tree;
-		$this->tagManager = $tagManager;
-		$this->tagger = null;
-		$this->cachedTags = [];
-	}
+    /**
+     * @param \Sabre\DAV\Tree $tree tree
+     * @param \OCP\ITagManager $tagManager tag manager
+     */
+    public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
+        $this->tree = $tree;
+        $this->tagManager = $tagManager;
+        $this->tagger = null;
+        $this->cachedTags = [];
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
 
-		$this->server = $server;
-		$this->server->on('propFind', [$this, 'handleGetProperties']);
-		$this->server->on('propPatch', [$this, 'handleUpdateProperties']);
-	}
+        $this->server = $server;
+        $this->server->on('propFind', [$this, 'handleGetProperties']);
+        $this->server->on('propPatch', [$this, 'handleUpdateProperties']);
+    }
 
-	/**
-	 * Returns the tagger
-	 *
-	 * @return \OCP\ITags tagger
-	 */
-	private function getTagger() {
-		if (!$this->tagger) {
-			$this->tagger = $this->tagManager->load('files');
-		}
-		return $this->tagger;
-	}
+    /**
+     * Returns the tagger
+     *
+     * @return \OCP\ITags tagger
+     */
+    private function getTagger() {
+        if (!$this->tagger) {
+            $this->tagger = $this->tagManager->load('files');
+        }
+        return $this->tagger;
+    }
 
-	/**
-	 * Returns tags and favorites.
-	 *
-	 * @param integer $fileId file id
-	 * @return array list($tags, $favorite) with $tags as tag array
-	 * and $favorite is a boolean whether the file was favorited
-	 */
-	private function getTagsAndFav($fileId) {
-		$isFav = false;
-		$tags = $this->getTags($fileId);
-		if ($tags) {
-			$favPos = array_search(self::TAG_FAVORITE, $tags);
-			if ($favPos !== false) {
-				$isFav = true;
-				unset($tags[$favPos]);
-			}
-		}
-		return [$tags, $isFav];
-	}
+    /**
+     * Returns tags and favorites.
+     *
+     * @param integer $fileId file id
+     * @return array list($tags, $favorite) with $tags as tag array
+     * and $favorite is a boolean whether the file was favorited
+     */
+    private function getTagsAndFav($fileId) {
+        $isFav = false;
+        $tags = $this->getTags($fileId);
+        if ($tags) {
+            $favPos = array_search(self::TAG_FAVORITE, $tags);
+            if ($favPos !== false) {
+                $isFav = true;
+                unset($tags[$favPos]);
+            }
+        }
+        return [$tags, $isFav];
+    }
 
-	/**
-	 * Returns tags for the given file id
-	 *
-	 * @param integer $fileId file id
-	 * @return array list of tags for that file
-	 */
-	private function getTags($fileId) {
-		if (isset($this->cachedTags[$fileId])) {
-			return $this->cachedTags[$fileId];
-		} else {
-			$tags = $this->getTagger()->getTagsForObjects([$fileId]);
-			if ($tags !== false) {
-				if (empty($tags)) {
-					return [];
-				}
-				return current($tags);
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns tags for the given file id
+     *
+     * @param integer $fileId file id
+     * @return array list of tags for that file
+     */
+    private function getTags($fileId) {
+        if (isset($this->cachedTags[$fileId])) {
+            return $this->cachedTags[$fileId];
+        } else {
+            $tags = $this->getTagger()->getTagsForObjects([$fileId]);
+            if ($tags !== false) {
+                if (empty($tags)) {
+                    return [];
+                }
+                return current($tags);
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Updates the tags of the given file id
-	 *
-	 * @param int $fileId
-	 * @param array $tags array of tag strings
-	 */
-	private function updateTags($fileId, $tags) {
-		$tagger = $this->getTagger();
-		$currentTags = $this->getTags($fileId);
+    /**
+     * Updates the tags of the given file id
+     *
+     * @param int $fileId
+     * @param array $tags array of tag strings
+     */
+    private function updateTags($fileId, $tags) {
+        $tagger = $this->getTagger();
+        $currentTags = $this->getTags($fileId);
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->unTag($fileId, $tag);
-		}
-	}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->unTag($fileId, $tag);
+        }
+    }
 
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
 
-		// need prefetch ?
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
-			|| !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
-		)) {
-			// note: pre-fetching only supported for depth <= 1
-			$folderContent = $node->getChildren();
-			$fileIds[] = (int)$node->getId();
-			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
-			}
-			$tags = $this->getTagger()->getTagsForObjects($fileIds);
-			if ($tags === false) {
-				// the tags API returns false on error...
-				$tags = [];
-			}
+        // need prefetch ?
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
+            || !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
+        )) {
+            // note: pre-fetching only supported for depth <= 1
+            $folderContent = $node->getChildren();
+            $fileIds[] = (int)$node->getId();
+            foreach ($folderContent as $info) {
+                $fileIds[] = (int)$info->getId();
+            }
+            $tags = $this->getTagger()->getTagsForObjects($fileIds);
+            if ($tags === false) {
+                // the tags API returns false on error...
+                $tags = [];
+            }
 
-			$this->cachedTags = $this->cachedTags + $tags;
-			$emptyFileIds = array_diff($fileIds, array_keys($tags));
-			// also cache the ones that were not found
-			foreach ($emptyFileIds as $fileId) {
-				$this->cachedTags[$fileId] = [];
-			}
-		}
+            $this->cachedTags = $this->cachedTags + $tags;
+            $emptyFileIds = array_diff($fileIds, array_keys($tags));
+            // also cache the ones that were not found
+            foreach ($emptyFileIds as $fileId) {
+                $this->cachedTags[$fileId] = [];
+            }
+        }
 
-		$isFav = null;
+        $isFav = null;
 
-		$propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) {
-			list($tags, $isFav) = $this->getTagsAndFav($node->getId());
-			return new TagList($tags);
-		});
+        $propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) {
+            list($tags, $isFav) = $this->getTagsAndFav($node->getId());
+            return new TagList($tags);
+        });
 
-		$propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
-			if (is_null($isFav)) {
-				list(, $isFav) = $this->getTagsAndFav($node->getId());
-			}
-			if ($isFav) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-	}
+        $propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
+            if (is_null($isFav)) {
+                list(, $isFav) = $this->getTagsAndFav($node->getId());
+            }
+            if ($isFav) {
+                return 1;
+            } else {
+                return 0;
+            }
+        });
+    }
 
-	/**
-	 * Updates tags and favorites properties, if applicable.
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->tree->getNodeForPath($path);
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
+    /**
+     * Updates tags and favorites properties, if applicable.
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->tree->getNodeForPath($path);
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
 
-		$propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($node) {
-			$this->updateTags($node->getId(), $tagList->getTags());
-			return true;
-		});
+        $propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($node) {
+            $this->updateTags($node->getId(), $tagList->getTags());
+            return true;
+        });
 
-		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node) {
-			if ((int)$favState === 1 || $favState === 'true') {
-				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
-			} else {
-				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
-			}
+        $propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node) {
+            if ((int)$favState === 1 || $favState === 'true') {
+                $this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
+            } else {
+                $this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
+            }
 
-			if (is_null($favState)) {
-				// confirm deletion
-				return 204;
-			}
+            if (is_null($favState)) {
+                // confirm deletion
+                return 204;
+            }
 
-			return 200;
-		});
-	}
+            return 200;
+        });
+    }
 }

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

Indentation +177 added lines, -177 removed lines

@@ -35,181 +35,181 @@
  */
 class SharesPlugin extends \Sabre\DAV\ServerPlugin {
 
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
-	const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types';
-	const SHAREES_PROPERTYNAME = '{http://nextcloud.org/ns}sharees';
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var \OCP\Share\IManager
-	 */
-	private $shareManager;
-
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var string
-	 */
-	private $userId;
-
-	/**
-	 * @var \OCP\Files\Folder
-	 */
-	private $userFolder;
-
-	/** @var IShare[] */
-	private $cachedShares = [];
-
-	private $cachedFolders = [];
-
-	/**
-	 * @param \Sabre\DAV\Tree $tree tree
-	 * @param IUserSession $userSession user session
-	 * @param \OCP\Files\Folder $userFolder user home folder
-	 * @param \OCP\Share\IManager $shareManager share manager
-	 */
-	public function __construct(
-		\Sabre\DAV\Tree $tree,
-		IUserSession $userSession,
-		\OCP\Files\Folder $userFolder,
-		\OCP\Share\IManager $shareManager
-	) {
-		$this->tree = $tree;
-		$this->shareManager = $shareManager;
-		$this->userFolder = $userFolder;
-		$this->userId = $userSession->getUser()->getUID();
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->xml->namespacesMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->elementMap[self::SHARETYPES_PROPERTYNAME] = ShareTypeList::class;
-		$server->protectedProperties[] = self::SHARETYPES_PROPERTYNAME;
-		$server->protectedProperties[] = self::SHAREES_PROPERTYNAME;
-
-		$this->server = $server;
-		$this->server->on('propFind', [$this, 'handleGetProperties']);
-	}
-
-	private function getShare(\OCP\Files\Node $node): array {
-		$result = [];
-		$requestedShareTypes = [
-			\OCP\Share::SHARE_TYPE_USER,
-			\OCP\Share::SHARE_TYPE_GROUP,
-			\OCP\Share::SHARE_TYPE_LINK,
-			\OCP\Share::SHARE_TYPE_REMOTE,
-			\OCP\Share::SHARE_TYPE_EMAIL,
-			\OCP\Share::SHARE_TYPE_ROOM,
-			\OCP\Share::SHARE_TYPE_CIRCLE,
-		];
-		foreach ($requestedShareTypes as $requestedShareType) {
-			$shares = $this->shareManager->getSharesBy(
-				$this->userId,
-				$requestedShareType,
-				$node,
-				false,
-				-1
-			);
-			foreach ($shares as $share) {
-				$result[] = $share;
-			}
-		}
-		return $result;
-	}
-
-	private function getSharesFolder(\OCP\Files\Folder $node): array {
-		return $this->shareManager->getSharesInFolder(
-			$this->userId,
-			$node,
-			true
-		);
-	}
-
-	private function getShares(\Sabre\DAV\INode $sabreNode): array {
-		if (isset($this->cachedShares[$sabreNode->getId()])) {
-			$shares = $this->cachedShares[$sabreNode->getId()];
-		} else {
-			list($parentPath,) = \Sabre\Uri\split($sabreNode->getPath());
-			if ($parentPath === '') {
-				$parentPath = '/';
-			}
-			// if we already cached the folder this file is in we know there are no shares for this file
-			if (array_search($parentPath, $this->cachedFolders) === false) {
-				$node = $this->userFolder->get($sabreNode->getPath());
-				$shares = $this->getShare($node);
-				$this->cachedShares[$sabreNode->getId()] = $shares;
-			} else {
-				return [];
-			}
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * Adds shares to propfind response
-	 *
-	 * @param PropFind $propFind propfind object
-	 * @param \Sabre\DAV\INode $sabreNode sabre node
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $sabreNode
-	) {
-		if (!($sabreNode instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
-
-		// need prefetch ?
-		if ($sabreNode instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& (
-				!is_null($propFind->getStatus(self::SHARETYPES_PROPERTYNAME)) ||
-				!is_null($propFind->getStatus(self::SHAREES_PROPERTYNAME))
-			)
-		) {
-			$folderNode = $this->userFolder->get($sabreNode->getPath());
-
-			$this->cachedFolders[] = $sabreNode->getPath();
-			$childShares = $this->getSharesFolder($folderNode);
-			foreach ($childShares as $id => $shares) {
-				$this->cachedShares[$id] = $shares;
-			}
-		}
-
-		$propFind->handle(self::SHARETYPES_PROPERTYNAME, function () use ($sabreNode) {
-			$shares = $this->getShares($sabreNode);
-
-			$shareTypes = array_unique(array_map(function(IShare $share) {
-				return $share->getShareType();
-			}, $shares));
-
-			return new ShareTypeList($shareTypes);
-		});
-
-		$propFind->handle(self::SHAREES_PROPERTYNAME, function() use ($sabreNode) {
-			$shares = $this->getShares($sabreNode);
-
-			return new ShareeList($shares);
-		});
-	}
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+    const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types';
+    const SHAREES_PROPERTYNAME = '{http://nextcloud.org/ns}sharees';
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @var \OCP\Share\IManager
+     */
+    private $shareManager;
+
+    /**
+     * @var \Sabre\DAV\Tree
+     */
+    private $tree;
+
+    /**
+     * @var string
+     */
+    private $userId;
+
+    /**
+     * @var \OCP\Files\Folder
+     */
+    private $userFolder;
+
+    /** @var IShare[] */
+    private $cachedShares = [];
+
+    private $cachedFolders = [];
+
+    /**
+     * @param \Sabre\DAV\Tree $tree tree
+     * @param IUserSession $userSession user session
+     * @param \OCP\Files\Folder $userFolder user home folder
+     * @param \OCP\Share\IManager $shareManager share manager
+     */
+    public function __construct(
+        \Sabre\DAV\Tree $tree,
+        IUserSession $userSession,
+        \OCP\Files\Folder $userFolder,
+        \OCP\Share\IManager $shareManager
+    ) {
+        $this->tree = $tree;
+        $this->shareManager = $shareManager;
+        $this->userFolder = $userFolder;
+        $this->userId = $userSession->getUser()->getUID();
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->xml->namespacesMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->elementMap[self::SHARETYPES_PROPERTYNAME] = ShareTypeList::class;
+        $server->protectedProperties[] = self::SHARETYPES_PROPERTYNAME;
+        $server->protectedProperties[] = self::SHAREES_PROPERTYNAME;
+
+        $this->server = $server;
+        $this->server->on('propFind', [$this, 'handleGetProperties']);
+    }
+
+    private function getShare(\OCP\Files\Node $node): array {
+        $result = [];
+        $requestedShareTypes = [
+            \OCP\Share::SHARE_TYPE_USER,
+            \OCP\Share::SHARE_TYPE_GROUP,
+            \OCP\Share::SHARE_TYPE_LINK,
+            \OCP\Share::SHARE_TYPE_REMOTE,
+            \OCP\Share::SHARE_TYPE_EMAIL,
+            \OCP\Share::SHARE_TYPE_ROOM,
+            \OCP\Share::SHARE_TYPE_CIRCLE,
+        ];
+        foreach ($requestedShareTypes as $requestedShareType) {
+            $shares = $this->shareManager->getSharesBy(
+                $this->userId,
+                $requestedShareType,
+                $node,
+                false,
+                -1
+            );
+            foreach ($shares as $share) {
+                $result[] = $share;
+            }
+        }
+        return $result;
+    }
+
+    private function getSharesFolder(\OCP\Files\Folder $node): array {
+        return $this->shareManager->getSharesInFolder(
+            $this->userId,
+            $node,
+            true
+        );
+    }
+
+    private function getShares(\Sabre\DAV\INode $sabreNode): array {
+        if (isset($this->cachedShares[$sabreNode->getId()])) {
+            $shares = $this->cachedShares[$sabreNode->getId()];
+        } else {
+            list($parentPath,) = \Sabre\Uri\split($sabreNode->getPath());
+            if ($parentPath === '') {
+                $parentPath = '/';
+            }
+            // if we already cached the folder this file is in we know there are no shares for this file
+            if (array_search($parentPath, $this->cachedFolders) === false) {
+                $node = $this->userFolder->get($sabreNode->getPath());
+                $shares = $this->getShare($node);
+                $this->cachedShares[$sabreNode->getId()] = $shares;
+            } else {
+                return [];
+            }
+        }
+
+        return $shares;
+    }
+
+    /**
+     * Adds shares to propfind response
+     *
+     * @param PropFind $propFind propfind object
+     * @param \Sabre\DAV\INode $sabreNode sabre node
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $sabreNode
+    ) {
+        if (!($sabreNode instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
+
+        // need prefetch ?
+        if ($sabreNode instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && (
+                !is_null($propFind->getStatus(self::SHARETYPES_PROPERTYNAME)) ||
+                !is_null($propFind->getStatus(self::SHAREES_PROPERTYNAME))
+            )
+        ) {
+            $folderNode = $this->userFolder->get($sabreNode->getPath());
+
+            $this->cachedFolders[] = $sabreNode->getPath();
+            $childShares = $this->getSharesFolder($folderNode);
+            foreach ($childShares as $id => $shares) {
+                $this->cachedShares[$id] = $shares;
+            }
+        }
+
+        $propFind->handle(self::SHARETYPES_PROPERTYNAME, function () use ($sabreNode) {
+            $shares = $this->getShares($sabreNode);
+
+            $shareTypes = array_unique(array_map(function(IShare $share) {
+                return $share->getShareType();
+            }, $shares));
+
+            return new ShareTypeList($shareTypes);
+        });
+
+        $propFind->handle(self::SHAREES_PROPERTYNAME, function() use ($sabreNode) {
+            $shares = $this->getShares($sabreNode);
+
+            return new ShareeList($shares);
+        });
+    }
 }

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

Indentation +401 added lines, -401 removed lines

@@ -50,405 +50,405 @@
 use Sabre\DAV\INode;
 
 class Directory extends \OCA\DAV\Connector\Sabre\Node
-	implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget {
-
-	/**
-	 * Cached directory content
-	 *
-	 * @var \OCP\Files\FileInfo[]
-	 */
-	private $dirContent;
-
-	/**
-	 * Cached quota info
-	 *
-	 * @var array
-	 */
-	private $quotaInfo;
-
-	/**
-	 * @var ObjectTree|null
-	 */
-	private $tree;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\FileInfo $info
-	 * @param ObjectTree|null $tree
-	 * @param \OCP\Share\IManager $shareManager
-	 */
-	public function __construct(View $view, FileInfo $info, $tree = null, $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, [], 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['mimetype'] === 'httpd/unix-directory') {
-			$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
-				throw new Forbidden('No read permissions');
-			}
-			$folderContent = $this->fileView->getDirectoryContent($this->path);
-		} 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() {
-		if ($this->quotaInfo) {
-			return $this->quotaInfo;
-		}
-		try {
-			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info);
-			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\StorageNotAvailableException $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');
-		}
-
-		list($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;
-	}
+    implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget {
+
+    /**
+     * Cached directory content
+     *
+     * @var \OCP\Files\FileInfo[]
+     */
+    private $dirContent;
+
+    /**
+     * Cached quota info
+     *
+     * @var array
+     */
+    private $quotaInfo;
+
+    /**
+     * @var ObjectTree|null
+     */
+    private $tree;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param \OC\Files\View $view
+     * @param \OCP\Files\FileInfo $info
+     * @param ObjectTree|null $tree
+     * @param \OCP\Share\IManager $shareManager
+     */
+    public function __construct(View $view, FileInfo $info, $tree = null, $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, [], 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['mimetype'] === 'httpd/unix-directory') {
+            $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
+                throw new Forbidden('No read permissions');
+            }
+            $folderContent = $this->fileView->getDirectoryContent($this->path);
+        } 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() {
+        if ($this->quotaInfo) {
+            return $this->quotaInfo;
+        }
+        try {
+            $storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info);
+            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\StorageNotAvailableException $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');
+        }
+
+        list($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;
+    }
 }

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

Indentation +601 added lines, -601 removed lines

@@ -70,605 +70,605 @@
 
 class File extends Node implements IFile {
 
-	protected $request;
-
-	/**
-	 * 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);
-
-		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 ($this->info && $exists && !$this->info->isUpdateable()) {
-				throw new Forbidden();
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("File is not updatable: " . $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 */
-		list($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('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 */
-		list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath);
-		/** @var \OC\Files\Storage\Storage $storage */
-		list($storage, $internalPath) = $this->fileView->resolvePath($this->path);
-		try {
-			if (!$needsPartFile) {
-				$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
-			}
-
-			if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
-
-				if (!is_resource($data)) {
-					$tmpData = fopen('php://temp', 'r+');
-					if ($data !== null) {
-						fwrite($tmpData, $data);
-						rewind($tmpData);
-					}
-					$data = $tmpData;
-				}
-
-				$isEOF = false;
-				$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function ($stream) use (&$isEOF) {
-					$isEOF = feof($stream);
-				});
-
-				$count = $partStorage->writeStream($internalPartPath, $wrappedData);
-				$result = $count > 0;
-
-				if ($result === false) {
-					$result = $isEOF;
-					if (is_resource($wrappedData)) {
-						$result = feof($wrappedData);
-					}
-				}
-
-			} else {
-				$target = $partStorage->fopen($internalPartPath, 'wb');
-				if ($target === false) {
-					\OC::$server->getLogger()->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('Could not write file contents');
-				}
-				list($count, $result) = \OC_Helper::streamCopy($data, $target);
-				fclose($target);
-			}
-
-			if ($result === false) {
-				$expected = -1;
-				if (isset($_SERVER['CONTENT_LENGTH'])) {
-					$expected = $_SERVER['CONTENT_LENGTH'];
-				}
-				if ($expected !== "0") {
-					throw new Exception('Error while copying file to target location (copied bytes: ' . $count . ', expected filesize: ' . $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('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $count . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
-				}
-			}
-
-		} catch (\Exception $e) {
-			$context = [];
-
-			if ($e instanceof LockedException) {
-				$context['level'] = ILogger::DEBUG;
-			}
-
-			\OC::$server->getLogger()->logException($e, $context);
-			if ($needsPartFile) {
-				$partStorage->unlink($internalPartPath);
-			}
-			$this->convertToSabreException($e);
-		}
-
-		try {
-			if ($needsPartFile) {
-				if ($view && !$this->emitPreHooks($exists)) {
-					$partStorage->unlink($internalPartPath);
-					throw new Exception('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->getLogger()->error('renaming part file to final file failed $renameOkay: ' . ($renameOkay ? 'true' : 'false') . ', $fileExists: ' . ($fileExists ? 'true' : 'false') . ')', ['app' => 'webdav']);
-						throw new Exception('Could not rename part file to final file');
-					}
-				} catch (ForbiddenException $ex) {
-					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->fileView->putFileInfo($this->path, ['checksum' => $checksum]);
-				$this->refreshInfo();
-			} else if ($this->getChecksum() !== null && $this->getChecksum() !== '') {
-				$this->fileView->putFileInfo($this->path, ['checksum' => '']);
-				$this->refreshInfo();
-			}
-
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to check file size: " . $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("Could not open file");
-			}
-			return $res;
-		} catch (GenericEncryptionException $e) {
-			// returning 503 will allow retry of the operation at a later point in time
-			throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to open file: " . $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("Failed to unlink: " . $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|false
-	 */
-	public function getDirectDownload() {
-		if (\OCP\App::isEnabled('encryption')) {
-			return [];
-		}
-		/** @var \OCP\Files\Storage $storage */
-		list($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) {
-		list($path, $name) = \Sabre\Uri\split($this->path);
-
-		$info = \OC_FileChunking::decodeName($name);
-		if (empty($info)) {
-			throw new NotImplemented('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('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $bytesWritten . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
-				}
-			}
-		}
-
-		if ($chunk_handler->isComplete()) {
-			/** @var Storage $storage */
-			list($storage,) = $this->fileView->resolvePath($path);
-			$needsPartFile = $storage->needsPartFile();
-			$partFile = null;
-
-			$targetPath = $path . '/' . $info['name'];
-			/** @var \OC\Files\Storage\Storage $targetStorage */
-			list($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 */
-				list($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 */
-					list($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->getLogger()->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('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]);
-				} else if ($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('Encryption not ready: ' . $e->getMessage(), 0, $e);
-		}
-		if ($e instanceof StorageNotAvailableException) {
-			throw new ServiceUnavailable('Failed to write file contents: ' . $e->getMessage(), 0, $e);
-		}
-		if ($e instanceof NotFoundException) {
-			throw new NotFound('File not found: ' . $e->getMessage(), 0, $e);
-		}
-
-		throw new \Sabre\DAV\Exception($e->getMessage(), 0, $e);
-	}
-
-	/**
-	 * Get the checksum for this file
-	 *
-	 * @return string
-	 */
-	public function getChecksum() {
-		return $this->info->getChecksum();
-	}
-
-	protected function header($string) {
-		\header($string);
-	}
+    protected $request;
+
+    /**
+     * 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);
+
+        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 ($this->info && $exists && !$this->info->isUpdateable()) {
+                throw new Forbidden();
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable("File is not updatable: " . $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 */
+        list($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('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 */
+        list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath);
+        /** @var \OC\Files\Storage\Storage $storage */
+        list($storage, $internalPath) = $this->fileView->resolvePath($this->path);
+        try {
+            if (!$needsPartFile) {
+                $this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
+            }
+
+            if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
+
+                if (!is_resource($data)) {
+                    $tmpData = fopen('php://temp', 'r+');
+                    if ($data !== null) {
+                        fwrite($tmpData, $data);
+                        rewind($tmpData);
+                    }
+                    $data = $tmpData;
+                }
+
+                $isEOF = false;
+                $wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function ($stream) use (&$isEOF) {
+                    $isEOF = feof($stream);
+                });
+
+                $count = $partStorage->writeStream($internalPartPath, $wrappedData);
+                $result = $count > 0;
+
+                if ($result === false) {
+                    $result = $isEOF;
+                    if (is_resource($wrappedData)) {
+                        $result = feof($wrappedData);
+                    }
+                }
+
+            } else {
+                $target = $partStorage->fopen($internalPartPath, 'wb');
+                if ($target === false) {
+                    \OC::$server->getLogger()->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('Could not write file contents');
+                }
+                list($count, $result) = \OC_Helper::streamCopy($data, $target);
+                fclose($target);
+            }
+
+            if ($result === false) {
+                $expected = -1;
+                if (isset($_SERVER['CONTENT_LENGTH'])) {
+                    $expected = $_SERVER['CONTENT_LENGTH'];
+                }
+                if ($expected !== "0") {
+                    throw new Exception('Error while copying file to target location (copied bytes: ' . $count . ', expected filesize: ' . $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('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $count . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
+                }
+            }
+
+        } catch (\Exception $e) {
+            $context = [];
+
+            if ($e instanceof LockedException) {
+                $context['level'] = ILogger::DEBUG;
+            }
+
+            \OC::$server->getLogger()->logException($e, $context);
+            if ($needsPartFile) {
+                $partStorage->unlink($internalPartPath);
+            }
+            $this->convertToSabreException($e);
+        }
+
+        try {
+            if ($needsPartFile) {
+                if ($view && !$this->emitPreHooks($exists)) {
+                    $partStorage->unlink($internalPartPath);
+                    throw new Exception('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->getLogger()->error('renaming part file to final file failed $renameOkay: ' . ($renameOkay ? 'true' : 'false') . ', $fileExists: ' . ($fileExists ? 'true' : 'false') . ')', ['app' => 'webdav']);
+                        throw new Exception('Could not rename part file to final file');
+                    }
+                } catch (ForbiddenException $ex) {
+                    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->fileView->putFileInfo($this->path, ['checksum' => $checksum]);
+                $this->refreshInfo();
+            } else if ($this->getChecksum() !== null && $this->getChecksum() !== '') {
+                $this->fileView->putFileInfo($this->path, ['checksum' => '']);
+                $this->refreshInfo();
+            }
+
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable("Failed to check file size: " . $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("Could not open file");
+            }
+            return $res;
+        } catch (GenericEncryptionException $e) {
+            // returning 503 will allow retry of the operation at a later point in time
+            throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable("Failed to open file: " . $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("Failed to unlink: " . $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|false
+     */
+    public function getDirectDownload() {
+        if (\OCP\App::isEnabled('encryption')) {
+            return [];
+        }
+        /** @var \OCP\Files\Storage $storage */
+        list($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) {
+        list($path, $name) = \Sabre\Uri\split($this->path);
+
+        $info = \OC_FileChunking::decodeName($name);
+        if (empty($info)) {
+            throw new NotImplemented('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('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $bytesWritten . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
+                }
+            }
+        }
+
+        if ($chunk_handler->isComplete()) {
+            /** @var Storage $storage */
+            list($storage,) = $this->fileView->resolvePath($path);
+            $needsPartFile = $storage->needsPartFile();
+            $partFile = null;
+
+            $targetPath = $path . '/' . $info['name'];
+            /** @var \OC\Files\Storage\Storage $targetStorage */
+            list($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 */
+                list($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 */
+                    list($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->getLogger()->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('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]);
+                } else if ($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('Encryption not ready: ' . $e->getMessage(), 0, $e);
+        }
+        if ($e instanceof StorageNotAvailableException) {
+            throw new ServiceUnavailable('Failed to write file contents: ' . $e->getMessage(), 0, $e);
+        }
+        if ($e instanceof NotFoundException) {
+            throw new NotFound('File not found: ' . $e->getMessage(), 0, $e);
+        }
+
+        throw new \Sabre\DAV\Exception($e->getMessage(), 0, $e);
+    }
+
+    /**
+     * Get the checksum for this file
+     *
+     * @return string
+     */
+    public function getChecksum() {
+        return $this->info->getChecksum();
+    }
+
+    protected function header($string) {
+        \header($string);
+    }
 }

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

Indentation +127 added lines, -127 removed lines

@@ -32,132 +32,132 @@
 
 class CommentPropertiesPlugin extends ServerPlugin {
 
-	const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
-	const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
-
-	/** @var  \Sabre\DAV\Server */
-	protected $server;
-
-	/** @var ICommentsManager */
-	private $commentsManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	private $cachedUnreadCount = [];
-
-	private $cachedFolders = [];
-
-	public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
-		$this->commentsManager = $commentsManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('propFind', [$this, 'handleGetProperties']);
-	}
-
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof File) && !($node instanceof Directory)) {
-			return;
-		}
-
-		// need prefetch ?
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& !is_null($propFind->getStatus(self::PROPERTY_NAME_UNREAD))
-		) {
-			$unreadCounts = $this->commentsManager->getNumberOfUnreadCommentsForFolder($node->getId(), $this->userSession->getUser());
-			$this->cachedFolders[] = $node->getPath();
-			foreach ($unreadCounts as $id => $count) {
-				$this->cachedUnreadCount[$id] = $count;
-			}
-		}
-
-		$propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
-			return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId());
-		});
-
-		$propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
-			return $this->getCommentsLink($node);
-		});
-
-		$propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
-			if (isset($this->cachedUnreadCount[$node->getId()])) {
-				return $this->cachedUnreadCount[$node->getId()];
-			} else {
-				list($parentPath,) = \Sabre\Uri\split($node->getPath());
-				if ($parentPath === '') {
-					$parentPath = '/';
-				}
-				// if we already cached the folder this file is in we know there are no comments for this file
-				if (array_search($parentPath, $this->cachedFolders) === false) {
-					return 0;
-				} else {
-					return $this->getUnreadCount($node);
-				}
-			}
-		});
-	}
-
-	/**
-	 * returns a reference to the comments node
-	 *
-	 * @param Node $node
-	 * @return mixed|string
-	 */
-	public function getCommentsLink(Node $node) {
-		$href =  $this->server->getBaseUri();
-		$entryPoint = strpos($href, '/remote.php/');
-		if($entryPoint === false) {
-			// in case we end up somewhere else, unexpectedly.
-			return null;
-		}
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
-		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
-		return $href;
-	}
-
-	/**
-	 * returns the number of unread comments for the currently logged in user
-	 * on the given file or directory node
-	 *
-	 * @param Node $node
-	 * @return Int|null
-	 */
-	public function getUnreadCount(Node $node) {
-		$user = $this->userSession->getUser();
-		if(is_null($user)) {
-			return null;
-		}
-
-		$lastRead = $this->commentsManager->getReadMark('files', (string)$node->getId(), $user);
-
-		return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId(), $lastRead);
-	}
+    const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
+    const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
+    const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
+
+    /** @var  \Sabre\DAV\Server */
+    protected $server;
+
+    /** @var ICommentsManager */
+    private $commentsManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    private $cachedUnreadCount = [];
+
+    private $cachedFolders = [];
+
+    public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
+        $this->commentsManager = $commentsManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('propFind', [$this, 'handleGetProperties']);
+    }
+
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof File) && !($node instanceof Directory)) {
+            return;
+        }
+
+        // need prefetch ?
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && !is_null($propFind->getStatus(self::PROPERTY_NAME_UNREAD))
+        ) {
+            $unreadCounts = $this->commentsManager->getNumberOfUnreadCommentsForFolder($node->getId(), $this->userSession->getUser());
+            $this->cachedFolders[] = $node->getPath();
+            foreach ($unreadCounts as $id => $count) {
+                $this->cachedUnreadCount[$id] = $count;
+            }
+        }
+
+        $propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
+            return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId());
+        });
+
+        $propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
+            return $this->getCommentsLink($node);
+        });
+
+        $propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
+            if (isset($this->cachedUnreadCount[$node->getId()])) {
+                return $this->cachedUnreadCount[$node->getId()];
+            } else {
+                list($parentPath,) = \Sabre\Uri\split($node->getPath());
+                if ($parentPath === '') {
+                    $parentPath = '/';
+                }
+                // if we already cached the folder this file is in we know there are no comments for this file
+                if (array_search($parentPath, $this->cachedFolders) === false) {
+                    return 0;
+                } else {
+                    return $this->getUnreadCount($node);
+                }
+            }
+        });
+    }
+
+    /**
+     * returns a reference to the comments node
+     *
+     * @param Node $node
+     * @return mixed|string
+     */
+    public function getCommentsLink(Node $node) {
+        $href =  $this->server->getBaseUri();
+        $entryPoint = strpos($href, '/remote.php/');
+        if($entryPoint === false) {
+            // in case we end up somewhere else, unexpectedly.
+            return null;
+        }
+        $commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+        $href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
+        return $href;
+    }
+
+    /**
+     * returns the number of unread comments for the currently logged in user
+     * on the given file or directory node
+     *
+     * @param Node $node
+     * @return Int|null
+     */
+    public function getUnreadCount(Node $node) {
+        $user = $this->userSession->getUser();
+        if(is_null($user)) {
+            return null;
+        }
+
+        $lastRead = $this->commentsManager->getReadMark('files', (string)$node->getId(), $user);
+
+        return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId(), $lastRead);
+    }
 
 }