Allow updating of password on public share

apps/files_sharing/api/local.php

@@ -487,13 +487,7 @@ private static function updatePassword($share, $params) {
 		}
 
 		try {
-			$result = \OCP\Share::shareItem(
-					$itemType,
-					$itemSource,
-					\OCP\Share::SHARE_TYPE_LINK,
-					$shareWith,
-					$permissions
-					);
+			$result = \OCP\Share::setPassword($itemType, $itemSource, $shareWith);
 		} catch (\Exception $e) {
 			return new \OC_OCS_Result(null, 403, $e->getMessage());
 		}

lib/private/share/share.php

@@ -1122,6 +1122,38 @@ public static function setExpirationDate($itemType, $itemSource, $date, $shareTi
 		return true;
 	}
 
+	/**
+	 * Set expiration date for a share
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $password
+	 * @throws \Exception
+	 * @return boolean
+	 */
+	public static function setPassword($itemType, $itemSource, $password) {
+		$user = \OC_User::getUser();
+
+		if ($password == '') {
+			$password = null;
+		}
+
+		//If passwords are enforced the password can't be null
+		if (self::enforcePassword() && $password == null) {
+			throw new \Exception('Cannot remove password');
+		}
+
+		$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `share_with` = ? WHERE `item_type` = ? AND `item_source` = ?  AND `uid_owner` = ? AND `share_type` = ?');
+		$query->bindValue(1, is_null($password) ? null : \OC::$server->getHasher()->hash($password));
+		$query->bindValue(2, $itemType);
+		$query->bindValue(3, $itemSource);
+		$query->bindValue(4, $user);
+		$query->bindValue(5, \OCP\Share::SHARE_TYPE_LINK);
+
+		$query->execute();
+
+		return true;
+	}
+
 	/**
 	 * Checks whether a share has expired, calls unshareItem() if yes.
 	 * @param array $item Share data (usually database row)
@@ -2368,4 +2400,8 @@ public static function getExpireInterval() {
 		return (int)\OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7');
 	}
 
+	public static function enforcePassword() {
+		$enforcePassword = \OCP\Config::getAppValue('core', 'shareapi_enforce_links_password', 'no');
+		return ($enforcePassword === "yes") ? true : false;
+	}
 }

lib/public/share.php

@@ -308,6 +308,18 @@ public static function setExpirationDate($itemType, $itemSource, $date, $shareTi
 		return \OC\Share\Share::setExpirationDate($itemType, $itemSource, $date, $shareTime);
 	}
 
+	/**
+	 * Set expiration date for a share
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $password
+	 * @return boolean
+	 */
+	public static function setPassword($itemType, $itemSource, $password) {
+		return \OC\Share\Share::setPassword($itemType, $itemSource, $password);
+	}
+
+
 	/**
 	 * Get the backend class for the specified item type
 	 * @param string $itemType