/hg/icedtea-web: 2 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Oct 29 12:09:47 PDT 2012
changeset 6619b0c63455 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6619b0c63455
author: Omair Majid <omajid at redhat.com>
date: Mon Oct 29 15:01:07 2012 -0400
PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null
Copy deployment configration read into system properties so it is
visibile to target programs.
changeset 9327b9bd2d37 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9327b9bd2d37
author: Omair Majid <omajid at redhat.com>
date: Mon Oct 29 15:07:56 2012 -0400
Reproducer for PR1186
Add a reproducer to verify that deployment properties are available
to jnlp applications as system properties.
diffstat:
ChangeLog | 19 ++
NEWS | 1 +
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 22 ++-
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 1 +
tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java | 72 ++++++++++
tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp | 52 +++++++
tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java | 42 +++++
tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java | 66 +++++++++
8 files changed, 274 insertions(+), 1 deletions(-)
diffs (342 lines):
diff -r d17bbf43ee22 -r 9327b9bd2d37 ChangeLog
--- a/ChangeLog Mon Oct 29 10:32:59 2012 +0100
+++ b/ChangeLog Mon Oct 29 15:07:56 2012 -0400
@@ -1,3 +1,22 @@
+2012-10-29 Omair Majid <omajid at redhat.com>
+
+ * tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp,
+ * tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java,
+ * tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java:
+ New files.
+
+2012-10-29 Omair Majid <omajid at redhat.com>
+
+ PR1186
+ * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java:
+ (load(boolean)): Delegate to load(File,File,boolean).
+ (load(File,File,boolean)): New method.
+ (copyTo): New method.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java:
+ (initialize): Copy configuration to system properties.
+ * tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java:
+ New File.
+
2012-10-29 Jana Fabrikova <jfabriko at redhat.com>
* tests/reproducers/simple/JSToJSet
diff -r d17bbf43ee22 -r 9327b9bd2d37 NEWS
--- a/NEWS Mon Oct 29 10:32:59 2012 +0100
+++ b/NEWS Mon Oct 29 15:07:56 2012 -0400
@@ -20,6 +20,7 @@
- PR1145: IcedTea-Web can cause ClassCircularityError
- PR1161: X509VariableTrustManager does not work correctly with OpenJDK7
- PR822: Applets fail to load if jars have different signers
+ - PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null
New in release 1.3 (2012-XX-XX):
* NetX
diff -r d17bbf43ee22 -r 9327b9bd2d37 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Mon Oct 29 10:32:59 2012 +0100
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Mon Oct 29 15:07:56 2012 -0400
@@ -209,6 +209,12 @@
sm.checkRead(userFile.toString());
}
+ File systemConfigFile = findSystemConfigFile();
+
+ load(systemConfigFile, userFile, fixIssues);
+ }
+
+ void load(File systemConfigFile, File userFile, boolean fixIssues) throws ConfigurationException {
Map<String, Setting<String>> initialProperties = Defaults.getDefaults();
Map<String, Setting<String>> systemProperties = null;
@@ -218,7 +224,6 @@
* there is a system-level deployment.poperties file
*/
- File systemConfigFile = findSystemConfigFile();
if (systemConfigFile != null) {
if (loadSystemConfiguration(systemConfigFile)) {
if (JNLPRuntime.isDebug()) {
@@ -257,6 +262,21 @@
}
/**
+ * Copies the current configuration into the target
+ */
+ public void copyTo(Properties target) {
+ Set<String> names = getAllPropertyNames();
+
+ for (String name : names) {
+ String value = getProperty(name);
+ // for Properties, missing and null are identical
+ if (value != null) {
+ target.setProperty(name, value);
+ }
+ }
+ }
+
+ /**
* Get the value for the given key
*
* @param key the property key
diff -r d17bbf43ee22 -r 9327b9bd2d37 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Oct 29 10:32:59 2012 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Oct 29 15:07:56 2012 -0400
@@ -184,6 +184,7 @@
try {
config.load();
+ config.copyTo(System.getProperties());
} catch (ConfigurationException e) {
/* exit if there is a fatal exception loading the configuration */
if (isApplication) {
diff -r d17bbf43ee22 -r 9327b9bd2d37 tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java Mon Oct 29 15:07:56 2012 -0400
@@ -0,0 +1,72 @@
+/* DeploymentConfigurationTest.java
+ Copyright (C) 2012 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.config;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Properties;
+
+import javax.naming.ConfigurationException;
+
+import org.junit.Test;
+
+public class DeploymentConfigurationTest {
+
+ @Test
+ public void testLoad() throws ConfigurationException {
+ DeploymentConfiguration config = new DeploymentConfiguration();
+
+ // FIXME test this more exhaustively
+ config.load();
+
+ assertTrue(config.getAllPropertyNames().size() > 0);
+ }
+
+ @Test
+ public void testInstallProperties() throws ConfigurationException {
+ DeploymentConfiguration config = new DeploymentConfiguration();
+
+ config.load();
+
+ Properties target = new Properties();
+ config.copyTo(target);
+
+ assertTrue(target.size() != 0);
+ }
+
+}
diff -r d17bbf43ee22 -r 9327b9bd2d37 tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/resources/DeploymentPropertiesAreExposed.jnlp Mon Oct 29 15:07:56 2012 -0400
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ -->
+
+<jnlp spec="1.0"
+ codebase="."
+ href="DeploymentPropertiesAreExposed.jnlp">
+ <information>
+ <title>Verify that deployment configuration properties are exposed</title>
+ <vendor>IcedTea</vendor>
+ </information>
+ <security>
+ <all-permissions />
+ </security>
+ <resources>
+ <jar href="DeploymentPropertiesAreExposed.jar"/>
+ </resources>
+ <application-desc main-class="Test"/>
+</jnlp>
diff -r d17bbf43ee22 -r 9327b9bd2d37 tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/srcs/Test.java Mon Oct 29 15:07:56 2012 -0400
@@ -0,0 +1,42 @@
+/* Test.java
+Copyright (C) 2012 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+public class Test {
+ public static void main(String[] args) {
+ System.out.println(System.getProperty("deployment.user.logdir"));
+ }
+}
diff -r d17bbf43ee22 -r 9327b9bd2d37 tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java Mon Oct 29 15:07:56 2012 -0400
@@ -0,0 +1,66 @@
+/* DeploymentPropertiesAreExposedTest.java
+Copyright (C) 2012 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import net.sourceforge.jnlp.ServerAccess;
+import org.junit.Test;
+
+public class DeploymentPropertiesAreExposedTest {
+
+
+ @Test
+ public void verifyDeploymentConfigrationIsExposedAsSystemProperties() throws Exception {
+ ServerAccess server = new ServerAccess();
+ List<String> trustCertificates = Arrays.asList(new String[] {"-Xtrustall"});
+
+ ServerAccess.ProcessResult result = server.executeJavawsHeadless(
+ trustCertificates, "/DeploymentPropertiesAreExposed.jnlp");
+
+ String expectedRegex = ".*" + File.separator + ".icedtea" + File.separator + "log" + ".*";
+ String actual = result.stdout.trim();
+
+ boolean stdOutMatches = actual.matches(expectedRegex);
+
+ assertTrue("'" + actual + "' should match '" + expectedRegex + "' but did not", stdOutMatches);
+ }
+
+}
More information about the distro-pkg-dev
mailing list