we don't allow to share a folder if it contains a share mount point

2 files changed, 18 insertions, 1 deletions

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 3f73632be13..a61d58aaf24 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1168,7 +1168,8 @@ class View {
 			 * @var \OC\Files\Mount\Mount $mount
 			 */
 			$cache = $mount->getStorage()->getCache();
-			if ($internalPath = $cache->getPathById($id)) {
+			$internalPath = $cache->getPathById($id);
+			if (is_string($internalPath)) {
 				$fullPath = $mount->getMountPoint() . $internalPath;
 				if (!is_null($path = $this->getRelativePath($fullPath))) {
 					return $path;
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 756a4d173e4..c07dd04b29f 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -489,6 +489,7 @@ class Share extends \OC\Share\Constants {
 			$itemSourceName = $itemSource;
 		}
 
+
 		// verify that the file exists before we try to share it
 		if ($itemType === 'file' or $itemType === 'folder') {
 			$path = \OC\Files\Filesystem::getPath($itemSource);
@@ -499,6 +500,21 @@ class Share extends \OC\Share\Constants {
 			}
 		}
 
+		//verify that we don't share a folder which already contains a share mount point
+		if ($itemType === 'folder') {
+			$path = '/' . $uidOwner . '/files' . \OC\Files\Filesystem::getPath($itemSource) . '/';
+			$mountManager = \OC\Files\Filesystem::getMountManager();
+			$mounts = $mountManager->getAll();
+			foreach ($mounts as $mountPoint => $mount) {
+				if ($mount->getStorage() instanceof \OC\Files\Storage\Shared && strpos($mountPoint, $path) === 0) {
+					$message = 'Sharing "' . $itemSourceName . '" failed, because it contains files shared with you!';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+
+			}
+		}
+
 		// Verify share type and sharing conditions are met
 		if ($shareType === self::SHARE_TYPE_USER) {
 			if ($shareWith == $uidOwner) {