Skip to content

Commit e34bee1

Browse files
kristian-zendatobackportbot[bot]
authored andcommitted
fix: scope group share child permission updates to usergroup
Signed-off-by: kristian-zendato <kristian.zendato@nextcloud.com>
1 parent 883d6b8 commit e34bee1

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

‎build/integration/sharing_features/sharing-v1-part3.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,6 @@ Feature: sharing
607607
| id | A_NUMBER |
608608
| item_source | A_NUMBER |
609609
| share_type | 3 |
610-
| permissions | 23 |
610+
| permissions | 31 |
611611
| file_target | /subfolder |
612612
| expireDate | |

‎lib/private/Share20/DefaultShareProvider.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,13 @@ public function update(\OCP\Share\IShare $share) {
257257
->executeStatement();
258258

259259
/*
260-
* Now update the permissions for all children that have not set it to 0
260+
* Now update the permissions for all user-group children that have not set it to 0.
261+
* Link shares also use parent for display (Manager::setLinkParent) and must be excluded.
261262
*/
262263
$qb = $this->dbConn->getQueryBuilder();
263264
$qb->update('share')
264265
->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
266+
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
265267
->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
266268
->set('permissions', $qb->createNamedParameter($share->getPermissions()))
267269
->set('attributes', $qb->createNamedParameter($shareAttributes))

0 commit comments

Comments
 (0)