Revert "Trivially allow test utility classes if annotated with @WithoutEntitlements"

This reverts commit 3a086de.

Author: mosche

test/framework/src/main/java/org/elasticsearch/entitlement/runtime/policy/TestPolicyManager.java

@@ -25,7 +25,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import static java.lang.StackWalker.Option.RETAIN_CLASS_REFERENCE;
 import static java.util.Objects.requireNonNull;
 
 public class TestPolicyManager extends PolicyManager {
@@ -117,30 +116,15 @@ boolean isTriviallyAllowed(Class<?> requestingClass) {
         if (isTriviallyAllowingTestCode && isTestCode(requestingClass)) {
             return true;
         }
-        if(super.isTriviallyAllowed(requestingClass)){
-            return true;
-        };
-        return isStackWithoutEntitlements();
+        return super.isTriviallyAllowed(requestingClass);
     }
 
     @Override
     protected Collection<Path> getComponentPathsFromClass(Class<?> requestingClass) {
         return classpath; // required to grant read access to the production source and test resources
     }
 
-    private static boolean hasWithoutEntitlements(Class<?> clazz) {
-        return clazz.getAnnotation(ESTestCase.WithoutEntitlements.class) != null;
-    }
-
-    private static boolean isStackWithoutEntitlements() {
-        return StackWalker.getInstance(RETAIN_CLASS_REFERENCE)
-            .walk(frames -> frames
-                .map(StackWalker.StackFrame::getDeclaringClass)
-                .filter(c -> isEntitlementClass(c) == false)
-                .anyMatch(TestPolicyManager::hasWithoutEntitlements));
-    }
-
-    private static boolean isEntitlementClass(Class<?> requestingClass) {
+    private boolean isEntitlementClass(Class<?> requestingClass) {
         return requestingClass.getPackageName().startsWith("org.elasticsearch.entitlement")
             && (requestingClass.getName().contains("Test") == false);
     }

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityTestUtils.java

@@ -21,7 +21,6 @@
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.test.ESTestCase;
-import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -40,7 +39,6 @@
 import static org.elasticsearch.cluster.routing.ShardRouting.UNAVAILABLE_EXPECTED_SHARD_SIZE;
 import static org.elasticsearch.xpack.security.support.SecuritySystemIndices.SECURITY_MAIN_ALIAS;
 
-@WithoutEntitlements
 public class SecurityTestUtils {
 
     public static String writeFile(Path folder, String name, byte[] content) {