Fix for broken JSON response when group id is binary

changed placeholder in ldap_groups_roles queries to reflect the non-integer value
nilsteampassnet · May 15, 2024 · a27ce87 · a27ce87
1 parent f851d99
commit a27ce87
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sources/identify.php b/sources/identify.php
@@ -1416,7 +1416,7 @@ function handleUserADGroups(string $username, array $userInfo, array $groups, ar
             $role = DB::queryFirstRow(
                 'SELECT lgr.role_id
                 FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
-                WHERE lgr.ldap_group_id = %i',
+                WHERE lgr.ldap_group_id = %s',
                 $group
             );
             if (DB::count() > 0) {

diff --git a/sources/roles.queries.php b/sources/roles.queries.php
@@ -743,7 +743,7 @@
                         'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title
                         FROM '.prefixTable('ldap_groups_roles').' AS a
                         INNER JOIN '.prefixTable('roles_title').' AS r ON r.id = a.role_id
-                        WHERE a.ldap_group_id = %i',
+                        WHERE a.ldap_group_id = %s',
                         $key
                     );
                     $counter = DB::count();

diff --git a/vendor/teampassclasses/ldapextra/src/ActiveDirectoryExtra.php b/vendor/teampassclasses/ldapextra/src/ActiveDirectoryExtra.php
@@ -62,7 +62,7 @@ public function getADGroups(Connection $connection, array $settings): array
 
             $groupsArr = [];
             foreach($groups as $key => $group) {
-                $adGroupId = (int) $group[(isset($settings['ldap_guid_attibute']) === true && empty($settings['ldap_guid_attibute']) === false ? $settings['ldap_guid_attibute'] : 'gidnumber')][0];
+                $adGroupId = md5($group[(isset($settings['ldap_guid_attibute']) === true && empty($settings['ldap_guid_attibute']) === false ? $settings['ldap_guid_attibute'] : 'gidnumber')][0]);
                 $groupsArr[$adGroupId] = [
                     'ad_group_id' => $adGroupId,
                     'ad_group_title' => $group['cn'][0],
@@ -113,7 +113,7 @@ function getUserADGroups(string $userDN, Connection $connection, array $SETTINGS
             foreach ($groups as $group) {
                 array_push(
                     $groupsArr,
-                    $group[$idAttribute][0]
+                    md5($group[$idAttribute][0])
                 );
             }
         } catch (\LdapRecord\Auth\BindException $e) {