# HG changeset patch # User Danesh Dadachanji # Date 1345056254 14400 # Node ID 684acbb6c35ecb7d03731c587fa4b3f7194f19c6 # Parent c7bf15bbc88ee4a7e2ccfda46b1952dd975fa4fe Fix PR975: Plugin should not include classpaths specified in jar manifests when using jnlp_href diff -r c7bf15bbc88e -r 684acbb6c35e ChangeLog --- a/ChangeLog Tue Aug 14 16:07:38 2012 -0400 +++ b/ChangeLog Wed Aug 15 14:44:14 2012 -0400 @@ -1,3 +1,28 @@ +2012-08-14 Danesh Dadachanji + + Small addition to NEWS entry and bug annotation indicating the PR975 fix. + * NEWS: Add entry for PR975 + * tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java: + Add bug annotation for PR975. + +2012-08-14 Danesh Dadachanji + + Classpaths in jars' manifests are only considered when the applet is run + without using jnlp_href and a JNLP file. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (activateJars): + Add conditional check for use of jnlp_href. + * tests/reproducers/signed/Classpath.Manifest.Test.Helper/srcs/CheckForClasspath.java: + Applet whose jar is stored in a subdir under the test engine server. + * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.html: + * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.jnlp: + * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestApplicationTest.jnlp: + * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestJNLPHrefTest.html: + * tests/reproducers/signed/ClasspathManifestTest/srcs/ClasspathManifest.java: + * tests/reproducers/signed/ClasspathManifestTest/srcs/META-INF/MANIFEST.MF: + * tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java: + Test if manifest entry is searched for classpath only when in the plugin + is run without using jnlp_href. + 2012-08-14 Adam Domurad Reproducer for allowing unsigned content in META-INF/ folder. diff -r c7bf15bbc88e -r 684acbb6c35e NEWS --- a/NEWS Tue Aug 14 16:07:38 2012 -0400 +++ b/NEWS Wed Aug 15 14:44:14 2012 -0400 @@ -25,6 +25,7 @@ - PR855: AppletStub getDocumentBase() doesn't return full URL - PR1011: Folders treated as jar files in archive tag - PR1106: Buffer overflow in plugin table + - PR975: Plugin should not include classpaths specified in jar manifests when using jnlp_href * Common - PR918: java applet windows uses a low resulution black/white icon - RH838417: Disambiguate signed applet security prompt from certificate warning diff -r c7bf15bbc88e -r 684acbb6c35e netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Aug 14 16:07:38 2012 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Aug 15 14:44:14 2012 -0400 @@ -1286,7 +1286,11 @@ JarFile jarFile = new JarFile(localFile.getAbsolutePath()); Manifest mf = jarFile.getManifest(); - if (file instanceof PluginBridge) { + // Only check classpath if this is the plugin and there is no jnlp_href usage. + // Note that this is different from proprietary plugin behaviour. + // If jnlp_href is used, the app should be treated similarly to when + // it is run from javaws as a webstart. + if (file instanceof PluginBridge && !((PluginBridge) file).useJNLPHref()) { classpaths.addAll(getClassPathsFromManifest(mf, jar.getLocation().getPath())); } diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/Classpath.Manifest.Test.Helper/srcs/CheckForClasspath.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/Classpath.Manifest.Test.Helper/srcs/CheckForClasspath.java Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,42 @@ +/* CheckForClasspath.java +Copyright (C) 2012 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 CheckForClasspath { + public static void checkClasspathAndPrint() { + System.out.println("CheckForClasspath found on classpath."); + } +} diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.html Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,48 @@ + + + + + + + + diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.jnlp Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,61 @@ + + + + + Classpath Manifest Applet Test + IcedTea + + ClasspathManifest + + + + + + + + + + + + diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestApplicationTest.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestApplicationTest.jnlp Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,56 @@ + + + + + ClasspathManifest + IcedTea + + ClasspathManifest + + + + + + + + + + + + diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestJNLPHrefTest.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestJNLPHrefTest.html Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,46 @@ + + + + + + + + + + diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/ClasspathManifestTest/srcs/ClasspathManifest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/ClasspathManifestTest/srcs/ClasspathManifest.java Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,81 @@ +/* ClasspathManifest.java +Copyright (C) 2012 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.lang.reflect.*; + +public class ClasspathManifest extends Applet { + + private class Killer extends Thread { + + public int n = 1000; + + @Override + public void run() { + try { + Thread.sleep(n); + System.out.println("Applet killing himself after " + n + " ms of life"); + System.exit(0); + } catch (Exception ex) { + } + } + } + private Killer killer; + + public static void main(String[] args) { + searchForClasspath(); + } + + @Override + public void init() { + searchForClasspath(); + killer = new Killer(); + killer.start(); + } + + public static void searchForClasspath() { + System.out.println("Searching for CheckForClasspath."); + try { + Class checkClass = Class.forName("CheckForClasspath"); + Method checkMethod = checkClass.getDeclaredMethod("checkClasspathAndPrint"); + checkMethod.invoke((Object) null); + } catch (Exception ex) { + System.out.println("Exception was thrown, class not found on classpath."); + ex.printStackTrace(); + } + } +} diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/ClasspathManifestTest/srcs/META-INF/MANIFEST.MF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/ClasspathManifestTest/srcs/META-INF/MANIFEST.MF Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: Classpath/Manifest/Test/Helper.jar + diff -r c7bf15bbc88e -r 684acbb6c35e tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java Wed Aug 15 14:44:14 2012 -0400 @@ -0,0 +1,134 @@ +/* ClasspathManifestTest.java +Copyright (C) 2012 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.util.ArrayList; +import java.util.List; + +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerAccess.ProcessResult; +import net.sourceforge.jnlp.annotations.Bug; +import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.annotations.TestInBrowsers; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.browsertesting.Browsers; + +import org.junit.Assert; +import org.junit.Test; + +@Bug(id = "PR975") +public class ClasspathManifestTest extends BrowserTest { + + private static String s1 = "Searching for CheckForClasspath."; + private static String s2 = "CheckForClasspath found on classpath."; + private static String ss = "xception"; + + public void checkAppFails(ProcessResult pr, String testName) { + Assert.assertTrue("ClasspathManifest." + testName + " stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1)); + Assert.assertFalse("ClasspathManifest." + testName + " stdout should not contain " + s2 + " but did", pr.stdout.contains(s2)); + Assert.assertTrue("ClasspathManifest." + testName + " stderr should contain " + ss + " but didn't", pr.stderr.contains(ss)); + } + + @NeedsDisplay + @Test + public void ApplicationJNLPRemoteTest() throws Exception { + ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestApplicationTest.jnlp"); + checkAppFails(pr, "ApplicationJNLPRemoteTest"); + } + + @NeedsDisplay + @KnownToFail + @Test + public void ApplicationJNLPLocalTest() throws Exception { + List commands=new ArrayList(3); + commands.add(server.getJavawsLocation()); + commands.add(ServerAccess.HEADLES_OPTION); + commands.add("ClasspathManifestApplicationTest.jnlp"); + ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir()); + checkAppFails(pr, "ApplicationJNLPLocalTest"); + } + + @NeedsDisplay + @Test + public void AppletJNLPRemoteTest() throws Exception { + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp"); + checkAppFails(pr, "AppletJNLPRemoteTest"); + } + + @NeedsDisplay + @KnownToFail + @Test + public void AppletJNLPRLocalTest() throws Exception { + List commands=new ArrayList(3); + commands.add(server.getJavawsLocation()); + commands.add(ServerAccess.HEADLES_OPTION); + commands.add("ClasspathManifestAppletTest.jnlp"); + ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir()); + checkAppFails(pr, "AppletJNLPRLocalTest"); + } + + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + @Test + public void BrowserJNLPHrefRemoteTest() throws Exception { + ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html"); + checkAppFails(pr, "BrowserJNLPHrefRemoteTest"); + } + + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + @KnownToFail + @Test + public void BrowserJNLPHrefLocalTest() throws Exception { + List commands=new ArrayList(2); + commands.add(server.getBrowserLocation()); + commands.add("ClasspathManifestJNLPHrefTest.html"); + ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir()); + checkAppFails(pr, "BrowserJNLPHrefLocalTest"); + } + + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + @Test + public void BrowserAppletRemoteTest() throws Exception { + ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html"); + Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1)); + // Should be the only one to search manifest for classpath. + Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2)); + Assert.assertFalse("ClasspathManifest.BrowserAppletRemoteTest stderr should not contain " + ss + " but did", pr.stderr.contains(ss)); + } +}