feat: delimiter is optional for group whitelist regex

Signed-off-by: Armin Berger <[email protected]>
nextcloud · Nov 12, 2024 · 9c9b822 · 9c9b822
1 parent f3e3fe4
commit 9c9b822
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/lib/Service/ProvisioningService.php b/lib/Service/ProvisioningService.php
@@ -384,7 +384,7 @@ public function getSyncGroupsOfToken(int $providerId, object $idTokenPayload) {
 		$groupsAttribute = $this->providerService->getSetting($providerId, ProviderService::SETTING_MAPPING_GROUPS, 'groups');
 		$groupsData = $idTokenPayload->{$groupsAttribute} ?? null;
 
-		$groupsWhitelistRegex = $this->providerService->getSetting($providerId, ProviderService::SETTING_GROUP_WHITELIST_REGEX, '');
+		$groupsWhitelistRegex = $this->getGroupWhitelistRegex($providerId);
 
 		$event = new AttributeMappedEvent(ProviderService::SETTING_MAPPING_GROUPS, $idTokenPayload, json_encode($groupsData));
 		$this->eventDispatcher->dispatchTyped($event);
@@ -426,7 +426,7 @@ public function getSyncGroupsOfToken(int $providerId, object $idTokenPayload) {
 	}
 
 	public function provisionUserGroups(IUser $user, int $providerId, object $idTokenPayload): void {
-		$groupsWhitelistRegex = $this->providerService->getSetting($providerId, ProviderService::SETTING_GROUP_WHITELIST_REGEX, '');
+		$groupsWhitelistRegex = $this->getGroupWhitelistRegex($providerId);
 
 		$syncGroups = $this->getSyncGroupsOfToken($providerId, $idTokenPayload);
 
@@ -455,4 +455,16 @@ public function provisionUserGroups(IUser $user, int $providerId, object $idToke
 			}
 		}
 	}
+
+	public function getGroupWhitelistRegex(int $providerId): string {
+		$regex = $this->providerService->getSetting($providerId, ProviderService::SETTING_GROUP_WHITELIST_REGEX, '');
+
+		// If regex does not start with '/', add '/' to the beginning and end
+		// Only check first character to allow for flags at the end of the regex
+		if ($regex && substr($regex, 0, 1) !== '/') {
+			$regex = '/' . $regex . '/';
+		}
+
+		return $regex;
+	}
 }
diff --git a/tests/unit/Service/ProvisioningServiceTest.php b/tests/unit/Service/ProvisioningServiceTest.php
@@ -210,7 +210,7 @@ public function dataProvisionUserGroups() {
 						'users',
 					],
 				],
-				'/nextcloud/',
+				'nextcloud',
 				false,
 			],
 		];