Avoid a NullPointerException when client roles are associated with a …

…client that no longer exists Closes keycloak#34444 Signed-off-by: Giuseppe Graziano <[email protected]>
edewit · Dec 2, 2024 · 8f417d6 · 8f417d6
1 parent faf36dd
commit 8f417d6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/services/src/main/java/org/keycloak/utils/RoleResolveUtil.java b/services/src/main/java/org/keycloak/utils/RoleResolveUtil.java
@@ -122,6 +122,9 @@ private static void addToToken(AccessToken token, RoleModel role) {
 
         } else {
             ClientModel app = (ClientModel) role.getContainer();
+            if (app == null) {
+                return;
+            }
             access = token.getResourceAccess(app.getClientId());
             if (access == null) {
                 access = token.addAccess(app.getClientId());