From 7d7e65ed61192e4be1f029c86be45eb2273f6bd2 Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Fri, 23 May 2025 15:48:50 +0200 Subject: [PATCH 1/2] fix: Handle share attributes in the share provider Signed-off-by: Julius Knorr --- lib/Sharing/DeckShareProvider.php | 78 ++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/lib/Sharing/DeckShareProvider.php b/lib/Sharing/DeckShareProvider.php index 8b39646aad..7b57ec6377 100644 --- a/lib/Sharing/DeckShareProvider.php +++ b/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\IShare; @@ -133,6 +134,11 @@ public function create(IShare $share) { ) );*/ + // set share attributes + $shareAttributes = $this->formatShareAttributes( + $share->getAttributes() + ); + $shareId = $this->addShareToDB( $share->getSharedWith(), $share->getSharedBy(), @@ -142,7 +148,8 @@ public function create(IShare $share) { $share->getTarget(), $share->getPermissions(), $share->getToken() ?? '', - $share->getExpirationDate() + $share->getExpirationDate(), + $shareAttributes ); $data = $this->getRawShare($shareId); @@ -163,6 +170,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( @@ -194,6 +202,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(); @@ -264,6 +276,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; } @@ -295,8 +310,13 @@ public function update(IShare $share) { ->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)) - ->execute(); + ->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 @@ -308,8 +328,12 @@ public function update(IShare $share) { ->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)) - ->execute(); + ->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 @@ -318,8 +342,12 @@ public function update(IShare $share) { $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())) - ->execute(); + ->set('permissions', $qb->createNamedParameter($share->getPermissions())); + + if ($shareAttributes !== null) { + $qb->set('attributes', $qb->createNamedParameter($shareAttributes)); + } + $qb->executeStatement(); return $share; } @@ -1046,6 +1074,42 @@ public function getAllShares(): iterable { $cursor->closeCursor(); } + protected function updateShareAttributes(IShare $share, ?string $data): IShare { + if ($data !== null && $data !== '') { + $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(); $qb = $this->dbConnection->getQueryBuilder(); From f17dcbce74b802e68e4d3cd90e2805a5d3c85d58 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Tue, 24 Feb 2026 14:29:07 +0100 Subject: [PATCH 2/2] chore: wrap share updates in transaction Signed-off-by: grnd-alt --- lib/Sharing/DeckShareProvider.php | 33 ++++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/Sharing/DeckShareProvider.php b/lib/Sharing/DeckShareProvider.php index 7b57ec6377..a6fc3d3778 100644 --- a/lib/Sharing/DeckShareProvider.php +++ b/lib/Sharing/DeckShareProvider.php @@ -182,7 +182,8 @@ private function addShareToDB( string $target, int $permissions, string $token, - ?\DateTime $expirationDate + ?\DateTime $expirationDate, + ?string $attributes = null ): int { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert('share') @@ -1075,22 +1076,22 @@ public function getAllShares(): iterable { } protected function updateShareAttributes(IShare $share, ?string $data): IShare { - if ($data !== null && $data !== '') { - $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); + 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; }