Merge pull request #2508 from nextcloud/backport/2507/stable25

[stable25] [stable26] cleanup acl when deleting groups
nextcloud · Aug 11, 2023 · f18b52d · f18b52d
2 parents 76f7c31 + 86e5ac2
commit f18b52d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/ACL/ACLManager.php b/lib/ACL/ACLManager.php
@@ -56,7 +56,6 @@ private function getRootStorageId(): int {
 	}
 
 	/**
-	 * @param int $folderId
 	 * @param array $paths
 	 * @return (Rule[])[]
 	 */

diff --git a/lib/Folder/FolderManager.php b/lib/Folder/FolderManager.php
@@ -683,6 +683,18 @@ public function deleteGroup(string $groupId): void {
 		$query->delete('group_folders_groups')
 			->where($query->expr()->eq('group_id', $query->createNamedParameter($groupId)));
 		$query->executeStatement();
+
+		$query = $this->connection->getQueryBuilder();
+		$query->delete('group_folders_manage')
+			->where($query->expr()->eq('mapping_id', $query->createNamedParameter($groupId)))
+			->andWhere($query->expr()->eq('mapping_type', $query->createNamedParameter('group')));
+		$query->executeStatement();
+
+		$query = $this->connection->getQueryBuilder();
+		$query->delete('group_folders_acl')
+			->where($query->expr()->eq('mapping_id', $query->createNamedParameter($groupId)))
+			->andWhere($query->expr()->eq('mapping_type', $query->createNamedParameter('group')));
+		$query->executeStatement();
 	}
 
 	/**