Merge branch 'master' into develop

xh · Apr 3, 2024 · 46c195c · 46c195c
2 parents a373055 + e187c50
commit 46c195c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,12 @@
 
 * Requires `hoist-react >= 63.0` for client-side support of the new `track` and `submitError` endpoints.
 
+## 18.5.2 - 2024-04-03
+
+### 🐞 Bug Fixes
+
+* Fixed bug in `DefaultRoleService.doLoadUsersForDirectoryGroups` where LDAP members with `null`
+  samAccountNames were not being filtered out, causing `NullPointerExceptions`.
 
 ## 18.5.1 - 2024-03-08
 

diff --git a/src/main/groovy/io/xh/hoist/role/provided/DefaultRoleService.groovy b/src/main/groovy/io/xh/hoist/role/provided/DefaultRoleService.groovy
@@ -190,7 +190,9 @@ class DefaultRoleService extends BaseRoleService {
         ldapService
             .lookupGroupMembers(foundGroups)
             .each {name, members ->
-                ret[name] = members.collect(new HashSet()) { it.samaccountname.toLowerCase()}
+                ret[name] = members.collect(new HashSet()) { it.samaccountname?.toLowerCase() }
+                // Exclude members without a samaccountname (e.g. email-only contacts within a DL)
+                ret[name].remove(null)
             }
 
         return ret