Add accessUserInformation to the plugin security policy. (Issue # 844) (

#1598) (#1959) * Add accessUserInformation to the plugin security policy. (Issue # 844) Signed-off-by: Austin Lee <[email protected]> * Re-enable ReDeploy IT test. Signed-off-by: Austin Lee <[email protected]> * Apply spotless. Signed-off-by: Austin Lee <[email protected]> --------- Signed-off-by: Austin Lee <[email protected]> (cherry picked from commit ee69eb0) Co-authored-by: Austin Lee <[email protected]>
opensearch-project · Feb 1, 2024 · 38ebf65 · 38ebf65
1 parent e98d6ec
commit 38ebf65
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     implementation group: 'org.tribuo', name: 'tribuo-regression-sgd', version: '4.2.1'
     implementation group: 'org.tribuo', name: 'tribuo-anomaly-libsvm', version: '4.2.1'
     implementation group: 'org.tribuo', name: 'tribuo-classification-sgd', version: '4.2.1'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.15.0'
     implementation 'software.amazon.randomcutforest:randomcutforest-parkservices:3.0-rc3'
     implementation 'software.amazon.randomcutforest:randomcutforest-core:3.0-rc3'
     implementation group: 'io.protostuff', name: 'protostuff-core', version: '1.8.0'

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -62,7 +62,7 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:2.19.0"
-    testImplementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
+    testImplementation group: 'commons-io', name: 'commons-io', version: '2.15.0'
     implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
 
     checkstyle "com.puppycrawl.tools:checkstyle:${project.checkstyle.toolVersion}"

diff --git a/plugin/src/main/plugin-metadata/plugin-security.policy b/plugin/src/main/plugin-metadata/plugin-security.policy
@@ -5,6 +5,7 @@
 
 grant {
     permission java.lang.RuntimePermission "accessDeclaredMembers";
+    permission java.lang.RuntimePermission "accessUserInformation";
     permission java.lang.RuntimePermission "getClassLoader";
     permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLDeployModelActionIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLDeployModelActionIT.java
@@ -9,7 +9,6 @@
 import java.io.IOException;
 import java.util.Map;
 
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
@@ -27,8 +26,6 @@ public class RestMLDeployModelActionIT extends MLCommonsRestTestCase {
 
     @Before
     public void setup() throws IOException {
-        // Skip test if running on Mac OS, https://github.com/opensearch-project/ml-commons/issues/844
-        Assume.assumeFalse(System.getProperty("os.name").startsWith("Mac OS X"));
         mlRegisterModelGroupInput = MLRegisterModelGroupInput.builder().name("testGroupID").description("This is test Group").build();
         registerModelGroup(client(), TestHelper.toJsonString(mlRegisterModelGroupInput), registerModelGroupResult -> {
             this.modelGroupId = (String) registerModelGroupResult.get("model_group_id");