libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

fixed null pointer exception when principal is null

Browse source
This commit is contained in:
Pulkit Gupta 2016-10-20 13:36:25 +05:30
parent 9f5acccc4f
commit 8e9db1be96
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java
View file

@ -153,14 +153,14 @@ public class CatalinaSamlSessionStore implements SamlSessionStore {
} }
GenericPrincipal principal = (GenericPrincipal) session.getPrincipal(); GenericPrincipal principal = (GenericPrincipal) session.getPrincipal();
if (samlSession.getPrincipal().getName().equals(principal.getName()))
// in clustered environment in JBossWeb, principal is not serialized or saved // in clustered environment in JBossWeb, principal is not serialized or saved
if (principal == null) { if (principal == null) {
principal = principalFactory.createPrincipal(request.getContext().getRealm(), samlSession.getPrincipal(), samlSession.getRoles()); principal = principalFactory.createPrincipal(request.getContext().getRealm(), samlSession.getPrincipal(), samlSession.getRoles());
session.setPrincipal(principal); session.setPrincipal(principal);
session.setAuthType("KEYCLOAK-SAML"); session.setAuthType("KEYCLOAK-SAML");
} else { }
else if (samlSession.getPrincipal().getName().equals(principal.getName())){
if (!principal.getUserPrincipal().getName().equals(samlSession.getPrincipal().getName())) { if (!principal.getUserPrincipal().getName().equals(samlSession.getPrincipal().getName())) {
throw new RuntimeException("Unknown State"); throw new RuntimeException("Unknown State");
} }