tests too

Author: rjernst

server/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java

@@ -17,11 +17,6 @@
 import org.elasticsearch.test.ESTestCase;
 import org.mockito.Mockito;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -75,13 +70,7 @@ public void testLogPermissions() {
 
             DeprecationLogger deprecationLogger = DeprecationLogger.getLogger("name");
 
-            AccessControlContext noPermissionsAcc = new AccessControlContext(
-                new ProtectionDomain[] { new ProtectionDomain(null, new Permissions()) }
-            );
-            AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-                deprecationLogger.warn(DeprecationCategory.API, "key", "foo", "bar");
-                return null;
-            }, noPermissionsAcc);
+            deprecationLogger.warn(DeprecationCategory.API, "key", "foo", "bar");
             assertThat("supplier called", supplierCalled.get(), is(true));
         } finally {
             LogManager.setFactory(originalFactory);

server/src/test/java/org/elasticsearch/search/lookup/LeafDocLookupTests.java

@@ -24,10 +24,6 @@
 import org.junit.Before;
 
 import java.io.IOException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -427,12 +423,7 @@ public void testParallelCache() {
     public void testLookupPrivilegesAdvanceDoc() {
         nextDocCallback = i -> SpecialPermission.check();
 
-        // mimic the untrusted codebase, which gets no permissions
-        var restrictedContext = new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, null) });
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            ScriptDocValues<?> fetchedDocValues = docLookup.get("field");
-            assertEquals(docValues, fetchedDocValues);
-            return null;
-        }, restrictedContext);
+        ScriptDocValues<?> fetchedDocValues = docLookup.get("field");
+        assertEquals(docValues, fetchedDocValues);
     }
 }

server/src/test/java/org/elasticsearch/transport/TransportHandshakerRawMessageTests.java

@@ -27,8 +27,6 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
 
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.greaterThan;
@@ -193,8 +191,6 @@ public void testOutboundHandshake() throws Exception {
 
     private Socket openTransportConnection() throws Exception {
         final var transportAddress = randomFrom(getInstanceFromNode(TransportService.class).boundAddress().boundAddresses()).address();
-        return AccessController.doPrivileged(
-            (PrivilegedExceptionAction<Socket>) (() -> new Socket(transportAddress.getAddress(), transportAddress.getPort()))
-        );
+        return new Socket(transportAddress.getAddress(), transportAddress.getPort());
     }
 }