changeset in /hg/icedtea6: * Apply patch from Xerxes R?nby to pr...
Deepak Bhole
dbhole at redhat.com
Mon Feb 23 14:19:41 PST 2009
changeset 1be2224bd96c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1be2224bd96c
description:
* Apply patch from Xerxes R?nby to prevent initialization timeout on slower
systems.
* Fix for 294 [handle null jar specification in archive tags + handle empty
jars]. The JavaFX page still does not load, but the error appears to in
server-side code now, caused due to an old version of applet-loader.
* Supply cookie info when requesting jars (rhbz #480487).
* Fix bug that was causing exceptions to be thrown during shutdown.
diffstat:
16 files changed, 231 insertions(+), 89 deletions(-)
ChangeLog | 28 ++++++
IcedTeaPlugin.cc | 76 +++++++++++++-----
plugin/icedtea/sun/applet/PluginAppletViewer.java | 43 +++++++---
plugin/icedtea/sun/applet/PluginStreamHandler.java | 36 ++++----
rt/net/sourceforge/jnlp/ExtensionDesc.java | 15 +++
rt/net/sourceforge/jnlp/JNLPFile.java | 27 ++++--
rt/net/sourceforge/jnlp/Launcher.java | 4
rt/net/sourceforge/jnlp/NetxPanel.java | 7 +
rt/net/sourceforge/jnlp/Parser.java | 2
rt/net/sourceforge/jnlp/PluginBridge.java | 16 +++
rt/net/sourceforge/jnlp/cache/CacheUtil.java | 5 -
rt/net/sourceforge/jnlp/cache/Resource.java | 17 +++-
rt/net/sourceforge/jnlp/cache/ResourceTracker.java | 12 ++
rt/net/sourceforge/jnlp/runtime/Boot.java | 2
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 10 +-
rt/net/sourceforge/jnlp/tools/JarSigner.java | 20 ++--
diffs (truncated from 805 to 500 lines):
diff -r 0848286d8e5c -r 1be2224bd96c ChangeLog
--- a/ChangeLog Mon Feb 23 15:42:22 2009 -0500
+++ b/ChangeLog Mon Feb 23 17:14:33 2009 -0500
@@ -1,3 +1,31 @@ 2009-02-23 Lillian Angel <langel at redha
+2009-02-23 Deepak Bhole <dbhole at redhat.com>
+
+ * IcedTeaPlugin.cc: Supply cookie info to Java side.
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java: Apply patch from
+ Xerxes RÃ¥nby to prevent initialization timeout on slower systems. Also,
+ use cookie info when equests for jar are made.
+ * plugin/icedtea/sun/applet/PluginStreamHandler.java: Fix bug that was
+ causing unnecessary exception prints on exit.
+ * rt/net/sourceforge/jnlp/ExtensionDesc.java: Store/supply cookie info as
+ needed.
+ * rt/net/sourceforge/jnlp/JNLPFile.java: Same.
+ * rt/net/sourceforge/jnlp/Launcher.java: Same.
+ * rt/net/sourceforge/jnlp/NetxPanel.java: Same.
+ * rt/net/sourceforge/jnlp/Parser.java: Same.
+ * rt/net/sourceforge/jnlp/PluginBridge.java: Same. Also, handle empty jar
+ specification (Bug: 294) in archive tags.
+ * rt/net/sourceforge/jnlp/cache/CacheUtil.java: Store/supply cookie info
+ as needed.
+ * rt/net/sourceforge/jnlp/cache/Resource.java: Same.
+ * rt/net/sourceforge/jnlp/cache/ResourceTracker.java: Supply cookie string
+ to server when requesting jars, if there is one set.
+ * rt/net/sourceforge/jnlp/runtime/Boot.java: Initialize JNLPFile with null
+ cookie string.
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Store/supply
+ cookie info as needed.
+ * rt/net/sourceforge/jnlp/tools/JarSigner.java: Use JarInputStream instead
+ of Jar to handle empty jars, and update signature checking accordingly.
+
2009-02-23 Lillian Angel <langel at redhat.com>
* AUTHORS: Added Mark Reinhold.
diff -r 0848286d8e5c -r 1be2224bd96c IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Mon Feb 23 15:42:22 2009 -0500
+++ b/IcedTeaPlugin.cc Mon Feb 23 17:14:33 2009 -0500
@@ -1063,6 +1063,7 @@ private:
IcedTeaPluginFactory* factory;
PRUint32 instance_identifier;
nsCString instanceIdentifierPrefix;
+ nsresult GetCookie(const char* siteAddr, char** cookieString);
};
@@ -2281,6 +2282,12 @@ IcedTeaPluginFactory::DisplayFailureDial
}
+#include <nsICookieService.h>
+#include <nsIIOService.h>
+#include <nsIScriptSecurityManager.h>
+#include <nsIURI.h>
+#include <nsServiceManagerUtils.h>
+
NS_IMPL_ISUPPORTS2 (IcedTeaPluginInstance, nsIPluginInstance,
nsIJVMPluginInstance)
@@ -2337,25 +2344,35 @@ IcedTeaPluginInstance::Initialize (nsIPl
PLUGIN_DEBUG_1ARG("TAG FROM BROWSER = %s\n", tagMessage.get());
// encode newline characters in the message
- nsCString toSend("");
+ nsCString encodedAppletTag("");
for (int i=0; i < tagMessage.Length(); i++)
{
if (tagMessage.get()[i] == '\r')
{
- toSend += " ";
+ encodedAppletTag += " ";
continue;
}
if (tagMessage.get()[i] == '\n')
{
- toSend += " ";
+ encodedAppletTag += " ";
continue;
}
- toSend += tagMessage.get()[i];
+ encodedAppletTag += tagMessage.get()[i];
}
- factory->SendMessageToAppletViewer (toSend);
+ nsCString cookieInfo(instanceIdentifierPrefix);
+ cookieInfo += "cookie ";
+
+ char* cookieString;
+ if (GetCookie(documentbase, &cookieString) == NS_OK)
+ {
+ cookieInfo += cookieString;
+ }
+
+ factory->SendMessageToAppletViewer (cookieInfo);
+ factory->SendMessageToAppletViewer (encodedAppletTag);
// Set back-pointer to peer instance.
PLUGIN_DEBUG_1ARG ("SETTING PEER!!!: %p\n", aPeer);
@@ -2629,6 +2646,42 @@ IcedTeaPluginInstance::GetJavaObject (jo
return factory->GetJavaObject (instance_identifier, object);
}
+
+NS_IMETHODIMP
+IcedTeaPluginInstance::GetCookie(const char* siteAddr, char** cookieString)
+{
+
+ nsresult rv;
+ nsCOMPtr<nsIScriptSecurityManager> sec_man =
+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
+
+ if (!sec_man) {
+ return NS_ERROR_FAILURE;
+ }
+
+ nsCOMPtr<nsIIOService> io_svc = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+
+ if (NS_FAILED(rv) || !io_svc) {
+ return NS_ERROR_FAILURE;
+ }
+
+ nsIURI *uri;
+ io_svc->NewURI(nsCString(siteAddr), NULL, NULL, &uri);
+
+ nsCOMPtr<nsICookieService> cookie_svc = do_GetService(NS_COOKIESERVICE_CONTRACTID, &rv);
+
+ if (NS_FAILED(rv) || !cookie_svc) {
+ return NS_ERROR_FAILURE;
+ }
+
+ rv = cookie_svc->GetCookieString(uri, NULL, cookieString);
+
+ if (NS_FAILED(rv) || !*cookieString) {
+ return NS_ERROR_FAILURE;
+ }
+
+ return NS_OK;
+}
NS_IMETHODIMP
IcedTeaPluginFactory::GetJavaObject (PRUint32 instance_identifier,
@@ -4438,10 +4491,7 @@ NS_IMPL_ISUPPORTS1 (IcedTeaJNIEnv, nsISe
#include <nsISocketTransport.h>
#include <nsITransport.h>
#include <nsNetCID.h>
-#include <nsServiceManagerUtils.h>
#include <nsIPrincipal.h>
-#include <nsIScriptSecurityManager.h>
-#include <nsIURI.h>
#include <xpcjsid.h>
IcedTeaJNIEnv::IcedTeaJNIEnv (IcedTeaPluginFactory* factory)
@@ -4486,16 +4536,6 @@ nsresult
nsresult
IcedTeaJNIEnv::GetEnabledPrivileges(nsCString *privileges, nsISecurityContext *ctx)
{
- nsresult rv;
- nsCOMPtr<nsIScriptSecurityManager> sec_man =
- do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
-
- if (NS_FAILED(rv) || !sec_man) {
- return NS_ERROR_FAILURE;
- }
-
- PRBool isEnabled = PR_FALSE;
-
// check privileges one by one
privileges->Truncate();
diff -r 0848286d8e5c -r 1be2224bd96c plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java Mon Feb 23 15:42:22 2009 -0500
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java Mon Feb 23 17:14:33 2009 -0500
@@ -174,6 +174,8 @@ import sun.misc.Ref;
private static PluginCallRequestFactory requestFactory;
+ private static HashMap<Integer, String> siteCookies = new HashMap<Integer,String>();
+
private double proposedHeightFactor;
private double proposedWidthFactor;
@@ -186,7 +188,7 @@ import sun.misc.Ref;
/**
* Create the applet viewer
*/
- public PluginAppletViewer(int identifier, long handle, int x, int y, final URL doc,
+ public PluginAppletViewer(final int identifier, long handle, int x, int y, final URL doc,
final Hashtable atts, PrintStream statusMsgStream,
PluginAppletViewerFactory factory) {
super(handle, true);
@@ -213,7 +215,7 @@ import sun.misc.Ref;
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
try {
- panel = new NetxPanel(doc, atts, false);
+ panel = new NetxPanel(doc, siteCookies.get(identifier), atts, false);
AppletViewerPanel.debug("Using NetX panel");
PluginDebug.debug(atts.toString());
} catch (Exception ex) {
@@ -302,15 +304,12 @@ import sun.misc.Ref;
showStatus(amh.getMessage("status.start"));
initEventQueue();
- // Wait for a maximum of 10 seconds for the panel to initialize
+ // Wait for the panel to initialize
// (happens in a separate thread)
Applet a;
- int maxSleepTime = 10000;
- int sleepTime = 0;
- while ((a = panel.getApplet()) == null && sleepTime < maxSleepTime) {
+ while ((a = panel.getApplet()) == null && panel.getAppletHandlerThread().isAlive()) {
try {
Thread.sleep(100);
- sleepTime += 100;
PluginDebug.debug("Waiting for applet to initialize... ");
} catch (InterruptedException ie) {
ie.printStackTrace();
@@ -344,7 +343,7 @@ import sun.misc.Ref;
} catch (IOException ioe) {
ioe.printStackTrace();
}
-
+
}
public static void setStreamhandler(PluginStreamHandler sh) {
@@ -420,6 +419,16 @@ import sun.misc.Ref;
PluginDebug.debug ("REQUEST TAG NOT SET: " + request.tag + ". BYPASSING");
}
}
+ } else if (message.startsWith("cookie")) {
+
+ int cookieStrIndex = message.indexOf(" ");
+ String cookieStr = null;
+
+ if (cookieStrIndex > 0)
+ cookieStr = message.substring(cookieStrIndex);
+
+ // Always set the cookie -- even if it is null
+ siteCookies.put(identifier, cookieStr);
} else {
PluginDebug.debug ("HANDLING MESSAGE " + message + " instance " + identifier + " " + Thread.currentThread());
applets.get(identifier).handleMessage(reference, message);
@@ -480,18 +489,21 @@ import sun.misc.Ref;
// object should belong to?
Object o;
- // Wait for a maximum of 10 seconds for the panel to initialize
+ // Wait for the panel to initialize
// (happens in a separate thread)
- int maxSleepTime = 10000;
- int sleepTime = 0;
- while ((o = panel.getApplet()) == null && sleepTime < maxSleepTime) {
+ while ((o = panel.getApplet()) == null && panel.getAppletHandlerThread().isAlive()) {
try {
Thread.sleep(100);
- sleepTime += 100;
PluginDebug.debug("Waiting for applet to initialize...");
} catch (InterruptedException ie) {
ie.printStackTrace();
}
+ }
+
+ // Still null?
+ if (panel.getApplet() == null) {
+ this.streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError " + "Initialization failed");
+ return;
}
PluginDebug.debug ("Looking for object " + o + " panel is " + panel);
@@ -1455,6 +1467,11 @@ import sun.misc.Ref;
public static void parse(int identifier, long handle, Reader in, URL url)
throws IOException {
+
+ // wait until cookie is set (even if cookie is null, it needs to be
+ // "set" to that first
+ while (!siteCookies.containsKey(identifier));
+
final int fIdentifier = identifier;
final long fHandle = handle;
final Reader fIn = in;
diff -r 0848286d8e5c -r 1be2224bd96c plugin/icedtea/sun/applet/PluginStreamHandler.java
--- a/plugin/icedtea/sun/applet/PluginStreamHandler.java Mon Feb 23 15:42:22 2009 -0500
+++ b/plugin/icedtea/sun/applet/PluginStreamHandler.java Mon Feb 23 17:14:33 2009 -0500
@@ -362,24 +362,26 @@ public class PluginStreamHandler {
try {
message = pluginInputReader.readLine();
PluginDebug.debug(" PIPE: appletviewer read: " + message);
+
+ if (message == null || message.equals("shutdown")) {
+ synchronized(shuttingDown) {
+ shuttingDown = true;
+ }
+ try {
+ // Close input/output channels to plugin.
+ pluginInputReader.close();
+ pluginOutputWriter.close();
+ } catch (IOException exception) {
+ // Deliberately ignore IOException caused by broken
+ // pipe since plugin may have already detached.
+ }
+ AppletSecurityContextManager.dumpStore(0);
+ PluginDebug.debug("APPLETVIEWER: exiting appletviewer");
+ System.exit(0);
+ }
+
} catch (IOException e) {
-
- if (message == null || message.equals("shutdown")) {
- synchronized(shuttingDown) {
- shuttingDown = true;
- }
- try {
- // Close input/output channels to plugin.
- pluginInputReader.close();
- pluginOutputWriter.close();
- } catch (IOException exception) {
- // Deliberately ignore IOException caused by broken
- // pipe since plugin may have already detached.
- }
- AppletSecurityContextManager.dumpStore(0);
- PluginDebug.debug("APPLETVIEWER: exiting appletviewer");
- System.exit(0);
- }
+ e.printStackTrace();
}
return message;
diff -r 0848286d8e5c -r 1be2224bd96c rt/net/sourceforge/jnlp/ExtensionDesc.java
--- a/rt/net/sourceforge/jnlp/ExtensionDesc.java Mon Feb 23 15:42:22 2009 -0500
+++ b/rt/net/sourceforge/jnlp/ExtensionDesc.java Mon Feb 23 17:14:33 2009 -0500
@@ -40,6 +40,9 @@ public class ExtensionDesc {
/** the location of the extension JNLP file */
private URL location;
+
+ /** the cookie string sent with resource requests */
+ private String cookieStr;
/** the JNLPFile the extension refers to */
private JNLPFile file;
@@ -58,10 +61,11 @@ public class ExtensionDesc {
* @param version the required version of the extention JNLPFile
* @param location the location of the extention JNLP file
*/
- public ExtensionDesc(String name, Version version, URL location) {
+ public ExtensionDesc(String name, Version version, URL location, String cookieStr) {
this.name = name;
this.version = version;
this.location = location;
+ this.cookieStr = cookieStr;
}
/**
@@ -121,7 +125,7 @@ public class ExtensionDesc {
*/
public void resolve() throws ParseException, IOException {
if (file == null) {
- file = new JNLPFile(location);
+ file = new JNLPFile(location, cookieStr);
if (JNLPRuntime.isDebug())
System.out.println("Resolve: "+file.getInformation().getTitle());
@@ -140,6 +144,13 @@ public class ExtensionDesc {
public JNLPFile getJNLPFile() {
return file;
}
+
+ /**
+ * Returns the cookie associated with this instance
+ */
+ public String getCookieStr() {
+ return cookieStr;
+ }
}
diff -r 0848286d8e5c -r 1be2224bd96c rt/net/sourceforge/jnlp/JNLPFile.java
--- a/rt/net/sourceforge/jnlp/JNLPFile.java Mon Feb 23 15:42:22 2009 -0500
+++ b/rt/net/sourceforge/jnlp/JNLPFile.java Mon Feb 23 17:14:33 2009 -0500
@@ -62,6 +62,9 @@ public class JNLPFile {
/** the URL used to resolve relative URLs in the file */
protected URL codeBase;
+
+ /** cookie string to send alongwith resource requests */
+ protected String cookieStr;
/** file version */
protected Version fileVersion;
@@ -117,8 +120,8 @@ public class JNLPFile {
* @throws IOException if an IO exception occurred
* @throws ParseException if the JNLP file was invalid
*/
- public JNLPFile(URL location) throws IOException, ParseException {
- this(location, false); // not strict
+ public JNLPFile(URL location, String cookieStr) throws IOException, ParseException {
+ this(location, cookieStr, false); // not strict
}
/**
@@ -130,8 +133,8 @@ public class JNLPFile {
* @throws IOException if an IO exception occurred
* @throws ParseException if the JNLP file was invalid
*/
- public JNLPFile(URL location, boolean strict) throws IOException, ParseException {
- this(location, strict, JNLPRuntime.getDefaultUpdatePolicy());
+ public JNLPFile(URL location, String cookieStr, boolean strict) throws IOException, ParseException {
+ this(location, cookieStr, strict, JNLPRuntime.getDefaultUpdatePolicy());
}
/**
@@ -144,11 +147,12 @@ public class JNLPFile {
* @throws IOException if an IO exception occurred
* @throws ParseException if the JNLP file was invalid
*/
- public JNLPFile(URL location, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
- Node root = Parser.getRootNode(openURL(location, policy));
+ public JNLPFile(URL location, String cookieStr, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
+ Node root = Parser.getRootNode(openURL(location, cookieStr, policy));
parse(root, strict, location);
this.fileLocation = location;
+ this.cookieStr = cookieStr;
}
/**
@@ -179,13 +183,13 @@ public class JNLPFile {
* Open the jnlp file URL from the cache if there, otherwise
* download to the cache. Called from constructor.
*/
- private static InputStream openURL(URL location, UpdatePolicy policy) throws IOException {
+ private static InputStream openURL(URL location, String cookieStr, UpdatePolicy policy) throws IOException {
if (location == null || policy == null)
throw new IllegalArgumentException(R("NullParameter"));
try {
ResourceTracker tracker = new ResourceTracker(false); // no prefetch
- tracker.addResource(location, null/*version*/, policy);
+ tracker.addResource(location, cookieStr, null/*version*/, policy);
return tracker.getInputStream(location);
}
@@ -246,6 +250,13 @@ public class JNLPFile {
return codeBase;
}
+ /**
+ * Returns the cookie string that will be send when resources for this file are requested
+ */
+ public String getCookieStr() {
+ return cookieStr;
+ }
+
/**
* Returns the information section of the JNLP file as viewed
* through the default locale.
diff -r 0848286d8e5c -r 1be2224bd96c rt/net/sourceforge/jnlp/Launcher.java
--- a/rt/net/sourceforge/jnlp/Launcher.java Mon Feb 23 15:42:22 2009 -0500
+++ b/rt/net/sourceforge/jnlp/Launcher.java Mon Feb 23 17:14:33 2009 -0500
@@ -299,10 +299,10 @@ public class Launcher {
JNLPFile file = null;
try {
- file = new JNLPFile(location, true, updatePolicy); // strict
+ file = new JNLPFile(location, null, true, updatePolicy); // strict
}
catch (ParseException ex) {
- file = new JNLPFile(location, false, updatePolicy);
+ file = new JNLPFile(location, null, false, updatePolicy);
// only here if strict failed but lax did not fail
LaunchException lex =
diff -r 0848286d8e5c -r 1be2224bd96c rt/net/sourceforge/jnlp/NetxPanel.java
--- a/rt/net/sourceforge/jnlp/NetxPanel.java Mon Feb 23 15:42:22 2009 -0500
+++ b/rt/net/sourceforge/jnlp/NetxPanel.java Mon Feb 23 17:14:33 2009 -0500
@@ -41,6 +41,7 @@ public class NetxPanel extends AppletVie
private PluginBridge bridge = null;
private boolean exitOnFailure = true;
private AppletInstance appInst = null;
+ private String cookieStr;
public NetxPanel(URL documentURL, Hashtable atts)
{
@@ -48,10 +49,11 @@ public class NetxPanel extends AppletVie
}
// overloaded constructor, called when initialized via plugin
- public NetxPanel(URL documentURL, Hashtable atts, boolean exitOnFailure)
+ public NetxPanel(URL documentURL, String cookieStr, Hashtable atts, boolean exitOnFailure)
{
this(documentURL, atts);
this.exitOnFailure = exitOnFailure;
+ this.cookieStr = cookieStr;
}
//Overriding to use Netx classloader. You might need to relax visibility
More information about the distro-pkg-dev
mailing list