Merge pull request #1007 from nextcloud/shared-storage-non-recursive

Fix shared storage recursive setup
nextcloud · Aug 23, 2016 · 2f1b17d · 2f1b17d
2 parents 3ed1024 + a0c2342
commit 2f1b17d
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 125 deletions.
diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
@@ -244,7 +244,7 @@ public function getNumericStorageId() {
 
 		$query = $builder->select('storage')
 			->from('filecache')
-			->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getShare()->getNodeId())));
+			->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
 
 		return $query->execute()->fetchColumn();
 	}

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
@@ -61,11 +61,6 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
 	 */
 	private $sourceRootInfo;
 
-	/**
-	 * @var IStorage
-	 */
-	private $sourceStorage;
-
 	/** @var string */
 	private $user;
 
@@ -83,13 +78,9 @@ public function __construct($arguments) {
 
 		$this->user = $arguments['user'];
 
-		Filesystem::initMountPoints($this->superShare->getShareOwner());
-		$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
-		list($storage, $internalPath) = $this->ownerView->resolvePath($sourcePath);
-
 		parent::__construct([
-			'storage' => $storage,
-			'root' => $internalPath,
+			'storage' => null,
+			'root' => null,
 		]);
 	}
 
@@ -101,9 +92,11 @@ private function init() {
 		try {
 			Filesystem::initMountPoints($this->superShare->getShareOwner());
 			$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
-			list($this->sourceStorage, $sourceInternalPath) = $this->ownerView->resolvePath($sourcePath);
-			$this->sourceRootInfo = $this->sourceStorage->getCache()->get($sourceInternalPath);
+			list($this->storage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath);
+			$this->sourceRootInfo = $this->storage->getCache()->get($this->rootPath);
 		} catch (\Exception $e) {
+			$this->storage = new FailedStorage(['exception' => $e]);
+			$this->rootPath = '';
 			$this->logger->logException($e);
 		}
 	}
@@ -302,13 +295,13 @@ public function getItemType() {
 
 	public function getCache($path = '', $storage = null) {
 		$this->init();
-		if (is_null($this->sourceStorage)) {
+		if (is_null($this->storage) || $this->storage instanceof FailedStorage) {
 			return new FailedCache(false);
 		}
 		if (!$storage) {
 			$storage = $this;
 		}
-		return new \OCA\Files_Sharing\Cache($storage, $this->sourceStorage, $this->sourceRootInfo);
+		return new \OCA\Files_Sharing\Cache($storage, $this->storage, $this->sourceRootInfo);
 	}
 
 	public function getScanner($path = '', $storage = null) {
@@ -409,7 +402,12 @@ public function setAvailability($available) {
 	}
 
 	public function getSourceStorage() {
-		return $this->sourceStorage;
+		return $this->getWrapperStorage();
+	}
+
+	public function getWrapperStorage() {
+		$this->init();
+		return $this->storage;
 	}
 
 	public function file_get_contents($path) {

diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php
@@ -70,7 +70,7 @@ class MountPoint implements IMountPoint {
 	 */
 	private $invalidStorage = false;
 
-	/** @var int|null  */
+	/** @var int|null */
 	protected $mountId;
 
 	/**
@@ -132,31 +132,33 @@ public function setMountPoint($mountPoint) {
 
 	/**
 	 * create the storage that is mounted
-	 *
-	 * @return \OC\Files\Storage\Storage
 	 */
 	private function createStorage() {
 		if ($this->invalidStorage) {
-			return null;
+			return;
 		}
 
 		if (class_exists($this->class)) {
 			try {
-				return $this->loader->getInstance($this, $this->class, $this->arguments);
+				$class = $this->class;
+				// prevent recursion by setting the storage before applying wrappers
+				$this->storage = new $class($this->arguments);
+				$this->storage = $this->loader->wrap($this, $this->storage);
 			} catch (\Exception $exception) {
+				$this->storage = null;
 				$this->invalidStorage = true;
 				if ($this->mountPoint === '/') {
 					// the root storage could not be initialized, show the user!
 					throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
 				} else {
 					\OCP\Util::writeLog('core', $exception->getMessage(), \OCP\Util::ERROR);
 				}
-				return null;
+				return;
 			}
 		} else {
 			\OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', \OCP\Util::ERROR);
 			$this->invalidStorage = true;
-			return null;
+			return;
 		}
 	}
 
@@ -165,7 +167,7 @@ private function createStorage() {
 	 */
 	public function getStorage() {
 		if (is_null($this->storage)) {
-			$this->storage = $this->createStorage();
+			$this->createStorage();
 		}
 		return $this->storage;
 	}