From f27a026b7cb43443fca49720c9f6b3149fad81db Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 15 Sep 2021 16:25:54 -0700
Subject: [PATCH] SHIBUI-2063

NPE exception on login fix
---
 .../main/java/net/unicon/shibui/pac4j/BetterSAML2Profile.java | 4 +++-
 testbed/authentication/reverse-proxy/.gitkeep                 | 0
 testbed/authentication/reverse-proxy/certs/.gitkeep           | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 testbed/authentication/reverse-proxy/.gitkeep
 create mode 100644 testbed/authentication/reverse-proxy/certs/.gitkeep

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
index bbe33694c..ea4d4f8f4 100644
--- a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/BetterSAML2Profile.java
+++ b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/BetterSAML2Profile.java
@@ -4,6 +4,7 @@
 import org.pac4j.saml.profile.SAML2Profile;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -41,7 +42,8 @@ public List<String> getGroups() {
     }
 
     public Set<String> getRoles() {
-        return (Set<String>) getAttribute(profileMapping.getRoles());
+        Set<String> result = (Set<String>) getAttribute(profileMapping.getRoles());
+        return result == null ? new HashSet<>() : result;
     }
 
     @Override
diff --git a/testbed/authentication/reverse-proxy/.gitkeep b/testbed/authentication/reverse-proxy/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/testbed/authentication/reverse-proxy/certs/.gitkeep b/testbed/authentication/reverse-proxy/certs/.gitkeep
new file mode 100644
index 000000000..e69de29bb