Skip to content

Commit a96ed67

Browse files
committed
OWS-605: Conditionally check for user security policy
1 parent 011d7c5 commit a96ed67

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

core/src/main/java/net/sourceforge/jnlp/config/ConfigurationConstants.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ public interface ConfigurationConstants {
8181

8282
String KEY_USER_SECURITY_POLICY = "deployment.user.security.policy";
8383

84+
String KEY_USER_SECURITY_POLICY_CHECK = "deployment.user.security.policy.check";
85+
8486
String KEY_USER_TRUSTED_CA_CERTS = "deployment.user.security.trusted.cacerts";
8587

8688
String KEY_USER_TRUSTED_JSSE_CA_CERTS = "deployment.user.security.trusted.jssecacerts";

core/src/main/java/net/sourceforge/jnlp/config/Defaults.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ public class Defaults {
126126
"file://" + JAVA_POLICY.getDefaultFullPath(),
127127
ValidatorFactory.createUrlValidator()
128128
),
129+
Setting.createDefault(
130+
ConfigurationConstants.KEY_USER_SECURITY_POLICY_CHECK,
131+
String.valueOf(true),
132+
ValidatorFactory.createBooleanValidator()
133+
),
129134
Setting.createDefault(
130135
ConfigurationConstants.KEY_USER_TRUSTED_CA_CERTS,
131136
USER_CACERTS.getDefaultFullPath(),

core/src/main/java/net/sourceforge/jnlp/runtime/JNLPPolicy.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ protected JNLPPolicy() {
8989
systemPolicy = Policy.getPolicy();
9090

9191
systemJnlpPolicy = getPolicyFromConfig(ConfigurationConstants.KEY_SYSTEM_SECURITY_POLICY);
92-
userJnlpPolicy = getPolicyFromUrl(PathsAndFiles.JAVA_POLICY.getFullPath());
92+
93+
if (Boolean.parseBoolean(JNLPRuntime.getConfiguration().getProperty(ConfigurationConstants.KEY_USER_SECURITY_POLICY_CHECK))) {
94+
userJnlpPolicy = getPolicyFromUrl(PathsAndFiles.JAVA_POLICY.getFullPath());
95+
}
9396

9497
String jre = JavaSystemProperties.getJavaHome();
9598
jreExtDir = (new File(jre + File.separator + "lib" + File.separator + "ext")).toURI();

0 commit comments

Comments
 (0)