fix null pointers in CustomAuthenticationConverter (#169)

eclipse-tractusx · Dec 1, 2023 · 0d6aee6 · 0d6aee6
1 parent a00386c
commit 0d6aee6
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/...clipse/tractusx/managedidentitywallets/config/security/CustomAuthenticationConverter.java b/...clipse/tractusx/managedidentitywallets/config/security/CustomAuthenticationConverter.java
@@ -21,6 +21,12 @@
 
 package org.eclipse.tractusx.managedidentitywallets.config.security;
 
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
@@ -29,17 +35,13 @@
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
  * The type Custom authentication converter.
  */
 public class CustomAuthenticationConverter implements Converter<Jwt, AbstractAuthenticationToken> {
 
+    private static final String ROLE_PREFIX = "ROLE_";
+
     private final JwtGrantedAuthoritiesConverter grantedAuthoritiesConverter;
     private final String resourceId;
 
@@ -63,17 +65,15 @@ public AbstractAuthenticationToken convert(Jwt source) {
     }
 
     private Collection<? extends GrantedAuthority> extractResourceRoles(Jwt jwt, String resourceId) {
-        Map<String, Object> resourceAccess = jwt.getClaim("resource_access");
-        Map<String, Object> resource = (Map<String, Object>) resourceAccess.get(resourceId);
-        if (Objects.isNull(resource)) {
-            return Set.of();
-        }
-        Collection<String> resourceRoles = (Collection<String>) resource.get("roles");
-        if (Objects.isNull(resourceRoles)) {
-            return Set.of();
-        }
-        return resourceRoles.stream()
-                .map(role -> new SimpleGrantedAuthority("ROLE_" + role))
-                .collect(Collectors.toSet());
+        return Optional.ofNullable(jwt.getClaim("resource_access"))
+        .filter(resourceAccess -> resourceAccess instanceof Map)
+            .map(resourceAccess -> ((Map<String, Object>) resourceAccess).get(resourceId))
+            .filter(resource -> resource instanceof Map)
+            .map(resource -> ((Map<String, Object>) resource).get("roles"))
+            .filter(resourceRoles -> resourceRoles instanceof Collection)
+            .map(resourceRoles -> ((Collection<String>) resourceRoles).stream()
+                .map(role -> new SimpleGrantedAuthority(ROLE_PREFIX + role))
+                .collect(Collectors.toSet()))
+            .orElse(Set.of());
     }
 }