From 91a90efe719aac862370a1ed5dccfa99f1e33052 Mon Sep 17 00:00:00 2001 From: Adam Domurad Date: Mon, 18 Jun 2012 10:27:04 -0400 Subject: New reproducer: JNLP should fail on invalid jar file, applet-tag ignore it --- .../resources/AppletReadsInvalidJar.html | 42 +++++++++++++ .../resources/AppletReadsInvalidJar.jnlp | 62 ++++++++++++++++++++ .../simple/AppletReadsInvalidJar/srcs/Valid.java | 58 ++++++++++++++++++ .../testcases/AppletReadsInvalidJarTests.java | 68 ++++++++++++++++++++++ 4 files changed, 230 insertions(+) create mode 100644 tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.html create mode 100644 tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.jnlp create mode 100644 tests/jnlp_tests/simple/AppletReadsInvalidJar/srcs/Valid.java create mode 100644 tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java diff --git a/tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.html b/tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.html new file mode 100644 index 0000000..aed49b8 --- /dev/null +++ b/tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.html @@ -0,0 +1,42 @@ + + +

+

+ + diff --git a/tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.jnlp b/tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.jnlp new file mode 100644 index 0000000..6a2325d --- /dev/null +++ b/tests/jnlp_tests/simple/AppletReadsInvalidJar/resources/AppletReadsInvalidJar.jnlp @@ -0,0 +1,62 @@ + + + + + AppletReadsInvalidJar + IcedTea + + AppletTest + + + + + + + + + + + + + diff --git a/tests/jnlp_tests/simple/AppletReadsInvalidJar/srcs/Valid.java b/tests/jnlp_tests/simple/AppletReadsInvalidJar/srcs/Valid.java new file mode 100644 index 0000000..9b0bcd6 --- /dev/null +++ b/tests/jnlp_tests/simple/AppletReadsInvalidJar/srcs/Valid.java @@ -0,0 +1,58 @@ +import java.applet.Applet; + +/* +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 Valid extends Applet { + + private static class Killer extends Thread { + @Override + public void run() { + try { + int n = 2000; + Thread.sleep(n); + System.exit(0); + } catch (Exception ex) { + } + } + } + + @Override + public void init() { + new Killer().start(); + System.out.println("Program Executed Correctly."); + } +} diff --git a/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java b/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java new file mode 100644 index 0000000..fef0e4a --- /dev/null +++ b/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java @@ -0,0 +1,68 @@ +/* AppletReadsInvalidJarTests.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 net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerAccess.ProcessResult; +import net.sourceforge.jnlp.LaunchException; +import org.junit.Assert; + +import org.junit.Test; + +public class AppletReadsInvalidJarTests { + + private static ServerAccess server = new ServerAccess(); + + static final String CORRECT_EXECUTION = "Program Executed Correctly."; + static final String JNLP_EXPECTED_EXCEPTION = "ZipException"; + + /*This SHOULD NOT execute the applet!*/ + @Test + public void AppletJNLPTest() throws Exception { + ServerAccess.ProcessResult pr = server.executeJavawsHeadless("/AppletReadsInvalidJar.jnlp"); + + Assert.assertFalse("AppletReadsInvalidJar stdout should NOT contain '" + CORRECT_EXECUTION + "', but did (applet should not have ran!).", pr.stdout.contains(CORRECT_EXECUTION)); + Assert.assertTrue("AppletReadsInvalidJar stderr should contain 'ZipException', but did not.", pr.stderr.contains(JNLP_EXPECTED_EXCEPTION)); + } + + /*This SHOULD execute the applet!*/ + @Test + public void AppletInFirefoxTest() throws Exception { + ServerAccess.ProcessResult pr = server.executeBrowser("/AppletReadsInvalidJar.html"); + + Assert.assertTrue("AppletReadsInvalidJar stdout should contain '" + CORRECT_EXECUTION + "' but did not.", pr.stdout.contains(CORRECT_EXECUTION)); + } +} -- cgit v1.2.3