fix(groups): do not handle groups without mapping

- the backend would aggressively Signed-off-by: Arthur Schiwon <[email protected]>
nextcloud · Jan 29, 2024 · 137f8c9 · 137f8c9
1 parent c7e71c2
commit 137f8c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/GroupManager.php b/lib/GroupManager.php
@@ -115,12 +115,19 @@ private function getGroupsToAdd(array $samlGroupNames, array $assignedGroupIds):
 	}
 
 	public function handleIncomingGroups(IUser $user, array $samlGroupNames): void {
+		$id = $this->settings->getProviderId();
+		$groupMapping = $this->settings->get($id)['saml-attribute-mapping-group_mapping'] ?? null;
+		if ($groupMapping === null && $groupMapping === '') {
+			// When no group mapping is set up, it is not our business
+			return;
+		}
+
 		$this->updateUserGroups($user, $samlGroupNames);
 		// TODO: drop following line with dropping NC 28 support
 		$this->evaluateGroupMigrations($samlGroupNames);
 	}
 
-	public function updateUserGroups(IUser $user, array $samlGroupNames): void {
+	protected function updateUserGroups(IUser $user, array $samlGroupNames): void {
 		$this->translateGroupToIds($samlGroupNames);
 		$assignedGroups = $this->groupManager->getUserGroups($user);
 		$assignedGroupIds = array_map(function (IGroup $group) {
@@ -250,7 +257,7 @@ protected function hasSamlBackend(IGroup $group): bool {
 		return in_array('user_saml', $group->getBackendNames());
 	}
 
-	public function evaluateGroupMigrations(array $groups): void {
+	protected function evaluateGroupMigrations(array $groups): void {
 		$candidateInfo = $this->config->getAppValue('user_saml', self::LOCAL_GROUPS_CHECK_FOR_MIGRATION, '');
 		if ($candidateInfo === '') {
 			return;

diff --git a/tests/unit/GroupManagerTest.php b/tests/unit/GroupManagerTest.php
@@ -152,7 +152,7 @@ public function testUpdateUserGroups() {
 			->with($user, ['groupC']);
 
 		// assert SAML provides user groups groupB and groupC
-		$this->ownGroupManager->updateUserGroups($user, ['groupB', 'groupC']);
+		$this->invokePrivate($this->ownGroupManager, 'updateUserGroups', [['groupB', 'groupC']]);
 	}
 
 	public function testUnassignUserFromGroups() {