Refactor the backendrole extraction in oboauthenticator

Signed-off-by: Ryan Liang <[email protected]>
peternied · Aug 22, 2023 · e52c5ce · e52c5ce
1 parent 9c9e060
commit e52c5ce
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/main/java/org/opensearch/security/http/OnBehalfOfAuthenticator.java b/src/main/java/org/opensearch/security/http/OnBehalfOfAuthenticator.java
@@ -92,27 +92,24 @@ private List<String> extractSecurityRolesFromClaims(Claims claims) {
             log.warn("This is a malformed On-behalf-of Token");
         }
 
-        return Arrays.stream(rolesClaim.split(",")).map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toUnmodifiableList());
+        List<String> roles = Arrays.stream(rolesClaim.split(","))
+            .map(String::trim)
+            .filter(s -> !s.isEmpty())
+            .collect(Collectors.toUnmodifiableList());
+
+        return roles;
     }
 
     private String[] extractBackendRolesFromClaims(Claims claims) {
-        // Object backendRolesObject = ObjectUtils.firstNonNull(claims.get("ebr"), claims.get("dbr"));
-        if (!claims.containsKey("br")) {
-            return null;
-        }
-
         Object backendRolesObject = claims.get("br");
         String[] backendRoles;
 
         if (backendRolesObject == null) {
             log.warn("This is a malformed On-behalf-of Token");
             backendRoles = new String[0];
         } else {
-            final String backendRolesClaim = backendRolesObject.toString();
-
             // Extracting roles based on the compatibility mode
-            String decryptedBackendRoles = backendRolesClaim;
-            backendRoles = Arrays.stream(decryptedBackendRoles.split(",")).map(String::trim).toArray(String[]::new);
+            backendRoles = Arrays.stream(backendRolesObject.toString().split(",")).map(String::trim).toArray(String[]::new);
         }
 
         return backendRoles;