Added ability to escape role "External Auth ID" commas

[bookstack] / app / Auth / Access / GroupSyncService.php

diff --git a/app/Auth/Access/GroupSyncService.php b/app/Auth/Access/GroupSyncService.php
index db19b007ac32b31f5a2bb6112514b6aa7b271826..74f0539d82ffcce72d8261be3e02ca6dcd2dddef 100644 (file)
--- a/app/Auth/Access/GroupSyncService.php
+++ b/app/Auth/Access/GroupSyncService.php
@@ -28,10 +28,8 @@ class GroupSyncService
      */
     protected function externalIdMatchesGroupNames(string $externalId, array $groupNames): bool
     {
      */
     protected function externalIdMatchesGroupNames(string $externalId, array $groupNames): bool
     {

-        $externalAuthIds = explode(',', strtolower($externalId));
-
-        foreach ($externalAuthIds as $externalAuthId) {
-            if (in_array(trim($externalAuthId), $groupNames)) {
+        foreach ($this->parseRoleExternalAuthId($externalId) as $externalAuthId) {
+            if (in_array($externalAuthId, $groupNames)) {

                 return true;
             }
         }
                 return true;
             }
         }


@@ -39,6 +37,18 @@ class GroupSyncService
         return false;
     }
 
         return false;
     }
 

+    protected function parseRoleExternalAuthId(string $externalId): array
+    {
+        $inputIds = preg_split('/(?<!\\\),/', $externalId);
+        $cleanIds = [];
+
+        foreach ($inputIds as $inputId) {
+            $cleanIds[] = str_replace('\,', ',', trim($inputId));
+        }
+
+        return $cleanIds;
+    }
+

     /**
      * Match an array of group names to BookStack system roles.
      * Formats group names to be lower-case and hyphenated.
     /**
      * Match an array of group names to BookStack system roles.
      * Formats group names to be lower-case and hyphenated.