Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

NullPointer fix in AccessTokenAuthContext

Michael Rademaker3848980a688a
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java b/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java
index c6b183733..21034aeeb 100644
--- a/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java
+++ b/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java
@@ -56,8 +56,8 @@ public class AccessTokenAuthContext implements AuthContext {
}
@Override
- public boolean hasRealmRole(String role) {
- return accessToken.getRealmAccess().isUserInRole(role);
+ public boolean hasRealmRole(String role) {
+ return accessToken.getRealmAccess() != null && accessToken.getRealmAccess().isUserInRole(role);
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index ee411d815..9644d7fda 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -1143,7 +1143,6 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public boolean isRestrictedUser(AuthContext authContext) {
-
return authContext.hasRealmRole(RESTRICTED_USER_REALM_ROLE);
}