Small fixes

Signed-off-by: Nils Bandener <[email protected]>

Author: nibix

src/main/java/org/opensearch/security/filter/SecurityRestFilter.java

@@ -250,14 +250,13 @@ void authorizeRequest(RestHandler original, SecurityRequestChannel request, User
             .findFirst();
         final boolean routeSupportsRestAuthorization = handler.isPresent() && handler.get() instanceof NamedRoute;
         if (routeSupportsRestAuthorization) {
-            PrivilegesEvaluatorResponse pres = new PrivilegesEvaluatorResponse();
             NamedRoute route = ((NamedRoute) handler.get());
             // Check both route.actionNames() and route.name(). The presence of either is sufficient.
             Set<String> actionNames = ImmutableSet.<String>builder()
                 .addAll(route.actionNames() != null ? route.actionNames() : Collections.emptySet())
                 .add(route.name())
                 .build();
-            pres = evaluator.evaluate(user, route.name(), actionNames);
+            PrivilegesEvaluatorResponse pres = evaluator.evaluate(user, route.name(), actionNames);
 
             if (log.isDebugEnabled()) {
                 log.debug(pres.toString());

src/main/java/org/opensearch/security/privileges/PrivilegesEvaluatorResponse.java

@@ -152,6 +152,7 @@ public String getPrivilegeMatrix() {
                     resultBuilder.append("\n");
                     resultBuilder.append(subResult.getPrivilegeMatrix());
                 }
+                result = resultBuilder.toString();
             }
             this.privilegeMatrix = result;
         }
@@ -191,6 +192,7 @@ public PrivilegesEvaluatorResponse insufficient(List<PrivilegesEvaluatorResponse
         result.allowed = false;
         result.indexToActionCheckTable = this.indexToActionCheckTable;
         result.subResults = ImmutableList.copyOf(subResults);
+        result.reason = reason;
         return result;
     }
 

src/test/java/org/opensearch/security/privileges/ResourceAccessEvaluatorTest.java

@@ -84,7 +84,6 @@ private void assertEvaluateAsync(boolean hasPermission, boolean expectedAllowed)
 
         PrivilegesEvaluatorResponse out = captor.getValue();
         assertThat(out.allowed, equalTo(expectedAllowed));
-        assertThat(out.isComplete(), equalTo(true));
     }
 
     @Test

src/test/java/org/opensearch/security/privileges/RestLayerPrivilegesEvaluatorTest.java

@@ -162,6 +162,11 @@ public void shutdown() {
             public boolean notFailOnForbiddenEnabled() {
                 return false;
             }
+
+            @Override
+            public boolean isInitialized() {
+                return true;
+            }
         };
 
     }