/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Nov 27 05:14:08 PST 2013
changeset 52b966504176 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=52b966504176
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Nov 27 14:11:13 2013 +0100
Added null check when getting manifest attributes for case of jar without manifest
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getManifestAttribute) added check fo null manifest to prevent npe.
* /tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: added test for npe from getManifestAttribute
* tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java: (createJarWithContents) enhanced to be able to create jar without manifest.
changeset 2332108cd5b0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2332108cd5b0
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Nov 27 14:14:59 2013 +0100
removed redundant slash in chnagelog
changeset d5bcc8f80d90 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d5bcc8f80d90
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Nov 27 14:20:25 2013 +0100
Reverted "fix to ManifestedJar1Test cases", better manifestedjar tests, added srtict test
* netx/net/sourceforge/jnlp/Parser.java: added indentation, fixes condition in strict base check
* netx/net/sourceforge/jnlp/ResourcesDesc.java: revertedt recently added throw
* tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java: (manifestedJar1main2mainNoAppDesc) adapted and (manifestedJar1main2mainNoAppDescStrict) added
diffstat:
ChangeLog | 20 +++++
netx/net/sourceforge/jnlp/Parser.java | 21 +++--
netx/net/sourceforge/jnlp/ResourcesDesc.java | 13 +---
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 8 +-
tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java | 35 ++++++++++
tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java | 19 +++++
tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java | 16 ++++-
7 files changed, 108 insertions(+), 24 deletions(-)
diffs (249 lines):
diff -r 349c86e05863 -r d5bcc8f80d90 ChangeLog
--- a/ChangeLog Mon Nov 25 16:54:23 2013 +0100
+++ b/ChangeLog Wed Nov 27 14:20:25 2013 +0100
@@ -1,3 +1,23 @@
+2013-11-26 Jiri Vanek <jvanek at redhat.com>
+
+ Reverted "fix to ManifestedJar1Test cases", better manifestedjar tests,
+ added srtict test
+ * netx/net/sourceforge/jnlp/Parser.java: added indentation, fixes
+ condition in strict base check
+ * netx/net/sourceforge/jnlp/ResourcesDesc.java: revertedt recently added throw
+ * tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java:
+ (manifestedJar1main2mainNoAppDesc) adapted and
+ (manifestedJar1main2mainNoAppDescStrict) added
+
+2013-11-26 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getManifestAttribute)
+ added check for null manifest to prevent npe.
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java:
+ added test for npe from getManifestAttribute
+ * tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java:
+ (createJarWithContents) enhanced to be able to create jar without manifest.
+
2013-11-25 Jiri Vanek <jvanek at redhat.com>
* netx/net/sourceforge/jnlp/JNLPFile.java: (TITLE_NOT_FOUND) new constant
diff -r 349c86e05863 -r d5bcc8f80d90 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Mon Nov 25 16:54:23 2013 +0100
+++ b/netx/net/sourceforge/jnlp/Parser.java Wed Nov 27 14:20:25 2013 +0100
@@ -250,13 +250,13 @@
Node resources[] = getChildNodes(parent, "resources");
// ensure that there are at least one information section present
- if (resources.length == 0 && !j2se)
+ if (resources.length == 0 && !j2se) {
throw new ParseException(R("PNoResources"));
-
+ }
// create objects from the resources sections
- for (int i = 0; i < resources.length; i++)
+ for (int i = 0; i < resources.length; i++) {
result.add(getResourcesDesc(resources[i], j2se));
-
+ }
return result;
}
@@ -302,9 +302,11 @@
// check for duplicate main entries
if (jar.isMain()) {
- if (mainFlag == true)
- if (strict)
+ if (mainFlag == true) {
+ if (strict) {
throw new ParseException(R("PTwoMains"));
+ }
+ }
mainFlag = true;
}
@@ -1073,10 +1075,11 @@
URL result = new URL(base, href);
// check for going above the codebase
- if (!result.toString().startsWith(base.toString()))
- if (strict)
+ if (!result.toString().startsWith(base.toString()) && !base.toString().startsWith(result.toString())){
+ if (strict) {
throw new ParseException(R("PUrlNotInCodebase", node.getNodeName(), href, base));
-
+ }
+ }
return result;
}
diff -r 349c86e05863 -r d5bcc8f80d90 netx/net/sourceforge/jnlp/ResourcesDesc.java
--- a/netx/net/sourceforge/jnlp/ResourcesDesc.java Mon Nov 25 16:54:23 2013 +0100
+++ b/netx/net/sourceforge/jnlp/ResourcesDesc.java Wed Nov 27 14:20:25 2013 +0100
@@ -72,19 +72,10 @@
}
public static JARDesc getMainJAR(List<JARDesc> jars) {
- JARDesc markedMain = null;
for (JARDesc jar : jars) {
if (jar.isMain()) {
- if (markedMain == null){
- markedMain = jar;
- } else {
- //more then one main jar specified. It stinks. Return null to die later null;
- throw new RuntimeException("Multiple main JARs specified, refusing to continue.");
- }
- }
- }
- if (markedMain!=null){
- return markedMain;
+ return jar;
+ }
}
if (jars.size() > 0) {
diff -r 349c86e05863 -r d5bcc8f80d90 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Nov 25 16:54:23 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Nov 27 14:20:25 2013 +0100
@@ -900,8 +900,12 @@
JarFile mainJar = null;
try {
mainJar = new JarFile(f);
- attributeValue = mainJar.getManifest().
- getMainAttributes().getValue(attribute);
+ Manifest manifest = mainJar.getManifest();
+ if (manifest == null || manifest.getMainAttributes() == null){
+ //yes, jars without manifest exists
+ return null;
+ }
+ attributeValue = manifest.getMainAttributes().getValue(attribute);
} catch (IOException ioe) {
attributeValue = null;
} finally {
diff -r 349c86e05863 -r d5bcc8f80d90 tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Mon Nov 25 16:54:23 2013 +0100
+++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Wed Nov 27 14:20:25 2013 +0100
@@ -51,6 +51,7 @@
import net.sourceforge.jnlp.mock.DummyJNLPFileWithJar;
import net.sourceforge.jnlp.util.FileTestUtils;
import net.sourceforge.jnlp.util.logging.NoStdOutErrTest;
+import org.junit.Assert;
import org.junit.Test;
@@ -259,4 +260,38 @@
}
});
}
+
+
+ @Test
+ public void tryNullManifest() throws Exception {
+ File tempDirectory = FileTestUtils.createTempDirectory();
+ File jarLocation = new File(tempDirectory, "test-npe.jar");
+ File dummyContent = File.createTempFile("dummy", "context", tempDirectory);
+ jarLocation.deleteOnExit();
+
+ /* Test with-out any attribute specified specified */
+ FileTestUtils.createJarWithoutManifestContents(jarLocation, dummyContent);
+
+ final Exception[] exs = new Exception[2];
+ final DummyJNLPFileWithJar jnlpFile = new DummyJNLPFileWithJar(jarLocation);
+ try {
+ final JNLPClassLoader classLoader = new JNLPClassLoader(jnlpFile, UpdatePolicy.ALWAYS);
+ assertNoFileLeak(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ assertEquals(null, classLoader.getManifestAttribute(jnlpFile.getJarLocation(), Attributes.Name.MAIN_CLASS));
+ assertEquals(null, classLoader.getManifestAttribute(jnlpFile.getJarLocation(), Attributes.Name.IMPLEMENTATION_TITLE));
+ } catch (Exception e) {
+ exs[0] = e;
+ }
+ }
+ });
+ } catch (Exception e) {
+ exs[1] = e;
+ }
+ Assert.assertNotNull(exs);
+ Assert.assertNull(exs[0]);
+ Assert.assertNull(exs[1]);
+ }
}
diff -r 349c86e05863 -r d5bcc8f80d90 tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java
--- a/tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java Mon Nov 25 16:54:23 2013 +0100
+++ b/tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java Wed Nov 27 14:20:25 2013 +0100
@@ -35,9 +35,11 @@
exception statement from your version.
*/
+import java.util.Arrays;
import net.sourceforge.jnlp.ProcessResult;
import net.sourceforge.jnlp.ServerAccess;
import net.sourceforge.jnlp.annotations.Bug;
+import net.sourceforge.jnlp.runtime.Translator;
import org.junit.Assert;
import org.junit.Test;
@@ -154,15 +156,32 @@
/**
*
* Two jars, both with manifest, sboth with main tag, no app desc
+ * first jar is taken
*
*/
@Test
public void manifestedJar1main2mainNoAppDesc() throws Exception {
String id = "ManifestedJar-1main2mainNoAppDesc";
ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
+ assertManifestedJar1(id, pr);
+ assertNotManifestedJar2(id, pr);
+ assertNotDead(id, pr);
+ }
+
+ /**
+ *
+ * Two jars, both with manifest, sboth with main tag, no app desc
+ * two main jars reported
+ *
+ */
+ @Test
+ public void manifestedJar1main2mainNoAppDescStrict() throws Exception {
+ String id = "ManifestedJar-1main2mainNoAppDesc";
+ ProcessResult pr = server.executeJavawsHeadless(Arrays.asList(new String[]{"-strict"}), "/" + id + ".jnlp");
assertNotManifestedJar1(id, pr);
assertNotManifestedJar2(id, pr);
assertNotDead(id, pr);
+ Assert.assertTrue(pr.stderr.contains(Translator.R("PTwoMains")) || pr.stdout.contains(Translator.R("PTwoMains")));
}
/**
diff -r 349c86e05863 -r d5bcc8f80d90 tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java
--- a/tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java Mon Nov 25 16:54:23 2013 +0100
+++ b/tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java Wed Nov 27 14:20:25 2013 +0100
@@ -89,13 +89,25 @@
}
/* Creates a jar in a temporary directory, with the given name & file contents */
+ static public void createJarWithoutManifestContents(File jarFile, File... fileContents) throws Exception{
+ createJarWithContents(jarFile, null, fileContents);
+ }
+
+ /* Creates a jar in a temporary directory, with the given name & file contents */
static public void createJarWithContents(File jarFile, Manifest manifestContents, File... fileContents)
throws Exception {
/* Manifest quite evilly ignores all attributes if we don't specify a version!
* Make sure it's set here. */
- manifestContents.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ if (manifestContents != null){
+ manifestContents.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ }
- JarOutputStream jarWriter = new JarOutputStream(new FileOutputStream(jarFile), manifestContents);
+ JarOutputStream jarWriter;
+ if (manifestContents == null){
+ jarWriter = new JarOutputStream(new FileOutputStream(jarFile));
+ } else {
+ jarWriter = new JarOutputStream(new FileOutputStream(jarFile), manifestContents);
+ }
for (File file : fileContents) {
jarWriter.putNextEntry(new JarEntry(file.getName()));
FileInputStream fileReader = new FileInputStream(file);
More information about the distro-pkg-dev
mailing list