[Share 2.0] Also handle empty parameter in updateShare

* More sanity checks
* More unit tests

1 files changed, 45 insertions, 24 deletions

diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php
index 081c3b16999..d49ef7ad45f 100644
--- a/apps/files_sharing/api/share20ocs.php
+++ b/apps/files_sharing/api/share20ocs.php
@@ -452,42 +452,63 @@ class Share20OCS {
 		}
 
 		if (!$this->canAccessShare($share)) {
-			return new \OC_OCS_Result(null, 404, "wrong share Id, share doesn't exist.");
+			return new \OC_OCS_Result(null, 404, 'wrong share Id, share doesn\'t exist.');
 		}
 
 		$permissions = $this->request->getParam('permissions', null);
-		$password = $this->request->getParam('password', null);
+		$password = $this->request->getParam('password', '');
 		$publicUpload = $this->request->getParam('publicUpload', null);
-		$expireDate = $this->request->getParam('expireDate', null);
+		$expireDate = $this->request->getParam('expireDate', '');
+
+		/*
+		 * expirationdate, password and publicUpload only make sense for link shares
+		 */
+		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+			if ($password === null && $publicUpload === null && $expireDate === null) {
+				return new \OC_OCS_Result(null, 400, 'Wrong or no update parameter given');
+			}
 
-		if ($permissions === null && $password === null && $publicUpload === null && $expireDate === null) {
-			return new \OC_OCS_Result(null, 400, 'Wrong or no update parameter given');
-		}
+			if ($expireDate === '') {
+				$share->setExpirationDate(null);
+			} else {
+				try {
+					$expireDate = $this->parseDate($expireDate);
+				} catch (\Exception $e) {
+					return new \OC_OCS_Result(null, 400, $e->getMessage());
+				}
+				$share->setExpirationDate($expireDate);
+			}
 
-		if ($expireDate !== null) {
-			try {
-				$expireDate = $this->parseDate($expireDate);
-			} catch (\Exception $e) {
-				return new \OC_OCS_Result(null, 400, $e->getMessage());
+			if ($password === '') {
+				$share->setPassword(null);
+			} else {
+				$share->setPassword($password);
 			}
-			$share->setExpirationDate($expireDate);
-		}
 
-		if ($permissions !== null) {
-			$permissions = (int)$permissions;
-			$share->setPermissions($permissions);
-		}
+			if ($publicUpload === 'true') {
+				if(!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+					return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator");
+				}
 
-		if ($password !== null) {
-			$share->setPassword($password);
-		}
+				if (!($share->getPath() instanceof \OCP\Files\Folder)) {
+					return new \OC_OCS_Result(null, 400, "public upload is only possible for public shared folders");
+				}
 
-		if ($publicUpload === 'true') {
-			$share->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE);
-		} else if ($publicUpload === 'false') {
-			$share->setPermissions(\OCP\Constants::PERMISSION_READ);
+				$share->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE);
+			} else if ($publicUpload === 'false') {
+				$share->setPermissions(\OCP\Constants::PERMISSION_READ);
+			}
+		} else {
+			if ($permissions === null) {
+				return new \OC_OCS_Result(null, 400, 'Wrong or no update parameter given');
+			} else {
+				$permissions = (int)$permissions;
+				$share->setPermissions($permissions);
+			}
 		}
 
+
+
 		try {
 			$share = $this->shareManager->updateShare($share);
 		} catch (\Exception $e) {