Skip to content

Commit 5cf731e

Browse files
committed
Ref #32580: fix NPE
1 parent 442e34e commit 5cf731e

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,13 @@ protected GrantedAuthoritiesMapper createAuthoritiesMapper() {
293293
for (GrantedAuthority auth : authorities) {
294294
if (auth instanceof OidcUserAuthority) {
295295
OidcIdToken idToken = ((OidcUserAuthority) auth).getIdToken();
296-
mappedAuthorities.addAll(parseClaims(idToken, rolesClaimName));
296+
if (idToken != null) {
297+
mappedAuthorities.addAll(parseClaims(idToken, rolesClaimName));
298+
}
297299
OidcUserInfo userInfo = ((OidcUserAuthority) auth).getUserInfo();
298-
mappedAuthorities.addAll(parseClaims(userInfo, rolesClaimName));
300+
if (userInfo != null) {
301+
mappedAuthorities.addAll(parseClaims(userInfo, rolesClaimName));
302+
}
299303
}
300304
}
301305
return mappedAuthorities;

0 commit comments

Comments
 (0)