OWS-605: Conditionally check for user security policy

nbauma109 · Feb 9, 2023 · a96ed67 · a96ed67
1 parent 011d7c5
commit a96ed67
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/net/sourceforge/jnlp/config/ConfigurationConstants.java b/core/src/main/java/net/sourceforge/jnlp/config/ConfigurationConstants.java
@@ -81,6 +81,8 @@ public interface ConfigurationConstants {
 
     String KEY_USER_SECURITY_POLICY = "deployment.user.security.policy";
 
+    String KEY_USER_SECURITY_POLICY_CHECK = "deployment.user.security.policy.check";
+
     String KEY_USER_TRUSTED_CA_CERTS = "deployment.user.security.trusted.cacerts";
 
     String KEY_USER_TRUSTED_JSSE_CA_CERTS = "deployment.user.security.trusted.jssecacerts";

diff --git a/core/src/main/java/net/sourceforge/jnlp/config/Defaults.java b/core/src/main/java/net/sourceforge/jnlp/config/Defaults.java
@@ -126,6 +126,11 @@ public class Defaults {
                     "file://" + JAVA_POLICY.getDefaultFullPath(),
                     ValidatorFactory.createUrlValidator()
             ),
+            Setting.createDefault(
+                    ConfigurationConstants.KEY_USER_SECURITY_POLICY_CHECK,
+                    String.valueOf(true),
+                    ValidatorFactory.createBooleanValidator()
+            ),
             Setting.createDefault(
                     ConfigurationConstants.KEY_USER_TRUSTED_CA_CERTS,
                     USER_CACERTS.getDefaultFullPath(),

diff --git a/core/src/main/java/net/sourceforge/jnlp/runtime/JNLPPolicy.java b/core/src/main/java/net/sourceforge/jnlp/runtime/JNLPPolicy.java
@@ -89,7 +89,10 @@ protected JNLPPolicy() {
         systemPolicy = Policy.getPolicy();
 
         systemJnlpPolicy = getPolicyFromConfig(ConfigurationConstants.KEY_SYSTEM_SECURITY_POLICY);
-        userJnlpPolicy = getPolicyFromUrl(PathsAndFiles.JAVA_POLICY.getFullPath());
+
+        if (Boolean.parseBoolean(JNLPRuntime.getConfiguration().getProperty(ConfigurationConstants.KEY_USER_SECURITY_POLICY_CHECK))) {
+            userJnlpPolicy = getPolicyFromUrl(PathsAndFiles.JAVA_POLICY.getFullPath());
+        }
 
         String jre = JavaSystemProperties.getJavaHome();
         jreExtDir = (new File(jre + File.separator + "lib" + File.separator + "ext")).toURI();