/hg/icedtea-web: Fix and tests for PR974, extension JNLPs unavai...
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Thu Aug 15 12:00:59 PDT 2013
changeset 6060b294b41d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6060b294b41d
author: Andrew Azores <aazores at redhat.com>
date: Thu Aug 15 14:57:08 2013 -0400
Fix and tests for PR974, extension JNLPs unavailable when embedded in HTML applet tags
diffstat:
ChangeLog | 32 ++++
netx/net/sourceforge/jnlp/ParserSettings.java | 35 ++++-
netx/net/sourceforge/jnlp/PluginBridge.java | 17 +-
netx/net/sourceforge/jnlp/runtime/Boot.java | 12 +-
tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java | 74 ++++++++++
tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp | 53 +++++++
tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html | 46 ++++++
tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp | 59 +++++++
tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java | 42 +++++
tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java | 55 +++++++
tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile | 34 ++++
tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java | 73 +++++++++
12 files changed, 515 insertions(+), 17 deletions(-)
diffs (truncated from 657 to 500 lines):
diff -r 5d7b3a507709 -r 6060b294b41d ChangeLog
--- a/ChangeLog Tue Aug 13 13:54:10 2013 -0400
+++ b/ChangeLog Thu Aug 15 14:57:08 2013 -0400
@@ -1,10 +1,42 @@
+2013-08-15 Andrew Azores <aazores at redhat.com>
+
+ * netx/net/sourceforge/jnlp/ParserSettings.java: (globalParserSettings)
+ static ParserSettings instance to store settings.
+ (setGlobalParserSettingsFromArgs) Determine, store, and return
+ globalParserSettings. (getGlobalParserSettings) return stored
+ ParserSettings
+ * netx/net/sourceforge/jnlp/PluginBridge.java: (extensionJars) stores list
+ of JNLP extensions. (getResources) returns this list
+ * netx/net/sourceforge/jnlp/runtime/Boot.java: minor refactor to use
+ ParserSettings.setGlobalParserSettingsFromArgs()
+
+ * tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java: ensure
+ that ParserSettings.setGlobalParserSettingsFromArgs() works as intended
+
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java:
+ tests browser launch of HTML file with embedded JNLP applet referencing
+ extension JNLP
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp:
+ same
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html:
+ same
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp:
+ same
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java:
+ same
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java:
+ same
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same
+
2013-08-13 Andrew Azores <aazores at redhat.com>
+
* tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: no longer
sends HTTP 400 BAD REQUEST messages
* test/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java:
removed "bad request" test
2013-08-12 Andrew Azores <aazores at redhat.com>
+
* tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: refactored
* tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java:
TinyHttpdImpl constructor changed, reflecting this here
diff -r 5d7b3a507709 -r 6060b294b41d netx/net/sourceforge/jnlp/ParserSettings.java
--- a/netx/net/sourceforge/jnlp/ParserSettings.java Tue Aug 13 13:54:10 2013 -0400
+++ b/netx/net/sourceforge/jnlp/ParserSettings.java Thu Aug 15 14:57:08 2013 -0400
@@ -37,6 +37,9 @@
package net.sourceforge.jnlp;
+import java.util.Arrays;
+import java.util.List;
+
/**
* Contains settings to be used by the Parser while parsing JNLP files.
*
@@ -44,6 +47,8 @@
*/
public class ParserSettings {
+ private static ParserSettings globalParserSettings = new ParserSettings();
+
private final boolean isStrict;
private final boolean extensionAllowed;
private final boolean malformedXmlAllowed;
@@ -75,4 +80,32 @@
return isStrict;
}
-}
\ No newline at end of file
+ /**
+ * Return the global parser settings in use.
+ */
+ public static ParserSettings getGlobalParserSettings() {
+ return globalParserSettings;
+ }
+
+ /**
+ * Set the global ParserSettings to match the given settings.
+ */
+ public static void setGlobalParserSettings(ParserSettings parserSettings) {
+ globalParserSettings = parserSettings;
+ }
+
+ /**
+ * Return the ParserSettings to be used according to arguments specified
+ * at boot on the command line. These settings are also stored so they
+ * can be retrieved at a later time.
+ */
+ public static ParserSettings setGlobalParserSettingsFromArgs(String[] cmdArgs) {
+ List<String> argList = Arrays.asList(cmdArgs);
+ boolean strict = argList.contains("-strict");
+ boolean malformedXmlAllowed = !argList.contains("-xml");
+
+ globalParserSettings = new ParserSettings(strict, true, malformedXmlAllowed);
+ return globalParserSettings;
+ }
+
+}
diff -r 5d7b3a507709 -r 6060b294b41d netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Tue Aug 13 13:54:10 2013 -0400
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Thu Aug 15 14:57:08 2013 -0400
@@ -26,19 +26,19 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
-import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
+import java.util.List;
import java.util.Locale;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
import sun.misc.BASE64Decoder;
-import net.sourceforge.jnlp.runtime.JNLPRuntime;
-
/**
* Allows reuse of code that expects a JNLPFile object,
* while overriding behaviour specific to applets.
@@ -47,6 +47,7 @@
private PluginParameters params;
private Set<String> jars = new HashSet<String>();
+ private List<ExtensionDesc> extensionJars = new ArrayList<ExtensionDesc>();
//Folders can be added to the code-base through the archive tag
private List<String> codeBaseFolders = new ArrayList<String>();
private String[] cacheJars = new String[0];
@@ -90,6 +91,7 @@
this.codeBase = codebase;
this.sourceLocation = documentBase;
this.params = params;
+ this.parserSettings = ParserSettings.getGlobalParserSettings();
if (params.getJNLPHref() != null) {
useJNLPHref = true;
@@ -122,6 +124,9 @@
String fileName = jarDesc.getLocation().toExternalForm();
this.jars.add(fileName);
}
+
+ // Store any extensions listed in the JNLP file to be returned later on, namely in getResources()
+ extensionJars = Arrays.asList(jnlpFile.getResources().getExtensions());
} catch (MalformedURLException e) {
// Don't fail because we cannot get the jnlp file. Parameters are optional not required.
// it is the site developer who should ensure that file exist.
@@ -308,6 +313,8 @@
return result;
} catch (MalformedURLException ex) { /* Ignored */
}
+ } else if (launchType.equals(ExtensionDesc.class)) {
+ return (List<T>) extensionJars; // this list is populated when the PluginBridge is first constructed
}
return sharedResources.getResources(launchType);
}
diff -r 5d7b3a507709 -r 6060b294b41d netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Aug 13 13:54:10 2013 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Aug 15 14:57:08 2013 -0400
@@ -214,18 +214,8 @@
extra.put("arguments", getOptions("-arg"));
extra.put("parameters", getOptions("-param"));
extra.put("properties", getOptions("-property"));
- boolean strict = false;
- boolean malformedXmlAllowed = true;
- if (null != getOption("-strict")) {
- strict = true;
- }
-
- if (null != getOption("-xml")) {
- malformedXmlAllowed = false;
- }
-
- ParserSettings settings = new ParserSettings(strict, true, malformedXmlAllowed);
+ ParserSettings settings = ParserSettings.setGlobalParserSettingsFromArgs(args);
try {
Launcher launcher = new Launcher(false);
diff -r 5d7b3a507709 -r 6060b294b41d tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java Thu Aug 15 14:57:08 2013 -0400
@@ -0,0 +1,74 @@
+/* ParserSettingsTest.java
+ Copyright (C) 2013 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;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.jnlp.ParserSettings;
+
+public class ParserSettingsTest {
+
+ @Test
+ public void testDefaultSettings() {
+ Assert.assertNotNull("Default parser settings should not be null", ParserSettings.getGlobalParserSettings());
+ }
+
+ @Test
+ public void testNoArgsSameAsDefault() {
+ ParserSettings defaultSettings, noArgs;
+ defaultSettings = new ParserSettings();
+ noArgs = ParserSettings.setGlobalParserSettingsFromArgs(new String[0]);
+
+ Assert.assertTrue("isExtensionAllowed should have been equal", defaultSettings.isExtensionAllowed() == noArgs.isExtensionAllowed());
+ Assert.assertTrue("isStrict should have been equal", defaultSettings.isStrict() == noArgs.isStrict());
+ Assert.assertTrue("isMalformedXmlAllowed should have been equal", defaultSettings.isMalformedXmlAllowed() == noArgs.isMalformedXmlAllowed());
+ }
+
+ @Test
+ public void testWithArgs() {
+ ParserSettings settings = ParserSettings.setGlobalParserSettingsFromArgs(new String[] {
+ "-strict",
+ "-xml",
+ });
+ Assert.assertTrue("isStrict should have been true", settings.isStrict() == true);
+ Assert.assertTrue("isMalformedXmlAllowed should have been false", settings.isMalformedXmlAllowed() == false);
+ Assert.assertTrue("isExtensionAllowed should have been true", settings.isExtensionAllowed() == true);
+ }
+
+}
diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp Thu Aug 15 14:57:08 2013 -0400
@@ -0,0 +1,53 @@
+<!--
+
+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.
+
+ -->
+
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="ExtensionJnlpHelper.jnlp" codebase=".">
+ <information>
+ <title>ExtensionJnlpHelper</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>PR974 Test</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="ExtensionJnlpHelper.jar"/>
+ </resources>
+ <application-desc main-class="ExtensionJnlpHelper"/>
+</jnlp>
diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html Thu Aug 15 14:57:08 2013 -0400
@@ -0,0 +1,46 @@
+<!--
+
+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.
+
+ -->
+
+<html>
+<head></head>
+<body>
+ <applet width="640" height="480" code="ExtensionJnlpTestApplet">
+ <param name="jnlp_href" value="ExtensionJnlpTestApplet.jnlp">
+ </applet>
+</body>
+</html>
diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp Thu Aug 15 14:57:08 2013 -0400
@@ -0,0 +1,59 @@
+<!--
+
+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.
+
+ -->
+
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="ExtensionJnlpTestApplet.jnlp" codebase=".">
+ <information>
+ <title>ExtensionJnlpTestApplet</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>PR974 Test</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="ExtensionJnlpTestApplet.jar"/>
+ <extension name="ExtensionJnlpHelper" href="./ExtensionJnlpHelper.jnlp"/>
+ </resources>
+ <applet-desc
+ name="ExtensionJnlpTestApplet"
+ main-class="ExtensionJnlpTestApplet"
+ width="640"
+ height="480">
+ </applet-desc>
+</jnlp>
diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java Thu Aug 15 14:57:08 2013 -0400
@@ -0,0 +1,42 @@
+/* ExtensionJnlpHelper.java
+Copyright (C) 2013 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 ExtensionJnlpHelper {
+ public static String help() {
+ return "Helper!";
+ }
+}
diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java Thu Aug 15 14:57:08 2013 -0400
@@ -0,0 +1,55 @@
+/* ExtensionJnlpTestApplet.java
+Copyright (C) 2013 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.
More information about the distro-pkg-dev
mailing list