diff options
7 files changed, 298 insertions, 0 deletions
@@ -1,3 +1,19 @@ +2012-08-20 Adam Domurad <[email protected]> + + Tests whether a main class can be found in a jar specified in + META-INF/INDEX.LIST. This test is done with both signed and unsigned + jars. The failure with signed jars encapsulates PR1112. + * tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListSigned.jnlp: + * tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListUnsigned.jnlp: + JNLP files for the signed and unsigned varions of the test + * tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/LoadedViaMetaInfIndexList.java: + Main class that is within a jar loaded via + * tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile: + Prepares a jar with INDEX.LIST pointing to another jar that has the + main-class. Copies of these jars and made and signed. + * tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/testcases/AdditionalJarsInMetaInfIndexListTests.java: + Test driver, tests if main-class has run. + 2012-08-27 Adam Domurad <[email protected]> Tests custom policy definition in such a way that has been known to diff --git a/Makefile.am b/Makefile.am index 937cb28..cc71215 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ # Source directories +export TOP_BUILD_DIR = $(abs_top_builddir) + export NETX_DIR = $(abs_top_builddir)/netx.build export NETX_SRCDIR = $(abs_top_srcdir)/netx export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources diff --git a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListSigned.jnlp b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListSigned.jnlp new file mode 100644 index 0000000..6d48b53 --- /dev/null +++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListSigned.jnlp @@ -0,0 +1,56 @@ +<!-- + +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="AdditionalJarsInMetaInfIndexListSigned.jnlp" codebase="."> + <information> + <title>AdditionalJarsInMetaInfIndexListSigned</title> + <vendor>IcedTea</vendor> + <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/> + <description>AdditionalJarsInMetaInfIndexListSigned</description> + <offline/> + </information> + <resources> + <j2se version="1.4+"/> + <jar href="AdditionalJarsInMetaInfIndexListSigned.jar"/> + </resources> + <application-desc main-class="LoadedViaMetaInfIndexList"> + </application-desc> + <security> + <all-permissions/> + </security> +</jnlp> diff --git a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListUnsigned.jnlp b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListUnsigned.jnlp new file mode 100644 index 0000000..0b3fe5e --- /dev/null +++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/resources/AdditionalJarsInMetaInfIndexListUnsigned.jnlp @@ -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="AdditionalJarsInMetaInfIndexListUnsigned.jnlp" codebase="."> + <information> + <title>AdditionalJarsInMetaInfIndexListUnsigned</title> + <vendor>IcedTea</vendor> + <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/> + <description>AdditionalJarsInMetaInfIndexListUnsigned</description> + <offline/> + </information> + <resources> + <j2se version="1.4+"/> + <jar href="AdditionalJarsInMetaInfIndexListUnsigned.jar"/> + </resources> + <application-desc main-class="LoadedViaMetaInfIndexList"> + </application-desc> +</jnlp> diff --git a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/LoadedViaMetaInfIndexList.java b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/LoadedViaMetaInfIndexList.java new file mode 100644 index 0000000..f1b9c05 --- /dev/null +++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/LoadedViaMetaInfIndexList.java @@ -0,0 +1,41 @@ +/* +Copyright (C) 2011 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 LoadedViaMetaInfIndexList { + public static void main(String[] args) { + System.out.println("Program Executed Correctly."); + } +} diff --git a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile new file mode 100644 index 0000000..c08dc8a --- /dev/null +++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile @@ -0,0 +1,61 @@ +TESTNAME=AdditionalJarsInMetaInfIndexList +ARCHIVE_TEST_FOLDER=archive_tag_folder_test + +JAVAC_CLASSPATH=$(JNLP_TESTS_ENGINE_DIR):$(NETX_DIR)/lib/classes.jar +KEYTOOL=$(BOOT_DIR)/bin/keytool +JARSIGNER=$(BOOT_DIR)/bin/jarsigner +JAVAC=$(BOOT_DIR)/bin/javac +JAR=$(BOOT_DIR)/bin/jar + +# File used because the 'jar' command does not accept an empty file +DUMMY_FILE=jar_dummy_content + +# Index jar causes main class jar to load +INDEX_JAR_UNSIGNED=AdditionalJarsInMetaInfIndexListUnsigned.jar +INDEX_JAR_SIGNED=AdditionalJarsInMetaInfIndexListSigned.jar + +MAINCLASS=LoadedViaMetaInfIndexList + +MAINCLASS_JAR_UNSIGNED=LoadedViaMetaInfIndexListUnsigned.jar +MAINCLASS_JAR_SIGNED=LoadedViaMetaInfIndexListSigned.jar + +TMPDIR:=$(shell mktemp -d) + +prepare-reproducer: + echo PREPARING REPRODUCER $(TESTNAME) in $(TMPDIR) + + $(JAVAC) -d $(TMPDIR) -classpath $(JAVAC_CLASSPATH) $(MAINCLASS).java + + # Create the jars which have INDEX.LIST + cd $(TMPDIR) ; \ + echo "This file exists because jar command does not take 0 args" > $(DUMMY_FILE) ; \ + $(JAR) cvf $(INDEX_JAR_UNSIGNED) $(DUMMY_FILE) ; \ + $(JAR) cvf $(INDEX_JAR_SIGNED) $(DUMMY_FILE) ; + + # Create the jar which has the main-class + # and update INDEX_JAR_*'s index + cd $(TMPDIR) ; \ + $(JAR) cvf $(MAINCLASS_JAR_UNSIGNED) $(MAINCLASS).class ; \ + $(JAR) cvf $(MAINCLASS_JAR_SIGNED) $(MAINCLASS).class ; \ + $(JAR) i $(INDEX_JAR_UNSIGNED) $(MAINCLASS_JAR_UNSIGNED) ; \ + $(JAR) i $(INDEX_JAR_SIGNED) $(MAINCLASS_JAR_SIGNED) ; + + # Sign some of the jars for the signed jar test + cd $(TMPDIR) ; \ + for jar_to_sign in $(MAINCLASS_JAR_SIGNED) $(INDEX_JAR_SIGNED); do \ + $(BOOT_DIR)/bin/jarsigner -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) \ + -keypass $(PRIVATE_KEYSTORE_PASS) "$$jar_to_sign" $(TEST_CERT_ALIAS)_signed ; \ + done + + # Move jars into deployment directory + cd $(TMPDIR); \ + mv $(INDEX_JAR_UNSIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ; \ + mv $(INDEX_JAR_SIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ; \ + mv $(MAINCLASS_JAR_UNSIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ; \ + mv $(MAINCLASS_JAR_SIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ; + + echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR) + rm -rf $(TMPDIR) + +clean-reproducer: + echo NOTHING TO CLEAN FOR $(TESTNAME) diff --git a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/testcases/AdditionalJarsInMetaInfIndexListTests.java b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/testcases/AdditionalJarsInMetaInfIndexListTests.java new file mode 100644 index 0000000..0b81a17 --- /dev/null +++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/testcases/AdditionalJarsInMetaInfIndexListTests.java @@ -0,0 +1,69 @@ +/* AdditionalJarsInMetaInfIndexListTests.java +Copyright (C) 2011 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.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.annotations.Bug; +import net.sourceforge.jnlp.browsertesting.BrowserTest; + +import org.junit.Test; + +public class AdditionalJarsInMetaInfIndexListTests extends BrowserTest { + + private static ServerAccess server = new ServerAccess(); + private static final List<String> TRUSTALL = Collections.unmodifiableList(Arrays.asList(new String[] { "-Xtrustall" })); + private static final String CORRECT_EXEC = "Program Executed Correctly."; + + @Test + @Bug(id = "PR1112") + public void SignedMetaInfIndexListTest() throws Exception { + ProcessResult pr = server.executeJavawsHeadless("/AdditionalJarsInMetaInfIndexListSigned.jnlp"); + assertTrue("LoadedViaMetaInfIndexList's stdout should contain " + CORRECT_EXEC + " but did not.", pr.stdout.contains(CORRECT_EXEC)); + } + + @Test + public void UnsignedMetaInfIndexListTest() throws Exception { + ProcessResult pr = server.executeJavawsHeadless(TRUSTALL, "/AdditionalJarsInMetaInfIndexListUnsigned.jnlp"); + assertTrue("LoadedViaMetaInfIndexList's stdout should contain " + CORRECT_EXEC + " but did not.", pr.stdout.contains(CORRECT_EXEC)); + } +} |