# HG changeset patch # User Jiri Vanek # Date 1389085937 -3600 # Node ID 91e191cac1181a6c709da0b2d0f4e2175381b8c4 # Parent 28ac9a016c80327a360fc1de12214188a017a8f0 Backport of Fix PR1271: icedtea-web does not handle javascript:-protocol URLs diff -r 28ac9a016c80 -r 91e191cac118 ChangeLog --- a/ChangeLog Fri Dec 27 09:51:24 2013 -0500 +++ b/ChangeLog Tue Jan 07 10:12:17 2014 +0100 @@ -1,3 +1,19 @@ +2013-01-07 Adam Domurad + + Backport of Fix PR1271: icedtea-web does not handle javascript:-protocol URLs + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Evaluate + javascript when it shows up in a 'showDocument' call. + * plugin/icedteanp/java/sun/applet/PluginMain.java: Install arbitrary + 'javascript:' protocol handler. + * tests/rproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html: + Tests if javascript is run from a test applet using showDocument. + * tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js: + Same. + * tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java: + Same. + * tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java: + Same. + 2013-12-27 Andrew Azores Resolve deadlock issue in JNLPClassLoader. See diff -r 28ac9a016c80 -r 91e191cac118 NEWS --- a/NEWS Fri Dec 27 09:51:24 2013 -0500 +++ b/NEWS Tue Jan 07 10:12:17 2014 +0100 @@ -12,6 +12,7 @@ * Dialogs center on screen before becoming visible * Support for u45 new manifest attributes (Application-Name) * Plugin + - PR1271: icedtea-web does not handle 'javascript:'-protocol URLs - RH976833: Multiple applets on one page cause deadlock - Enabled javaconsole diff -r 28ac9a016c80 -r 91e191cac118 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Dec 27 09:51:24 2013 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jan 07 10:12:17 2014 +0100 @@ -114,6 +114,7 @@ import net.sourceforge.jnlp.splashscreen.SplashController; import net.sourceforge.jnlp.splashscreen.SplashPanel; import net.sourceforge.jnlp.splashscreen.SplashUtils; +import netscape.javascript.JSObject; import sun.awt.AppContext; import sun.awt.SunToolkit; import sun.awt.X11.XEmbeddedFrame; @@ -911,20 +912,21 @@ return v.elements(); } - /** - * Ignore. - */ @Override public void showDocument(URL url) { PluginDebug.debug("Showing document..."); showDocument(url, "_self"); } - /** - * Ignore. - */ @Override public void showDocument(URL url, String target) { + // If it is a javascript document, eval on current page. + if ("javascript".equals(url.getProtocol())) { + // Snip protocol off string + String evalString = url.toString().substring("javascript:".length()); + eval(getWindow(), evalString); + return; + } try { Long reference = getRequestIdentifier(); write("reference " + reference + " LoadURL " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); diff -r 28ac9a016c80 -r 91e191cac118 plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Fri Dec 27 09:51:24 2013 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Tue Jan 07 10:12:17 2014 +0100 @@ -66,11 +66,15 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.Field; import java.net.Authenticator; import java.net.CookieHandler; import java.net.CookieManager; import java.net.ProxySelector; +import java.net.URL; +import java.net.URLStreamHandler; import java.util.Enumeration; +import java.util.Hashtable; import java.util.Properties; import sun.awt.AppContext; import sun.awt.SunToolkit; @@ -91,6 +95,25 @@ // on whether the property that uses it is necessary/standard. private static final String theVersion = System.getProperty("java.version"); + /* Install a handler directly using reflection. This ensures that java doesn't error-out + * when javascript is used in a URL. We can then handle these URLs correctly in eg PluginAppletViewer.showDocument(). + */ + static private void installDummyJavascriptProtocolHandler() { + try { + Field handlersField = URL.class.getDeclaredField("handlers"); + handlersField.setAccessible(true); + + @SuppressWarnings("unchecked") + Hashtable handlers = (Hashtable)handlersField.get(null); + + // Place an arbitrary handler, we only need the URL construction to not error-out + handlers.put("javascript", new sun.net.www.protocol.http.Handler()); + } catch (Exception e) { + System.err.println("Unable to install 'javascript:' URL protocol handler!"); + e.printStackTrace(); + } + } + /** * The main entry point into AppletViewer. */ @@ -99,6 +122,8 @@ if (AppContext.getAppContext() == null) { SunToolkit.createNewAppContext(); } + installDummyJavascriptProtocolHandler(); + if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1); diff -r 28ac9a016c80 -r 91e191cac118 tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html Tue Jan 07 10:12:17 2014 +0100 @@ -0,0 +1,50 @@ + + + + + + + + + diff -r 28ac9a016c80 -r 91e191cac118 tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js Tue Jan 07 10:12:17 2014 +0100 @@ -0,0 +1,6 @@ +var applet = document.getElementById('applet') + +function runSomeJS() { + applet.print("Javascript URL string was evaluated.") + applet.state = "HasRun"; +} diff -r 28ac9a016c80 -r 91e191cac118 tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java Tue Jan 07 10:12:17 2014 +0100 @@ -0,0 +1,22 @@ +import java.applet.Applet; +import java.net.URL; +import netscape.javascript.JSObject; + +public class JavascriptProtocol extends Applet { + public String state = "HasntRun"; + @Override + public void start() { + try { + getAppletContext().showDocument(new URL("javascript:runSomeJS()")); + System.out.println("State after showDocument was " + state); + } catch (Exception e) { + e.printStackTrace(); + } + System.out.println("*** APPLET FINISHED ***"); + } + // Utility for JS side + public void print(String s) { + System.out.println(s); + } +} + diff -r 28ac9a016c80 -r 91e191cac118 tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java Tue Jan 07 10:12:17 2014 +0100 @@ -0,0 +1,78 @@ +/* +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 static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess.AutoClose; +import net.sourceforge.jnlp.annotations.Bug; +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 net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; + +import org.junit.Test; + +public class JavascriptProtocolTest extends BrowserTest { + + private static final String END_STRING = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING; + + private static void assertContains(String source, String message, String substring) { + assertTrue(source + " should contain '" + substring + "' but did not!", + message.contains(substring)); + } + private static void assertNotContains(String source, String message, String substring) { + assertFalse(source + " should not contain '" + substring + "' but did!", + message.contains(substring)); + } + + @Test + @TestInBrowsers(testIn = { Browsers.all }) + @NeedsDisplay + @Bug(id = { "PR1271" }) + public void testJavascriptProtocolFollowed() throws Exception { + ProcessResult pr = server.executeBrowser("/JavascriptProtocol.html", + AutoClose.CLOSE_ON_BOTH); + assertNotContains("stdout", pr.stdout, "HasntRun"); + assertContains("stdout", pr.stdout, "Javascript URL string was evaluated."); + assertContains("stdout", pr.stdout, "HasRun"); + assertContains("stdout", pr.stdout, END_STRING); + } + +}