SHIBUI-1747

fixed NPE with roles
TIER · Sep 17, 2021 · 2b84ea7 · 2b84ea7
1 parent f27a026
commit 2b84ea7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/BetterSAML2Profile.java b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/BetterSAML2Profile.java
@@ -42,8 +42,12 @@ public List<String> getGroups() {
     }
 
     public Set<String> getRoles() {
-        Set<String> result = (Set<String>) getAttribute(profileMapping.getRoles());
-        return result == null ? new HashSet<>() : result;
+        Set<String> result = new HashSet<>();
+        List<String> assertedRoles = (List<String>) getAttribute(profileMapping.getRoles());
+        if (assertedRoles != null) {
+            result.addAll(assertedRoles);
+        }
+        return result;
     }
 
     @Override

diff --git a/testbed/authentication/shibui/application.yml b/testbed/authentication/shibui/application.yml
@@ -23,3 +23,5 @@ shibui:
       firstName: urn:oid:2.5.4.42
       lastName: urn:oid:2.5.4.4
       email: urn:oid:0.9.2342.19200300.100.1.3
+      groups: businessCategory
+      roles: urn:oid:1.3.6.1.4.1.5923.1.1.1.7