Move to secure_sm package

Signed-off-by: Craig Perkins <[email protected]>

Author: cwperks

libs/agent-sm/agent-policy/src/main/java/org/opensearch/security/AccessController.java renamed to libs/agent-sm/agent-policy/src/main/java/org/opensearch/secure_sm/AccessController.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.security;
+package org.opensearch.secure_sm;
 
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;

libs/agent-sm/agent-policy/src/main/java/org/opensearch/security/package-info.java renamed to libs/agent-sm/agent-policy/src/main/java/org/opensearch/secure_sm/package-info.java

@@ -9,4 +9,4 @@
 /**
  * Classes for running code in a privileged context
  */
-package org.opensearch.security;
+package org.opensearch.secure_sm;

libs/agent-sm/agent/src/main/java/org/opensearch/javaagent/StackCallerProtectionDomainChainExtractor.java

@@ -32,7 +32,7 @@ public final class StackCallerProtectionDomainChainExtractor implements Function
      */
     private static final Set<String> ACCESS_CONTROLLER_CLASSES = Set.of(
         "java.security.AccessController",
-        "org.opensearch.security.AccessController"
+        "org.opensearch.secure_sm.AccessController"
     );
 
     private static final Set<String> DO_PRIVILEGED_METHODS = Set.of("doPrivileged", "doPrivilegedChecked");

libs/agent-sm/agent/src/test/java/org/opensearch/javaagent/StackCallerProtectionDomainExtractorTests.java

@@ -120,7 +120,7 @@ public Void run() {
 
     @Test
     public void testStackTruncationWithOpenSearchAccessController() {
-        org.opensearch.security.AccessController.doPrivileged(() -> {
+        org.opensearch.secure_sm.AccessController.doPrivileged(() -> {
             StackCallerProtectionDomainChainExtractor extractor = StackCallerProtectionDomainChainExtractor.INSTANCE;
             Set<ProtectionDomain> protectionDomains = (Set<ProtectionDomain>) extractor.apply(captureStackFrames().stream());
             assertEquals(1, protectionDomains.size());
@@ -151,7 +151,7 @@ public void testStackTruncationWithOpenSearchAccessController() {
 
     @Test
     public void testStackTruncationWithOpenSearchAccessControllerUsingSupplier() {
-        org.opensearch.security.AccessController.doPrivileged((Supplier<Void>) () -> {
+        org.opensearch.secure_sm.AccessController.doPrivileged((Supplier<Void>) () -> {
             StackCallerProtectionDomainChainExtractor extractor = StackCallerProtectionDomainChainExtractor.INSTANCE;
             Set<ProtectionDomain> protectionDomains = (Set<ProtectionDomain>) extractor.apply(captureStackFrames().stream());
             assertEquals(1, protectionDomains.size());
@@ -183,7 +183,7 @@ public void testStackTruncationWithOpenSearchAccessControllerUsingSupplier() {
 
     @Test
     public void testStackTruncationWithOpenSearchAccessControllerUsingCallable() throws Exception {
-        org.opensearch.security.AccessController.doPrivilegedChecked(() -> {
+        org.opensearch.secure_sm.AccessController.doPrivilegedChecked(() -> {
             StackCallerProtectionDomainChainExtractor extractor = StackCallerProtectionDomainChainExtractor.INSTANCE;
             Set<ProtectionDomain> protectionDomains = (Set<ProtectionDomain>) extractor.apply(captureStackFrames().stream());
             assertEquals(1, protectionDomains.size());
@@ -216,13 +216,13 @@ public void testStackTruncationWithOpenSearchAccessControllerUsingCallable() thr
     @Test
     public void testAccessControllerUsingCallableThrowsException() {
         assertThrows(IllegalArgumentException.class, () -> {
-            org.opensearch.security.AccessController.doPrivilegedChecked(() -> { throw new IllegalArgumentException("Test exception"); });
+            org.opensearch.secure_sm.AccessController.doPrivilegedChecked(() -> { throw new IllegalArgumentException("Test exception"); });
         });
     }
 
     @Test
     public void testStackTruncationWithOpenSearchAccessControllerUsingCheckedRunnable() throws IllegalArgumentException {
-        org.opensearch.security.AccessController.doPrivilegedChecked(() -> {
+        org.opensearch.secure_sm.AccessController.doPrivilegedChecked(() -> {
             StackCallerProtectionDomainChainExtractor extractor = StackCallerProtectionDomainChainExtractor.INSTANCE;
             Set<ProtectionDomain> protectionDomains = (Set<ProtectionDomain>) extractor.apply(captureStackFrames().stream());
             assertEquals(1, protectionDomains.size());
@@ -254,7 +254,7 @@ public void testStackTruncationWithOpenSearchAccessControllerUsingCheckedRunnabl
     @Test
     public void testAccessControllerUsingCheckedRunnableThrowsException() {
         assertThrows(IllegalArgumentException.class, () -> {
-            org.opensearch.security.AccessController.doPrivilegedChecked(() -> { throw new IllegalArgumentException("Test exception"); });
+            org.opensearch.secure_sm.AccessController.doPrivilegedChecked(() -> { throw new IllegalArgumentException("Test exception"); });
         });
     }
 }

modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java

@@ -51,7 +51,7 @@
 import org.opensearch.ingest.IngestDocument;
 import org.opensearch.ingest.Processor;
 import org.opensearch.ingest.geoip.IngestGeoIpModulePlugin.GeoIpCache;
-import org.opensearch.security.AccessController;
+import org.opensearch.secure_sm.AccessController;
 
 import java.io.IOException;
 import java.net.InetAddress;