Merge pull request #4329 from nextcloud/move-out-shared-folder

Fix moving files out of a shared folder

Author: MorrisJobke

apps/files_sharing/lib/Scanner.php

@@ -51,7 +51,7 @@ public function getData($path) {
 		if ($data === null) {
 			return null;
 		}
-		$internalPath = $this->storage->getSourcePath($path);
+		$internalPath = $this->storage->getUnjailedPath($path);
 		$data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
 		return $data;
 	}

apps/files_sharing/lib/SharedStorage.php

@@ -232,7 +232,7 @@ public function isSharable($path) {
 	}
 
 	public function fopen($path, $mode) {
-		if ($source = $this->getSourcePath($path)) {
+		if ($source = $this->getUnjailedPath($path)) {
 			switch ($mode) {
 				case 'r+':
 				case 'rb+':
@@ -274,7 +274,7 @@ public function fopen($path, $mode) {
 				'mode' => $mode,
 			);
 			\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'fopen', $info);
-			return $this->nonMaskedStorage->fopen($this->getSourcePath($path), $mode);
+			return $this->nonMaskedStorage->fopen($this->getUnjailedPath($path), $mode);
 		}
 		return false;
 	}
@@ -302,7 +302,7 @@ public function rename($path1, $path2) {
 			}
 		}
 
-		return $this->nonMaskedStorage->rename($this->getSourcePath($path1), $this->getSourcePath($path2));
+		return $this->nonMaskedStorage->rename($this->getUnjailedPath($path1), $this->getUnjailedPath($path2));
 	}
 
 	/**
@@ -479,7 +479,7 @@ public function getWrapperStorage() {
 	public function file_get_contents($path) {
 		$info = [
 			'target' => $this->getMountPoint() . '/' . $path,
-			'source' => $this->getSourcePath($path),
+			'source' => $this->getUnjailedPath($path),
 		];
 		\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_get_contents', $info);
 		return parent::file_get_contents($path);
@@ -488,7 +488,7 @@ public function file_get_contents($path) {
 	public function file_put_contents($path, $data) {
 		$info = [
 			'target' => $this->getMountPoint() . '/' . $path,
-			'source' => $this->getSourcePath($path),
+			'source' => $this->getUnjailedPath($path),
 		];
 		\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_put_contents', $info);
 		return parent::file_put_contents($path, $data);

lib/private/Files/Node/Folder.php

@@ -413,7 +413,7 @@ private function getAbsolutePath(IMountPoint $mount, $path) {
 		$storage = $mount->getStorage();
 		if ($storage->instanceOfStorage('\OC\Files\Storage\Wrapper\Jail')) {
 			/** @var \OC\Files\Storage\Wrapper\Jail $storage */
-			$jailRoot = $storage->getSourcePath('');
+			$jailRoot = $storage->getUnjailedPath('');
 			$rootLength = strlen($jailRoot) + 1;
 			if ($path === $jailRoot) {
 				return $mount->getMountPoint();

lib/private/Files/Storage/Local.php

@@ -35,6 +35,7 @@
 
 namespace OC\Files\Storage;
 
+use OC\Files\Storage\Wrapper\Jail;
 use OCP\Files\ForbiddenException;
 
 /**
@@ -371,7 +372,7 @@ public function getSourcePath($path) {
 			return $fullPath;
 		}
 
-		\OCP\Util::writeLog('core',  "Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", \OCP\Util::ERROR);
+		\OCP\Util::writeLog('core', "Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", \OCP\Util::ERROR);
 		throw new ForbiddenException('Following symlinks is not allowed', false);
 	}
 
@@ -427,7 +428,13 @@ public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
 	 * @return bool
 	 */
 	public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) {
+		if ($sourceStorage->instanceOfStorage(Local::class)) {
+			if ($sourceStorage->instanceOfStorage(Jail::class)) {
+				/**
+				 * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage
+				 */
+				$sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath);
+			}
 			/**
 			 * @var \OC\Files\Storage\Local $sourceStorage
 			 */