/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Jul 29 13:43:55 UTC 2015
changeset 0a300a424fe9 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0a300a424fe9
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Jul 27 18:46:37 2015 +0200
Removed last remains of BOOT_DIR
* Makefile.am: declared and exported EXPORTED_JAR EXPORTED_KEYTOOL EXPORTED_JARSIGNER EXPORTED_PACK200
* tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile: all of (BOOT_DIR)/bin/keytool (BOOT_DIR)/bin/jarsigner (BOOT_DIR)/bin/javac (BOOT_DIR)/bin/jar (BOOT_DIR)/bin/pack200 replaced by (EXPORTED_KEYTOOL) (EXPORTED_JARSIGNER) (EXPORTED_JAVAC) (EXPORTED_JAR) (EXPORTED_PACK200)
* tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile: same
* tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same
* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same
* tests/reproducers/custom/MixedSigningApplet/srcs/Makefile: same
* tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile: same
* tests/reproducers/custom/PackGZip/srcs/Makefile: same
* tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile: same
* tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile: same
* tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile: same
* tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile: same
* tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile: same
changeset a8f8a311b30d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a8f8a311b30d
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jul 29 15:43:27 2015 +0200
Initial push for big trusted-only/mixed-permissions reproducer
* tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnly.html.in: template for javaws html and browser test (substitute archives and mainclass and commnad)
* tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApp.jnlp.in: template for javaws (substitute security, archives and mainclass and commnads)
* tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApplet.jnlp.in: template for javaws applet (substitute security, archives and mainclass and commnads)
* tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MANIFEST.MF: manifest with Trusted-only: true to be potentially used in jars
* tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile: custom makefile which generates 12 jars. six signed, six unsigned, six with manifest, six without. two times two with one class, two with both classes
* tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java: source class1, may confirm itself, try privileged action, try those two on second class,
* tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java: same but vice versa
* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java: utility class for this reproducer (with tests)
* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java:
simple twelve tests verifying single signed jar with both classes without manifest work
diffstat:
ChangeLog | 46 +
Makefile.am | 4 +
tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile | 10 +-
tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile | 4 +-
tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile | 4 +-
tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile | 4 +-
tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnly.html.in | 49 +
tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApp.jnlp.in | 55 +
tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApplet.jnlp.in | 60 +
tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MANIFEST.MF | 2 +
tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile | 69 ++
tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java | 110 +++
tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java | 110 +++
tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java | 345 ++++++++++
tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java | 177 +++++
tests/reproducers/custom/MixedSigningApplet/srcs/Makefile | 6 +-
tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile | 8 +-
tests/reproducers/custom/PackGZip/srcs/Makefile | 8 +-
tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile | 6 +-
tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile | 6 +-
tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile | 8 +-
tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile | 8 +-
tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile | 4 +-
tests/test-extensions/net/sourceforge/jnlp/tools/DeploymentPropertiesModifier.java | 2 +-
24 files changed, 1066 insertions(+), 39 deletions(-)
diffs (truncated from 1308 to 500 lines):
diff -r dee18160ba9c -r a8f8a311b30d ChangeLog
--- a/ChangeLog Thu Jul 23 15:23:06 2015 +0200
+++ b/ChangeLog Wed Jul 29 15:43:27 2015 +0200
@@ -1,3 +1,49 @@
+2015-07-29 Jiri Vanek <jvanek at redhat.com>
+
+ Initial push for big trusted-only/mixed-permissions reproducer
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnly.html.in:
+ template for javaws html and browser test (substitute archives and mainclass and commnad)
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApp.jnlp.in:
+ template for javaws (substitute security, archives and mainclass and commnads)
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApplet.jnlp.in:
+ template for javaws applet (substitute security, archives and mainclass and commnads)
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MANIFEST.MF:
+ manifest with Trusted-only: true to be potentially used in jars
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile:
+ custom makefile which generates 12 jars. six signed, six unsigned, six with manifest, six without.
+ two times two with one class, two with both classes
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java:
+ source class1, may confirm itself, try privileged action, try those two on second class,
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java:
+ same but vice versa
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java:
+ utility class for this reproducer (with tests)
+ * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java:
+ simple twelve tests verifying single signed jar with both classes without manifest works
+
+2015-07-27 Jiri Vanek <jvanek at redhat.com>
+
+ Removed last remains of BOOT_DIR
+ * Makefile.am: declared and exported EXPORTED_JAR EXPORTED_KEYTOOL
+ EXPORTED_JARSIGNER EXPORTED_PACK200
+ * tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile:
+ all of (BOOT_DIR)/bin/keytool (BOOT_DIR)/bin/jarsigner (BOOT_DIR)/bin/javac
+ (BOOT_DIR)/bin/jar (BOOT_DIR)/bin/pack200 replaced by (EXPORTED_KEYTOOL)
+ (EXPORTED_JARSIGNER) (EXPORTED_JAVAC) (EXPORTED_JAR) (EXPORTED_PACK200)
+ * tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile: same
+ * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same
+ * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same
+ * tests/reproducers/custom/MixedSigningApplet/srcs/Makefile: same
+ * tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile: same
+ * tests/reproducers/custom/PackGZip/srcs/Makefile: same
+ * tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile:
+ same
+ * tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile: same
+ * tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile: same
+ * tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile: same
+ * tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile: same
+
+
2015-07-23 Jiri Vanek <jvanek at redhat.com>
Enabled and properly tested Entry-Point attribute check
diff -r dee18160ba9c -r a8f8a311b30d Makefile.am
--- a/Makefile.am Thu Jul 23 15:23:06 2015 +0200
+++ b/Makefile.am Wed Jul 29 15:43:27 2015 +0200
@@ -231,6 +231,10 @@
#exported autoconf copies
export EXPORTED_JAVAC=$(SYSTEM_JDK_DIR)/bin/javac
+export EXPORTED_JAR=$(SYSTEM_JDK_DIR)/bin/jar
+export EXPORTED_KEYTOOL=$(SYSTEM_JDK_DIR)/bin/keytool
+export EXPORTED_JARSIGNER=$(SYSTEM_JDK_DIR)/bin/jarsigner
+export EXPORTED_PACK200=$(SYSTEM_JDK_DIR)/bin/pack200
#end of exported autoconf copies
# binary names
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile
--- a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile Thu Jul 23 15:23:06 2015 +0200
+++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile Wed Jul 29 15:43:27 2015 +0200
@@ -2,10 +2,10 @@
ARCHIVE_TEST_FOLDER=archive_tag_folder_test
JAVAC_CLASSPATH=$(TEST_EXTENSIONS_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
+KEYTOOL=$(EXPORTED_KEYTOOL)
+JARSIGNER=$(EXPORTED_JARSIGNER)
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
# File used because the 'jar' command does not accept an empty file
DUMMY_FILE=jar_dummy_content
@@ -43,7 +43,7 @@
# 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) \
+ $(EXPORTED_JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) \
-keypass $(PRIVATE_KEYSTORE_PASS) "$$jar_to_sign" $(TEST_CERT_ALIAS)_signed ; \
done
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile
--- a/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile Thu Jul 23 15:23:06 2015 +0200
+++ b/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile Wed Jul 29 15:43:27 2015 +0200
@@ -5,8 +5,8 @@
OUTER_FILE=AppletReferenceOutOfJar.class
JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
TMPDIR:=$(shell mktemp -d)
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile
--- a/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile Thu Jul 23 15:23:06 2015 +0200
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile Wed Jul 29 15:43:27 2015 +0200
@@ -5,8 +5,8 @@
ENTRYPOINT_CLASSES=ExtensionJnlpHelper ExtensionJnlpTestApplet
JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
TMPDIR:=$(shell mktemp -d)
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile
--- a/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile Thu Jul 23 15:23:06 2015 +0200
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile Wed Jul 29 15:43:27 2015 +0200
@@ -5,8 +5,8 @@
ENTRYPOINT_CLASSES=JNLPClassLoaderDeadlock_1 JNLPClassLoaderDeadlock_2
JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
TMPDIR:=$(shell mktemp -d)
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnly.html.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnly.html.in Wed Jul 29 15:43:27 2015 +0200
@@ -0,0 +1,49 @@
+<!--
+
+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 code="@MAIN_CLASS at .class"
+ archive="@APPLET_ARCHIVES@"
+ codebase="."
+ width="640"
+ height="480">
+ @APPLET_PARAMS@
+ </applet>
+ </body>
+</html>
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApp.jnlp.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApp.jnlp.in Wed Jul 29 15:43:27 2015 +0200
@@ -0,0 +1,55 @@
+<!--
+
+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@ codebase=".">
+ <information>
+ <title>MixedSigningAndTrustedOnly</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>Test per-JAR security assignment and permissions with or without Tusted-Only</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ @JNLP_ARCHIVES@
+ </resources>
+ @SECURITY_TAG@
+ <application-desc main-class="@MAIN_CLASS@">
+ @JNLP_ARGS@
+ </application-desc>
+</jnlp>
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApplet.jnlp.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/resources/MixedSigningAndTrustedOnlyApplet.jnlp.in Wed Jul 29 15:43:27 2015 +0200
@@ -0,0 +1,60 @@
+<!--
+
+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@ codebase=".">
+ <information>
+ <title>MixedSigningAndTrustedOnly</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>Test per-JAR security assignment and permissions with or without Tusted-Only</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ @JNLP_ARCHIVES@
+ </resources>
+ @SECURITY_TAG@
+ <applet-desc
+ documentBase="."
+ name="MixedSigningAndTrustedOnly"
+ main-class="@MAIN_CLASS@"
+ width="100"
+ height="100">
+ @APPLET_PARAMS@
+ </applet-desc>
+</jnlp>
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MANIFEST.MF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MANIFEST.MF Wed Jul 29 15:43:27 2015 +0200
@@ -0,0 +1,2 @@
+Trusted-only: true
+Application-Name: MixedSigningAndTrustedOnly
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/Makefile Wed Jul 29 15:43:27 2015 +0200
@@ -0,0 +1,69 @@
+TESTNAME=MixedSigningAndTrustedOnly
+
+SRC_NAME1=$(TESTNAME)Class1
+SRC_NAME2=$(TESTNAME)Class2
+SRC_FILE1=$(SRC_NAME1).java
+SRC_FILE2=$(SRC_NAME2).java
+COMPILED_FILES1=$(SRC_NAME1)*.class
+COMPILED_FILES2=$(SRC_NAME2)*.class
+
+JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
+JARSIGNER=$(EXPORTED_JARSIGNER)
+JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)
+SIGFILE=-sigfile Alpha
+
+SIGNED1=$(TESTNAME)BothSigned.jar
+SIGNED2=$(TESTNAME)FirstSigned.jar
+SIGNED3=$(TESTNAME)SecondSigned.jar
+UNSIGNED1=$(TESTNAME)BothUnsigned.jar
+UNSIGNED2=$(TESTNAME)FirstUnsigned.jar
+UNSIGNED3=$(TESTNAME)SecondUnsigned.jar
+
+MSIGNED1=$(TESTNAME)BothSignedManifest.jar
+MSIGNED2=$(TESTNAME)FirstSignedManifest.jar
+MSIGNED3=$(TESTNAME)SecondSignedManifest.jar
+MUNSIGNED1=$(TESTNAME)BothUnsignedManifest.jar
+MUNSIGNED2=$(TESTNAME)FirstUnsignedManifest.jar
+MUNSIGNED3=$(TESTNAME)SecondUnsignedManifest.jar
+
+MANIFEST=MANIFEST.MF
+TMPDIR:=$(shell mktemp -d)
+
+prepare-reproducer:
+ echo PREPARING REPRODUCER $(TESTNAME) ; \
+ $(JAVAC) -d $(TMPDIR) -classpath $(JAVAC_CLASSPATH) $(SRC_FILE1) $(SRC_FILE2); \
+ cp ../resources/* $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+ pushd $(TMPDIR); \
+ $(JAR) cf $(SIGNED1) $(COMPILED_FILES1) $(COMPILED_FILES2); \
+ $(JAR) cf $(SIGNED2) $(COMPILED_FILES1) ; \
+ $(JAR) cf $(SIGNED3) $(COMPILED_FILES2); \
+ $(JAR) cf $(UNSIGNED1) $(COMPILED_FILES1) $(COMPILED_FILES2); \
+ $(JAR) cf $(UNSIGNED2) $(COMPILED_FILES1) ; \
+ $(JAR) cf $(UNSIGNED3) $(COMPILED_FILES2); \
+ popd ; \
+ cp $(MANIFEST) $(TMPDIR) ; \
+ pushd $(TMPDIR); \
+ $(JAR) cfm $(MSIGNED1) $(MANIFEST) $(COMPILED_FILES1) $(COMPILED_FILES2); \
+ $(JAR) cfm $(MSIGNED2) $(MANIFEST) $(COMPILED_FILES1) ; \
+ $(JAR) cfm $(MSIGNED3) $(MANIFEST) $(COMPILED_FILES2); \
+ $(JAR) cfm $(MUNSIGNED1) $(MANIFEST) $(COMPILED_FILES1) $(COMPILED_FILES2); \
+ $(JAR) cfm $(MUNSIGNED2) $(MANIFEST) $(COMPILED_FILES1) ; \
+ $(JAR) cfm $(MUNSIGNED3) $(MANIFEST) $(COMPILED_FILES2); \
+ popd ; \
+ $(JARSIGNER_CMD) $(SIGFILE) $(TMPDIR)/$(SIGNED1) $(TEST_CERT_ALIAS)_signed; \
+ $(JARSIGNER_CMD) $(SIGFILE) $(TMPDIR)/$(SIGNED2) $(TEST_CERT_ALIAS)_signed; \
+ $(JARSIGNER_CMD) $(SIGFILE) $(TMPDIR)/$(SIGNED3) $(TEST_CERT_ALIAS)_signed; \
+ $(JARSIGNER_CMD) $(SIGFILE) $(TMPDIR)/$(MSIGNED1) $(TEST_CERT_ALIAS)_signed; \
+ $(JARSIGNER_CMD) $(SIGFILE) $(TMPDIR)/$(MSIGNED2) $(TEST_CERT_ALIAS)_signed; \
+ $(JARSIGNER_CMD) $(SIGFILE) $(TMPDIR)/$(MSIGNED3) $(TEST_CERT_ALIAS)_signed; \
+ cp $(TMPDIR)/{$(SIGNED1),$(SIGNED2),$(SIGNED3)} $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+ cp $(TMPDIR)/{$(UNSIGNED1),$(UNSIGNED2),$(UNSIGNED3)} $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+ cp $(TMPDIR)/{$(MSIGNED1),$(MSIGNED2),$(MSIGNED3)} $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+ cp $(TMPDIR)/{$(MUNSIGNED1),$(MUNSIGNED2),$(MUNSIGNED3)} $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+ echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR); \
+ rm -rf $(TMPDIR);
+
+clean-reproducer:
+ echo NOTHING TO CLEAN FOR $(TESTNAME)
diff -r dee18160ba9c -r a8f8a311b30d tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java Wed Jul 29 15:43:27 2015 +0200
@@ -0,0 +1,110 @@
+/*
+ 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.
+ */
+
+import java.applet.Applet;
+import java.util.Arrays;
+
+public class MixedSigningAndTrustedOnlyClass1 extends Applet {
+
+ private static final String ID1 = "MixedSigningAndTrustedOnlyClass1";
+ private static final String ID2 = "MixedSigningAndTrustedOnlyClass2";
+
+ public static void main(String[] args) {
+ runBody(args);
+ }
+
+ @Override
+ public void start() {
+ String c = getParameter("command");
+ String[] cc = c.split(" ");
+ runBody(cc);
+ }
+
+ private static void runBody(String... commands) {
+ try {
+ System.out.println(ID1 + " running");
+ System.out.println("params: " + Arrays.toString(commands));
+ boolean canDie = true;
+ for (String command : commands) {
+ try {
+ switch (command) {
+ case "canDie":
+ canDie = true;
+ break;
+ case "cantDie":
+ canDie = false;
+ break;
+ case ID1 + "_Normal":
+ doNormal();
+ break;
+ case ID1 + "_Restricted":
+ doRestrictedAction();
+ break;
+ case ID2 + "_Normal":
+ MixedSigningAndTrustedOnlyClass2.doNormal();
+ break;
+ case ID2 + "_Restricted":
+ MixedSigningAndTrustedOnlyClass2.doRestrictedAction();
+ break;
+
+ }
+ } catch (Exception ex) {
+ if (canDie) {
+ throw ex;
+ } else {
+ ex.printStackTrace();
+ }
+ }
+ }
+ } finally {
+ System.out.println("*** APPLET FINISHED ***");
+ System.out.flush();
+ System.out.println("some garbage forcing to flush");
+ System.out.flush();
+ }
+ }
+
+ public static void doRestrictedAction() {
+ System.out.println(System.getProperty("user.home"));
+ System.out.println(ID1 + " Property read");
+ }
+
More information about the distro-pkg-dev
mailing list