/hg/release/icedtea6-1.6: 4 new changesets
cpdev-commits at icedtea.classpath.org
cpdev-commits at icedtea.classpath.org
Tue Aug 25 07:54:58 PDT 2009
changeset da9eb62e065f in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=da9eb62e065f
summary: Port from trunk.
changeset 66cdb266311e in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=66cdb266311e
summary: Import from trunk.
changeset 20cd55dd027f in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=20cd55dd027f
summary: Import from trunk.
changeset 9b85d9f17c40 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=9b85d9f17c40
summary: Import from trunk.
diffstat:
12 files changed, 406 insertions(+), 162 deletions(-)
ChangeLog | 62 ++++++
plugin/icedtea/sun/applet/PluginAppletViewer.java | 4
plugin/icedtea/sun/applet/PluginCookieInfoRequest.java | 48 ----
plugin/icedtea/sun/applet/PluginCookieManager.java | 88 +++++++++
plugin/icedtea/sun/applet/PluginCookieStore.java | 73 -------
plugin/icedtea/sun/applet/PluginMain.java | 4
rt/net/sourceforge/jnlp/JNLPFile.java | 38 +++
rt/net/sourceforge/jnlp/PluginBridge.java | 6
rt/net/sourceforge/jnlp/resources/Messages.properties | 1
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 64 +++++-
rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 83 +++++++-
rt/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 97 ++++++++--
diffs (truncated from 882 to 500 lines):
diff -r 6bec6d168a87 -r 9b85d9f17c40 ChangeLog
--- a/ChangeLog Tue Aug 25 09:27:59 2009 +0100
+++ b/ChangeLog Tue Aug 25 10:58:37 2009 -0400
@@ -1,3 +1,63 @@ 2009-08-25 Edward Nevill <ed at camswl.com
+2009-08-25 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java
+ (handleMessage): Wait until panel is set before pinging it for
+ life status.
+ (showStatus): Replace new lines with spaces, as the status is
+ on a single line anyway.
+
+2009-08-25 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedtea/sun/applet/PluginCookieInfoRequest.java
+ (parseReturn): Store cookie info as a string rather than a list of
+ HttpCookie objects.
+ (getObject): Return the new cookie string.
+ * plugin/icedtea/sun/applet/PluginCookieManager.java: New file, extends
+ CookieManager as is set as the default cookie manager for the plugin.
+ * plugin/icedtea/sun/applet/PluginCookieStore.java : Deleted. New design
+ uses a custom cookiemanager rather than just a custom store.
+ * plugin/icedtea/sun/applet/PluginMain.java
+ (init): Wire in the new cookie manager.
+
+2009-08-25 Deepak Bhole <dbhole at redhat.com>
+
+ * rt/net/sourceforge/jnlp/resources/Messages.properties: Add new
+ message key for CN name mismatches.
+ * rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java
+ (HttpsCertVerifier): Accept new parameters that indicate certificate trust
+ status, CN mismatch status, and the hostname.
+ (getAlreadyTrustPublisher): Use provided isTrusted boolean to get around
+ checkServerTrusted() synchronization.
+ (getDetails): Include details about CN mismatch.
+ (getNamesForCert): New private method. Returns all acceptable names for
+ a given X509Certificate.
+ (R): Overloaded the method to return messages that have 2 variables.
+ * rt/net/sourceforge/jnlp/security/VariableX509TrustManager.java: Extend
+ X509ExtendedTrustManager rather than X509TrustManager.
+ (checkClientTrusted): Overloaded method with one that takes a hostname.
+ (checkServerTrusted): Same. The new overloaded method also checks for CN
+ mismatch if the certificate is not explicitly trusted.
+ (isExplicitlyTrusted): Returns if the given certificate chain is part of
+ the local user trusted DB.
+ (askUser): Change parameters to accept information about trust, host match
+ status, and hostname.
+
+2009-08-25 Deepak Bhole <dbhole at redhat.com>
+
+ * rt/net/sourceforge/jnlp/JNLPFile.java: Add a new key variable that is
+ unique to each instance.
+ (JNLPFile): Existing constructor changed to generate a new key on call.
+ (JNLPFile): New constructor that takes a key. If called, sets the file's
+ key to it.
+ (getUniqueKey): Returns the unique key for the instance.
+ * rt/net/sourceforge/jnlp/PluginBridge.java: Generate new instance
+ specific unique key.
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (getInstance): Use unique instance keys to determine which classloader to
+ use, rather than using the URL.
+ (getInstance): Same.
+ (initializeExtensions): Provide unique key to getInstance.
+
2009-08-25 Edward Nevill <ed at camswl.com>
* cppInterpreter_arm.s
@@ -520,7 +580,7 @@ 2009-07-10 Deepak Bhole <dbhole at redhat
* plugin/icedteanp/IcedTeaNPPlugin.h: New file. Header for
IcedTeaNPPlugin.cc.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: New file. Processes
- plugin data requests from Java side.
+ plugin data requests from Java side.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.h: new file. Header for
IcedTeaPluginRequestProcessor.cc.
* plugin/icedteanp/IcedTeaPluginUtils.cc: New file. Utility functions for
diff -r 6bec6d168a87 -r 9b85d9f17c40 plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java Tue Aug 25 09:27:59 2009 +0100
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java Tue Aug 25 10:58:37 2009 -0400
@@ -589,7 +589,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
// Wait for the panel to initialize
// (happens in a separate thread)
- while ((o = panel.getApplet()) == null && ((NetxPanel) panel).isAlive()) {
+ while (panel == null || (o = panel.getApplet()) == null && ((NetxPanel) panel).isAlive()) {
try {
Thread.sleep(2000);
PluginDebug.debug("Waiting for applet to initialize...");
@@ -876,6 +876,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
public void showStatus(String status) {
try {
// FIXME: change to postCallRequest
+ // For statuses, we cannot have a newline
+ status = status.replace("\n", " ");
write("status " + status);
} catch (IOException exception) {
// Deliberately ignore IOException. showStatus may be
diff -r 6bec6d168a87 -r 9b85d9f17c40 plugin/icedtea/sun/applet/PluginCookieInfoRequest.java
--- a/plugin/icedtea/sun/applet/PluginCookieInfoRequest.java Tue Aug 25 09:27:59 2009 +0100
+++ b/plugin/icedtea/sun/applet/PluginCookieInfoRequest.java Tue Aug 25 10:58:37 2009 -0400
@@ -37,12 +37,6 @@ exception statement from your version. *
package sun.applet;
-import java.net.HttpCookie;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.sun.jndi.toolkit.url.UrlUtil;
/**
* This class represents a request object for cookie information for a given URI
@@ -50,7 +44,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
public class PluginCookieInfoRequest extends PluginCallRequest {
- List<HttpCookie> cookieObjects = new ArrayList<HttpCookie>();
+ String cookieString = new String();
public PluginCookieInfoRequest(String message, String returnString) {
super(message, returnString);
@@ -63,45 +57,11 @@ public class PluginCookieInfoRequest ext
PluginDebug.debug ("PluginCookieInfoRequest GOT: " + cookieInfo);
- String encodedURI = cookieInfo.split(" ")[2];
-
// Skip the first 3 components. We are guaranteed 3 components,
// so no index -1 to worry about
cookieInfo = cookieInfo.substring(cookieInfo.indexOf(' ')+1);
cookieInfo = cookieInfo.substring(cookieInfo.indexOf(' ')+1);
- cookieInfo = cookieInfo.substring(cookieInfo.indexOf(' ')+1);
-
- URI siteURI;
- try
- {
- siteURI = new URI(UrlUtil.decode(encodedURI, "UTF-8"));
- } catch (Exception e)
- {
- e.printStackTrace();
- return;
- }
-
- if (cookieInfo != null && cookieInfo.length() > 0)
- {
- String[] cookies = cookieInfo.split(";");
-
- for (int i = 0; i < cookies.length; i++)
- {
- ArrayList l = new ArrayList();
-
- String cookie = cookies[i];
- cookie = cookie.trim();
- String cookieName = cookie.substring(0, cookie.indexOf("="));
- String cookieValue = cookie.substring(cookie.indexOf("=")+1);
-
- HttpCookie httpCookieObj = new HttpCookie(cookieName, cookieValue);
- httpCookieObj.setPath(siteURI.getPath());
- httpCookieObj.setVersion(0); // force v0
-
- PluginDebug.debug("Adding cookie info COOKIEN=" + cookieName + " and COOKIEV=" + cookieValue);
- cookieObjects.add(httpCookieObj);
- }
- }
+ cookieString = cookieInfo.substring(cookieInfo.indexOf(' ')+1);
setDone(true);
}
@@ -116,7 +76,7 @@ public class PluginCookieInfoRequest ext
return message.startsWith(returnString);
}
- public List<HttpCookie> getObject() {
- return this.cookieObjects;
+ public String getObject() {
+ return this.cookieString;
}
}
diff -r 6bec6d168a87 -r 9b85d9f17c40 plugin/icedtea/sun/applet/PluginCookieManager.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedtea/sun/applet/PluginCookieManager.java Tue Aug 25 10:58:37 2009 -0400
@@ -0,0 +1,88 @@
+/* PluginCookieManager -- Cookie manager for the plugin
+ Copyright (C) 2009 Red Hat
+
+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; either version 2, or (at your option)
+any later version.
+
+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. */
+
+package sun.applet;
+
+import java.io.IOException;
+import java.net.CookieManager;
+import java.net.HttpCookie;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class PluginCookieManager extends CookieManager
+{
+ public Map<String, List<String>> get(URI uri,
+ Map<String, List<String>> requestHeaders) throws IOException {
+ // pre-condition check
+ if (uri == null || requestHeaders == null) {
+ throw new IllegalArgumentException("Argument is null");
+ }
+
+ Map<String, List<String>> cookieMap = new java.util.HashMap<String, List<String>>();
+
+ String cookies = (String) PluginAppletViewer
+ .requestPluginCookieInfo(uri);
+ List<String> cookieHeader = new java.util.ArrayList<String>();
+
+ if (cookies != null && cookies.length() > 0)
+ cookieHeader.add(cookies);
+
+ // Add anything else that mozilla didn't add
+ for (HttpCookie cookie : getCookieStore().get(uri)) {
+ // apply path-matches rule (RFC 2965 sec. 3.3.4)
+ if (pathMatches(uri.getPath(), cookie.getPath())) {
+ cookieHeader.add(cookie.toString());
+ }
+ }
+
+ cookieMap.put("Cookie", cookieHeader);
+ return Collections.unmodifiableMap(cookieMap);
+ }
+
+ private boolean pathMatches(String path, String pathToMatchWith) {
+ if (path == pathToMatchWith)
+ return true;
+ if (path == null || pathToMatchWith == null)
+ return false;
+ if (path.startsWith(pathToMatchWith))
+ return true;
+
+ return false;
+ }
+}
diff -r 6bec6d168a87 -r 9b85d9f17c40 plugin/icedtea/sun/applet/PluginCookieStore.java
--- a/plugin/icedtea/sun/applet/PluginCookieStore.java Tue Aug 25 09:27:59 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/* PluginCookieStore -- Storage for cookie information
- Copyright (C) 2009 Red Hat
-
-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; either version 2, or (at your option)
-any later version.
-
-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. */
-
-package sun.applet;
-
-import java.net.HttpCookie;
-import java.net.URI;
-import java.util.List;
-
-import sun.net.www.protocol.http.InMemoryCookieStore;
-
-public class PluginCookieStore extends InMemoryCookieStore
-{
- public List<HttpCookie> get(URI uri)
- {
- List<HttpCookie> cookies;
-
- // Try to fetch it from the plugin, but if something goes
- // wrong, fall back. Don't crash!
- try
- {
- cookies = (List<HttpCookie>) PluginAppletViewer.requestPluginCookieInfo(uri);
-
- // If cookies is null, something went wrong. Fall back.
- if (cookies == null) throw new NullPointerException("Null cookie");
-
- } catch (Exception e)
- {
- PluginDebug.debug("Unable to fetch cookie information from plugin. " +
- "Falling back to default.");
- e.printStackTrace();
- cookies = super.get(uri);
- }
-
- PluginDebug.debug("Returning cookies " + cookies + " for site: " + uri);
-
- return cookies;
- }
-}
diff -r 6bec6d168a87 -r 9b85d9f17c40 plugin/icedtea/sun/applet/PluginMain.java
--- a/plugin/icedtea/sun/applet/PluginMain.java Tue Aug 25 09:27:59 2009 +0100
+++ b/plugin/icedtea/sun/applet/PluginMain.java Tue Aug 25 10:58:37 2009 -0400
@@ -215,12 +215,12 @@ public class PluginMain
System.err.println("Unable to set SSLSocketfactory (may _prevent_ access to sites that should be trusted)! Continuing anyway...");
e.printStackTrace();
}
-
+
// plug in a custom authenticator and proxy selector
Authenticator.setDefault(new CustomAuthenticator());
ProxySelector.setDefault(new PluginProxySelector());
- CookieManager ckManager = new CookieManager(new PluginCookieStore(), null);
+ CookieManager ckManager = new PluginCookieManager();
CookieHandler.setDefault(ckManager);
}
diff -r 6bec6d168a87 -r 9b85d9f17c40 rt/net/sourceforge/jnlp/JNLPFile.java
--- a/rt/net/sourceforge/jnlp/JNLPFile.java Tue Aug 25 09:27:59 2009 +0100
+++ b/rt/net/sourceforge/jnlp/JNLPFile.java Tue Aug 25 10:58:37 2009 -0400
@@ -23,6 +23,7 @@ import java.net.URL;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -66,6 +67,9 @@ public class JNLPFile {
/** the network location of this JNLP file */
protected URL fileLocation;
+
+ /** A key that uniquely identifies connected instances (main jnlp+ext) */
+ protected String uniqueKey = null;
/** the URL used to resolve relative URLs in the file */
protected URL codeBase;
@@ -171,6 +175,33 @@ public class JNLPFile {
parse(root, strict, location);
this.fileLocation = location;
+
+ this.uniqueKey = Calendar.getInstance().getTimeInMillis() + "-" +
+ Math.abs(((new java.util.Random()).nextInt())) + "-" +
+ location;
+
+ if (JNLPRuntime.isDebug())
+ System.err.println("UNIQUEKEY=" + this.uniqueKey);
+ }
+
+ /**
+ * Create a JNLPFile from a URL, parent URLm a version and checking for
+ * updates using the specified policy.
+ *
+ * @param location the location of the JNLP file
+ * @param uniqueKey A string that uniquely identifies connected instances
+ * @param version the version of the JNLP file
+ * @param strict whether to enforce the spec when
+ * @param policy the update policy
+ * @throws IOException if an IO exception occurred
+ * @throws ParseException if the JNLP file was invalid
+ */
+ public JNLPFile(URL location, String uniqueKey, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
+ this(location, version, strict, policy);
+ this.uniqueKey = uniqueKey;
+
+ if (JNLPRuntime.isDebug())
+ System.err.println("UNIQUEKEY (override) =" + this.uniqueKey);
}
/**
@@ -245,6 +276,13 @@ public class JNLPFile {
*/
public URL getFileLocation() {
return fileLocation;
+ }
+
+ /**
+ * Returns the location of the parent file if it exists, null otherwise
+ */
+ public String getUniqueKey() {
+ return uniqueKey;
}
/**
diff -r 6bec6d168a87 -r 9b85d9f17c40 rt/net/sourceforge/jnlp/PluginBridge.java
--- a/rt/net/sourceforge/jnlp/PluginBridge.java Tue Aug 25 09:27:59 2009 +0100
+++ b/rt/net/sourceforge/jnlp/PluginBridge.java Tue Aug 25 10:58:37 2009 -0400
@@ -24,6 +24,7 @@ package net.sourceforge.jnlp;
import java.net.URL;
import java.net.MalformedURLException;
+import java.util.Calendar;
import java.util.Hashtable;
import java.util.Locale;
import java.util.List;
@@ -103,7 +104,10 @@ public class PluginBridge extends JNLPFi
codebase.getHost());
else
security = null;
-
+
+ this.uniqueKey = Calendar.getInstance().getTimeInMillis() + "-" +
+ Math.abs(((new java.util.Random()).nextInt())) + "-" +
+ documentBase;
}
public String getTitle()
diff -r 6bec6d168a87 -r 9b85d9f17c40 rt/net/sourceforge/jnlp/resources/Messages.properties
--- a/rt/net/sourceforge/jnlp/resources/Messages.properties Tue Aug 25 09:27:59 2009 +0100
+++ b/rt/net/sourceforge/jnlp/resources/Messages.properties Tue Aug 25 10:58:37 2009 -0400
@@ -168,6 +168,7 @@ SNotYetValidCert=Resources contain entri
SNotYetValidCert=Resources contain entries whose signer certificate is not yet valid.
SUntrustedCertificate=The digital signature was generated with an untrusted certificate.
STrustedCertificate=The digital signature was generated with a trusted certificate.
+SCNMisMatch=The expected hostname for this certificate is: "{0}"<BR>The address being connected to is: "{1}"
SRunWithoutRestrictions=This application will be run without the security restrictions normally provided by java.
diff -r 6bec6d168a87 -r 9b85d9f17c40 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Aug 25 09:27:59 2009 +0100
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Aug 25 10:58:37 2009 -0400
@@ -209,21 +209,54 @@ public class JNLPClassLoader extends URL
* @param policy the update policy to use when downloading resources
*/
public static JNLPClassLoader getInstance(JNLPFile file, UpdatePolicy policy) throws LaunchException {
+ JNLPClassLoader baseLoader = null;
JNLPClassLoader loader = null;
- URL location = file.getFileLocation();
-
- if (location != null)
- loader = (JNLPClassLoader) urlToLoader.get(location);
+ String uniqueKey = file.getUniqueKey();
+
+ if (uniqueKey != null)
+ baseLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey);
try {
- if (loader == null)
- loader = new JNLPClassLoader(file, policy);
+
+ // If base loader is null, or the baseloader's file and this
+ // file is different, initialize a new loader
+ if (baseLoader == null ||
+ !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation())) {
+
+ loader = new JNLPClassLoader(file, policy);
+
+ // New loader init may have caused extentions to create a
+ // loader for this unique key. Check.
More information about the distro-pkg-dev
mailing list