Merge pull request #7728 from nextcloud/backport/7659/stable33

[stable33] fix: Handle share attributes in the share provider

Author: grnd-alt

lib/Sharing/DeckShareProvider.php

@@ -31,6 +31,7 @@
 use OCP\IL10N;
 use OCP\Share\Exceptions\GenericShareException;
 use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\IAttributes;
 use OCP\Share\IManager;
 use OCP\Share\IPartialShareProvider;
 use OCP\Share\IShare;
@@ -119,6 +120,11 @@ public function create(IShare $share) {
 			)
 		);*/
 
+		// set share attributes
+		$shareAttributes = $this->formatShareAttributes(
+			$share->getAttributes()
+		);
+
 		$shareId = $this->addShareToDB(
 			$share->getSharedWith(),
 			$share->getSharedBy(),
@@ -128,7 +134,8 @@ public function create(IShare $share) {
 			$share->getTarget(),
 			$share->getPermissions(),
 			$share->getToken() ?? '',
-			$share->getExpirationDate()
+			$share->getExpirationDate(),
+			$shareAttributes
 		);
 		$data = $this->getRawShare($shareId);
 
@@ -149,6 +156,7 @@ public function create(IShare $share) {
 	 * @param int $permissions
 	 * @param string $token
 	 * @param \DateTime|null $expirationDate
+	 * @param string|null $attributes
 	 * @return int
 	 */
 	private function addShareToDB(
@@ -161,6 +169,7 @@ private function addShareToDB(
 		int $permissions,
 		string $token,
 		?\DateTime $expirationDate,
+		?string $attributes = null,
 	): int {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->insert('share')
@@ -180,6 +189,10 @@ private function addShareToDB(
 			$qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
 		}
 
+		if ($attributes !== null) {
+			$qb->setValue('attributes', $qb->createNamedParameter($attributes));
+		}
+
 		$qb->executeStatement();
 
 		return $qb->getLastInsertId();
@@ -250,6 +263,9 @@ private function createShareObject(array $data): IShare {
 			$entryData['parent'] = $entryData['f_parent'];
 			$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData, $this->mimeTypeLoader));
 		}
+
+		$share = $this->updateShareAttributes($share, $data['attributes'] ?? null);
+
 		return $share;
 	}
 
@@ -273,39 +289,62 @@ private function applyBoardPermission($share, $permissions, $userId) {
 	 * @inheritDoc
 	 */
 	public function update(IShare $share) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-			->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-			->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-			->executeStatement();
-
-		/*
-		 * Update all user defined group shares
-		 */
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-			->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-			->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-			->executeStatement();
-
-		/*
-		 * Now update the permissions for all children that have not set it to 0
-		 */
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-			->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
-			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-			->executeStatement();
+		$this->dbConnection->beginTransaction();
+		try {
+			$qb = $this->dbConnection->getQueryBuilder();
+			$qb->update('share')
+				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE));
+
+			$shareAttributes = $this->formatShareAttributes($share->getAttributes());
+			if ($shareAttributes !== null) {
+				$qb->set('attributes', $qb->createNamedParameter($shareAttributes));
+			}
+
+			$qb->executeStatement();
+
+			/*
+			* Update all user defined group shares
+			*/
+			$qb = $this->dbConnection->getQueryBuilder();
+			$qb->update('share')
+				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE));
+
+			if ($shareAttributes !== null) {
+				$qb->set('attributes', $qb->createNamedParameter($shareAttributes));
+			}
+
+			$qb->executeStatement();
+
+			/*
+			* Now update the permissions for all children that have not set it to 0
+			*/
+			$qb = $this->dbConnection->getQueryBuilder();
+			$qb->update('share')
+				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+				->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
+				->set('permissions', $qb->createNamedParameter($share->getPermissions()));
+
+			if ($shareAttributes !== null) {
+				$qb->set('attributes', $qb->createNamedParameter($shareAttributes));
+			}
+
+			$qb->executeStatement();
+		} catch (\Exception $e) {
+			$this->dbConnection->rollBack();
+			throw $e;
+		}
+		$this->dbConnection->commit();
 
 		return $share;
 	}
@@ -1101,6 +1140,42 @@ public function getAllShares(): iterable {
 		$cursor->closeCursor();
 	}
 
+	protected function updateShareAttributes(IShare $share, ?string $data): IShare {
+		if ($data === null || $data === '') {
+			return $share;
+		}
+		$attributes = $share->getAttributes() ?? $share->newAttributes();
+		$compressedAttributes = \json_decode($data, true);
+		if ($compressedAttributes === false || $compressedAttributes === null) {
+			return $share;
+		}
+		foreach ($compressedAttributes as $compressedAttribute) {
+			$attributes->setAttribute(
+				$compressedAttribute[0],
+				$compressedAttribute[1],
+				$compressedAttribute[2]
+			);
+		}
+		$share->setAttributes($attributes);
+		return $share;
+	}
+
+	protected function formatShareAttributes(?IAttributes $attributes): ?string {
+		if ($attributes === null || empty($attributes->toArray())) {
+			return null;
+		}
+
+		$compressedAttributes = [];
+		foreach ($attributes->toArray() as $attribute) {
+			$compressedAttributes[] = [
+				0 => $attribute['scope'],
+				1 => $attribute['key'],
+				2 => $attribute['value']
+			];
+		}
+		return \json_encode($compressedAttributes) ?: null;
+	}
+
 	public function getOrphanedAttachmentShares(): array {
 		$allCardIds = $this->cardMapper->getAllCardIds();