Check for JDK version while setting java.security.manager option (#5205)

adnapibar · reta · commit aadc6ebf5cd3 · 2023-10-30T12:44:59.000-04:00
Signed-off-by: Rabi Panda &lt;adnapibar@gmail.com&gt;
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchTestBasePlugin.java
@@ -115,6 +115,9 @@ public void execute(Task t) {
                             test.jvmArgs("--illegal-access=warn");
                         }
                     }
+                    if (test.getJavaVersion().compareTo(JavaVersion.VERSION_17) > 0) {
+                        test.jvmArgs("-Djava.security.manager=allow");
+                    }
                 }
             });
             test.getJvmArgumentProviders().add(nonInputProperties);
diff --git a/distribution/tools/launchers/src/main/java/org/opensearch/tools/launchers/SystemJvmOptions.java b/distribution/tools/launchers/src/main/java/org/opensearch/tools/launchers/SystemJvmOptions.java
@@ -77,12 +77,21 @@ static List<String> systemJvmOptions() {
                 // log4j 2
                 "-Dlog4j.shutdownHookEnabled=false",
                 "-Dlog4j2.disable.jmx=true",
-
+                // security manager
+                allowSecurityManagerOption(),
                 javaLocaleProviders()
             )
         ).stream().filter(e -> e.isEmpty() == false).collect(Collectors.toList());
     }
 
+    private static String allowSecurityManagerOption() {
+        if (Runtime.version().feature() > 17) {
+            return "-Djava.security.manager=allow";
+        } else {
+            return "";
+        }
+    }
+
     private static String maybeShowCodeDetailsInExceptionMessages() {
         if (Runtime.version().feature() >= 14) {
             return "-XX:+ShowCodeDetailsInExceptionMessages";

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,9 @@ public void execute(Task t) {`
`115`	`115`	`test.jvmArgs("--illegal-access=warn");`
`116`	`116`	`}`
`117`	`117`	`}`
	`118`	`+ if (test.getJavaVersion().compareTo(JavaVersion.VERSION_17) > 0) {`
	`119`	`+ test.jvmArgs("-Djava.security.manager=allow");`
	`120`	`+ }`
`118`	`121`	`}`
`119`	`122`	`});`
`120`	`123`	`test.getJvmArgumentProviders().add(nonInputProperties);`