changeset in /hg/icedtea: Rewrote cookie support for the plugin ...
Deepak Bhole
dbhole at redhat.com
Tue Aug 4 09:07:37 PDT 2009
changeset 544a26bdc6d0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=544a26bdc6d0
description:
Rewrote cookie support for the plugin so that cookies are aquired dynamically
from Mozilla for each http/https connection.
diffstat:
16 files changed, 127 insertions(+), 108 deletions(-)
ChangeLog | 16 ++++
IcedTeaPlugin.cc | 52 ++++++++++---
netx/net/sourceforge/jnlp/ExtensionDesc.java | 16 ----
netx/net/sourceforge/jnlp/JNLPFile.java | 27 ++-----
netx/net/sourceforge/jnlp/Launcher.java | 6 -
netx/net/sourceforge/jnlp/NetxPanel.java | 5 -
netx/net/sourceforge/jnlp/Parser.java | 2
netx/net/sourceforge/jnlp/PluginBridge.java | 3
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 4 -
netx/net/sourceforge/jnlp/cache/Resource.java | 17 ----
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 10 --
netx/net/sourceforge/jnlp/runtime/Boot.java | 2
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 10 +-
plugin/icedtea/sun/applet/PluginAppletViewer.java | 57 +++++++++------
plugin/icedtea/sun/applet/PluginCallRequestFactory.java | 2
plugin/icedtea/sun/applet/PluginMain.java | 6 +
diffs (truncated from 645 to 500 lines):
diff -r 559f19ce8d7b -r 544a26bdc6d0 ChangeLog
--- a/ChangeLog Tue Jul 07 13:44:35 2009 -0400
+++ b/ChangeLog Thu Jul 09 14:42:44 2009 -0400
@@ -1,3 +1,19 @@ 2009-07-07 Omair Majid <omajid at redhat.
+2009-07-09 Deepak Bhole <dbhole at redhat.com>
+
+ * IcedTeaPlugin.cc: Add suppport for cookie info requests from applets.
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java: Rework cookie support
+ to make it dynamic.
+ * plugin/icedtea/sun/applet/PluginMain.java: Wire in custom cookie store
+ that dynamically requests cookie information from C++ side.
+ * netx/net/sourceforge/jnlp/JNLPFile.java: Remove old cookie handling code.
+ * netx/net/sourceforge/jnlp/Launcher.java: Same.
+ * netx/net/sourceforge/jnlp/NetxPanel.java: Same.
+ * netx/net/sourceforge/jnlp/PluginBridge.java: Same.
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java: Same.
+ * netx/net/sourceforge/jnlp/cache/Resource.java: Same.
+ * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Same.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Same.
+
2009-07-07 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/Parser.java
diff -r 559f19ce8d7b -r 544a26bdc6d0 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Tue Jul 07 13:44:35 2009 -0400
+++ b/IcedTeaPlugin.cc Thu Jul 09 14:42:44 2009 -0400
@@ -1012,6 +1012,7 @@ private:
void ProcessMessage();
void ConsumeMsgFromJVM();
nsresult GetProxyInfo(const char* siteAddr, char** proxyScheme, char** proxyHost, char** proxyPort);
+ nsresult GetCookieInfo(const char* siteAddr, char** cookieString);
nsCOMPtr<IcedTeaEventSink> sink;
nsCOMPtr<nsISocketTransport> transport;
nsCOMPtr<nsIProcess> applet_viewer_process;
@@ -1070,7 +1071,6 @@ private:
IcedTeaPluginFactory* factory;
PRUint32 instance_identifier;
nsCString instanceIdentifierPrefix;
- nsresult GetCookie(const char* siteAddr, char** cookieString);
};
@@ -2380,16 +2380,6 @@ IcedTeaPluginInstance::Initialize (nsIPl
encodedAppletTag += tagMessage.get()[i];
}
- 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.
@@ -2760,8 +2750,15 @@ IcedTeaPluginFactory::GetProxyInfo(const
return NS_OK;
}
-NS_IMETHODIMP
-IcedTeaPluginInstance::GetCookie(const char* siteAddr, char** cookieString)
+/**
+ * Returns the cookie information for the given url
+ *
+ * @param siteAddr The URI to check (must be decoded)
+ * @return cookieString The cookie string for the given URI
+ */
+
+NS_IMETHODIMP
+IcedTeaPluginFactory::GetCookieInfo(const char* siteAddr, char** cookieString)
{
nsresult rv;
@@ -3497,6 +3494,35 @@ IcedTeaPluginFactory::HandleMessage (nsC
// free allocated memory
delete proxyScheme, proxyHost, proxyPort;
+
+ } else if (command == "PluginCookieInfo")
+ {
+
+ nsresult rv;
+ nsCOMPtr<nsINetUtil> net_util = do_GetService(NS_NETUTIL_CONTRACTID, &rv);
+
+ if (!net_util)
+ printf("Error instantiating NetUtil service.\n");
+
+ // decode the url
+ nsDependentCSubstring url;
+ net_util->UnescapeString(rest, 0, url);
+
+ nsCString cookieInfo("plugin PluginCookieInfo ");
+ cookieInfo += rest;
+ cookieInfo += " ";
+
+ char* cookieString;
+ if (GetCookieInfo(((nsCString) url).get(), &cookieString) == NS_OK)
+ {
+ cookieInfo += cookieString;
+ PLUGIN_DEBUG_2ARG("Cookie for %s is %s\n", ((nsCString) url).get(), cookieString);
+ } else {
+ PLUGIN_DEBUG_1ARG("No cookie found for %s\n", ((nsCString) url).get());
+ }
+
+ // send back what we found
+ SendMessageToAppletViewer (cookieInfo);
}
}
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/ExtensionDesc.java
--- a/netx/net/sourceforge/jnlp/ExtensionDesc.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/ExtensionDesc.java Thu Jul 09 14:42:44 2009 -0400
@@ -40,9 +40,6 @@ 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;
@@ -61,11 +58,10 @@ 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, String cookieStr) {
+ public ExtensionDesc(String name, Version version, URL location) {
this.name = name;
this.version = version;
this.location = location;
- this.cookieStr = cookieStr;
}
/**
@@ -125,7 +121,7 @@ public class ExtensionDesc {
*/
public void resolve() throws ParseException, IOException {
if (file == null) {
- file = new JNLPFile(location, cookieStr);
+ file = new JNLPFile(location);
if (JNLPRuntime.isDebug())
System.out.println("Resolve: "+file.getInformation().getTitle());
@@ -144,14 +140,6 @@ public class ExtensionDesc {
public JNLPFile getJNLPFile() {
return file;
}
-
- /**
- * Returns the cookie associated with this instance
- */
- public String getCookieStr() {
- return cookieStr;
- }
-
}
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Thu Jul 09 14:42:44 2009 -0400
@@ -69,9 +69,6 @@ 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;
@@ -127,8 +124,8 @@ public class JNLPFile {
* @throws IOException if an IO exception occurred
* @throws ParseException if the JNLP file was invalid
*/
- public JNLPFile(URL location, String cookieStr) throws IOException, ParseException {
- this(location, cookieStr, false); // not strict
+ public JNLPFile(URL location) throws IOException, ParseException {
+ this(location, false); // not strict
}
/**
@@ -140,8 +137,8 @@ public class JNLPFile {
* @throws IOException if an IO exception occurred
* @throws ParseException if the JNLP file was invalid
*/
- public JNLPFile(URL location, String cookieStr, boolean strict) throws IOException, ParseException {
- this(location, cookieStr, strict, JNLPRuntime.getDefaultUpdatePolicy());
+ public JNLPFile(URL location, boolean strict) throws IOException, ParseException {
+ this(location, strict, JNLPRuntime.getDefaultUpdatePolicy());
}
/**
@@ -154,12 +151,11 @@ public class JNLPFile {
* @throws IOException if an IO exception occurred
* @throws ParseException if the JNLP file was invalid
*/
- public JNLPFile(URL location, String cookieStr, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
- Node root = Parser.getRootNode(openURL(location, cookieStr, policy));
+ public JNLPFile(URL location, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
+ Node root = Parser.getRootNode(openURL(location, policy));
parse(root, strict, location);
this.fileLocation = location;
- this.cookieStr = cookieStr;
}
/**
@@ -190,13 +186,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, String cookieStr, UpdatePolicy policy) throws IOException {
+ private static InputStream openURL(URL location, 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, cookieStr, null/*version*/, policy);
+ tracker.addResource(location, null/*version*/, policy);
return tracker.getInputStream(location);
}
@@ -255,13 +251,6 @@ public class JNLPFile {
*/
public URL getCodeBase() {
return codeBase;
- }
-
- /**
- * Returns the cookie string that will be send when resources for this file are requested
- */
- public String getCookieStr() {
- return cookieStr;
}
/**
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Jul 09 14:42:44 2009 -0400
@@ -335,10 +335,10 @@ public class Launcher {
JNLPFile file = null;
try {
- file = new JNLPFile(location, null, true, updatePolicy); // strict
+ file = new JNLPFile(location, true, updatePolicy); // strict
}
catch (ParseException ex) {
- file = new JNLPFile(location, null, false, updatePolicy);
+ file = new JNLPFile(location, false, updatePolicy);
// only here if strict failed but lax did not fail
LaunchException lex =
@@ -389,7 +389,7 @@ public class Launcher {
IconDesc.SPLASH, preferredWidth, preferredHeight);
if (splashImageURL != null) {
ResourceTracker resourceTracker = new ResourceTracker(true);
- resourceTracker.addResource(splashImageURL, "SPLASH", file.getFileVersion(), updatePolicy);
+ resourceTracker.addResource(splashImageURL, file.getFileVersion(), updatePolicy);
splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
splashScreen.setSplashImageURL(splashImageURL);
if (splashScreen.isSplashScreenValid()) {
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/NetxPanel.java
--- a/netx/net/sourceforge/jnlp/NetxPanel.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/NetxPanel.java Thu Jul 09 14:42:44 2009 -0400
@@ -41,7 +41,6 @@ public class NetxPanel extends AppletVie
private PluginBridge bridge = null;
private boolean exitOnFailure = true;
private AppletInstance appInst = null;
- private String cookieStr;
private boolean appletAlive;
public NetxPanel(URL documentURL, Hashtable atts)
@@ -50,11 +49,10 @@ public class NetxPanel extends AppletVie
}
// overloaded constructor, called when initialized via plugin
- public NetxPanel(URL documentURL, String cookieStr, Hashtable atts, boolean exitOnFailure)
+ public NetxPanel(URL documentURL, Hashtable atts, boolean exitOnFailure)
{
this(documentURL, atts);
this.exitOnFailure = exitOnFailure;
- this.cookieStr = cookieStr;
this.appletAlive = true;
}
@@ -64,7 +62,6 @@ public class NetxPanel extends AppletVie
try {
bridge = new PluginBridge(baseURL,
- cookieStr,
getDocumentBase(),
getJarFiles(),
getCode(),
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/Parser.java Thu Jul 09 14:42:44 2009 -0400
@@ -332,7 +332,7 @@ class Parser {
Version version = getVersion(node, "version", null);
URL location = getRequiredURL(node, "href", base);
- ExtensionDesc ext = new ExtensionDesc(name, version, location, null);
+ ExtensionDesc ext = new ExtensionDesc(name, version, location);
Node dload[] = getChildNodes(node, "ext-download");
for (int i=0; i < dload.length; i++) {
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jul 09 14:42:44 2009 -0400
@@ -43,7 +43,7 @@ public class PluginBridge extends JNLPFi
String[] cache_ex_jars = new String[0];
Hashtable atts;
- public PluginBridge(URL codebase, String cookieStr, URL documentBase, String jar, String main,
+ public PluginBridge(URL codebase, URL documentBase, String jar, String main,
int width, int height, Hashtable atts)
throws Exception
{
@@ -104,7 +104,6 @@ public class PluginBridge extends JNLPFi
else
security = null;
- this.cookieStr = cookieStr;
}
public String getTitle()
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Thu Jul 09 14:42:44 2009 -0400
@@ -75,9 +75,9 @@ public class CacheUtil {
* @param version the version, or null
* @return either the location in the cache or the original location
*/
- public static URL getCachedResource(URL location, String cookieStr, Version version, UpdatePolicy policy) {
+ public static URL getCachedResource(URL location, Version version, UpdatePolicy policy) {
ResourceTracker rt = new ResourceTracker();
- rt.addResource(location, cookieStr, version, policy);
+ rt.addResource(location, version, policy);
try {
File f = rt.getCacheFile(location);
return f.toURL();
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/cache/Resource.java
--- a/netx/net/sourceforge/jnlp/cache/Resource.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/cache/Resource.java Thu Jul 09 14:42:44 2009 -0400
@@ -68,9 +68,6 @@ public class Resource {
/** the remote location of the resource */
URL location;
- /** cookie string to send with the resource request */
- String cookieStr;
-
/** the local file downloaded to */
File localFile;
@@ -98,20 +95,19 @@ public class Resource {
/**
* Create a resource.
*/
- private Resource(URL location, String cookieStr, UpdatePolicy updatePolicy, Version requestVersion) {
+ private Resource(URL location, UpdatePolicy updatePolicy, Version requestVersion) {
this.location = location;
this.requestVersion = requestVersion;
this.updatePolicy = updatePolicy;
- this.cookieStr = cookieStr;
}
/**
* Return a shared Resource object representing the given
* location and version.
*/
- public static Resource getResource(URL location, String cookieStr, UpdatePolicy updatePolicy, Version requestVersion) {
+ public static Resource getResource(URL location, UpdatePolicy updatePolicy, Version requestVersion) {
synchronized (resources) {
- Resource resource = new Resource(location, cookieStr, updatePolicy, requestVersion);
+ Resource resource = new Resource(location, updatePolicy, requestVersion);
int index = resources.indexOf(resource);
if (index >= 0) { // return existing object
@@ -132,13 +128,6 @@ public class Resource {
*/
public URL getLocation() {
return location;
- }
-
- /**
- * Returns the cookie string associated with this resource
- */
- public String getCookieStr() {
- return cookieStr;
}
/**
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu Jul 09 14:42:44 2009 -0400
@@ -148,11 +148,11 @@ public class ResourceTracker {
* @param version the resource version
* @param updatePolicy whether to check for updates if already in cache
*/
- public void addResource(URL location, String cookieStr, Version version, UpdatePolicy updatePolicy) {
+ public void addResource(URL location, Version version, UpdatePolicy updatePolicy) {
if (location == null)
throw new IllegalArgumentException("location==null");
- Resource resource = Resource.getResource(location, cookieStr, updatePolicy, version);
+ Resource resource = Resource.getResource(location, updatePolicy, version);
boolean downloaded = false;
synchronized (resources) {
@@ -606,9 +606,6 @@ public class ResourceTracker {
try {
// create out second in case in does not exist
URLConnection con = getVersionedResourceURL(resource).openConnection();
-
- if (resource.getCookieStr() != null && resource.getCookieStr().length() > 0)
- con.setRequestProperty("Cookie", resource.getCookieStr());
InputStream in = new BufferedInputStream(con.getInputStream());
OutputStream out = CacheUtil.getOutputStream(resource.location, resource.downloadVersion);
@@ -657,9 +654,6 @@ public class ResourceTracker {
// connect
URLConnection connection = getVersionedResourceURL(resource).openConnection(); // this won't change so should be okay unsynchronized
-
- if (resource.getCookieStr() != null && resource.getCookieStr().length() > 0)
- connection.setRequestProperty("Cookie", resource.getCookieStr());
int size = connection.getContentLength();
boolean current = CacheUtil.isCurrent(resource.location, resource.requestVersion, connection) && resource.getUpdatePolicy() != UpdatePolicy.FORCE;
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jul 09 14:42:44 2009 -0400
@@ -276,7 +276,7 @@ public final class Boot implements Privi
boolean strict = (null != getOption("-strict"));
- JNLPFile file = new JNLPFile(url, null, strict);
+ JNLPFile file = new JNLPFile(url, strict);
// add in extra params from command line
addProperties(file);
diff -r 559f19ce8d7b -r 544a26bdc6d0 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jul 07 13:44:35 2009 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jul 09 14:42:44 2009 -0400
@@ -234,11 +234,11 @@ public class JNLPClassLoader extends URL
* @param location the file's location
* @param policy the update policy to use when downloading resources
*/
- public static JNLPClassLoader getInstance(URL location, String cookieStr, UpdatePolicy policy) throws IOException, ParseException, LaunchException {
+ public static JNLPClassLoader getInstance(URL location, UpdatePolicy policy) throws IOException, ParseException, LaunchException {
JNLPClassLoader loader = (JNLPClassLoader) urlToLoader.get(location);
if (loader == null)
- loader = getInstance(new JNLPFile(location, cookieStr, false, policy), policy);
+ loader = getInstance(new JNLPFile(location, false, policy), policy);
return loader;
}
@@ -256,7 +256,7 @@ public class JNLPClassLoader extends URL
//if (ext != null) {
for (int i=0; i < ext.length; i++) {
try {
- JNLPClassLoader loader = getInstance(ext[i].getLocation(), ext[i].getCookieStr(), updatePolicy);
+ JNLPClassLoader loader = getInstance(ext[i].getLocation(), updatePolicy);
loaderList.add(loader);
}
catch (Exception ex) {
@@ -314,7 +314,6 @@ public class JNLPClassLoader extends URL
initialJars.add(jars[i]); // regardless of part
tracker.addResource(jars[i].getLocation(),
- file.getCookieStr(),
jars[i].getVersion(),
jars[i].isCacheable() ? JNLPRuntime.getDefaultUpdatePolicy() : UpdatePolicy.FORCE
);
@@ -780,8 +779,7 @@ public class JNLPClassLoader extends URL
available.add(desc);
- tracker.addResource(desc.getLocation(),
- file.getCookieStr(),
+ tracker.addResource(desc.getLocation(),
desc.getVersion(),
JNLPRuntime.getDefaultUpdatePolicy()
);
diff -r 559f19ce8d7b -r 544a26bdc6d0 plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java Tue Jul 07 13:44:35 2009 -0400
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java Thu Jul 09 14:42:44 2009 -0400
@@ -84,6 +84,7 @@ import java.io.PrintStream;
import java.io.PrintStream;
import java.io.Reader;
import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
More information about the distro-pkg-dev
mailing list