/hg/icedtea: 12 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 6 10:36:32 PDT 2009
changeset dfd69fa0c812 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dfd69fa0c812
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Aug 06 10:43:31 2009 -0400
Updates to NP plugin.
- Plugin request processor threads now use condition based wait
rather than periodic polling
- Added support for fetching field information and values, and method
invocation from JS -> Java
- Added support for static calls (e.g. System.out.println(...)) from
JS
- Implented a cost-based overloaded method resolver for when JS calls
an overloaded Java method with ambiguous types.
changeset c1c108662db8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c1c108662db8
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Aug 14 15:58:23 2009 -0400
This commit:
- Reworks memory allocation to make it less leaky by using heap as
little as possible.
- Implements JSObject.call and JSObject.eval which allow invocation
of JavaScript methods, and execution of arbitrary scripts.
Everything except for array types is currently handled.
- Fixes a few new race conditions that surfaced as result of less
messages/faster initialization.
- Starts laying out call security.
- Fixes unicode handling so that UTF-8 is used correctly across the
board.
Most prominently, new sites that now work include:
- Facebook photo uploader
- Yahoo! games applets
- A whole bunch of banking applets
changeset e0f4520ae470 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e0f4520ae470
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Aug 14 15:58:42 2009 -0400
Missed a file. Adding..
changeset d38d3977ca3e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d38d3977ca3e
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 06 18:01:08 2009 +0100
Make child JNLPs use the same classloader as parent for a given
instance.
2009-08-25 Deepak Bhole <dbhole at redhat.com>
* netx/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.
* netx/net/sourceforge/jnlp/PluginBridge.java: Generate new instance
specific unique key.
* netx/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.
changeset dbe859b50636 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dbe859b50636
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 06 18:06:43 2009 +0100
Patch to detect certificate CN mismatches and offer user the choice
to ignore it.
2009-08-25 Deepak Bhole <dbhole at redhat.com>
* netx/net/sourceforge/jnlp/resources/Messages.properties:
Add new message key for CN name mismatches.
* netx/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.
* netx/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.
changeset 47802906c81f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=47802906c81f
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Aug 25 10:30:05 2009 -0400
Use a custom cookie manager rather than just a custom cookiestore.
This allows cookie strings with spaces to return correctly, as
expected by some webservers (e.g. Miniserv from WebMin).
changeset be850f0b74e2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=be850f0b74e2
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Aug 25 10:34:09 2009 -0400
Fix NPE due to race condition when panel is still being initialized
when a request for it comes in.
Remove new-lines from status messages, as status bar is single line.
changeset fbdb1c1ba782 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fbdb1c1ba782
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Aug 25 10:38:03 2009 -0400
Adding/removing files missed in previous commit
changeset 52eee2ca6d37 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=52eee2ca6d37
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Aug 26 01:14:21 2009 -0400
Fix minor logic bug in earlier commit.
changeset 518cf0feb646 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=518cf0feb646
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Aug 26 15:06:47 2009 -0400
- Support for Chromium and Firefox 3.6 A1
- Added object construction support
- Port over cookie/cert cn mismatch/etc. fixes from current plugin
changeset 5edc8307c7ab in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5edc8307c7ab
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Aug 27 13:16:24 2009 -0400
- Fix static instantiation support for xulrunner >= 1.9.2
- Remove JS <-> Class source match check, as NPAPI does not allow
cross-site calls anyway
ChangeLog:
* plugin/icedteanp/IcedTeaNPPlugin.cc (GCJ_New): Use arg count to
determine whether or not a send an applet tag to Java side. Set
a new is_applet_instance variable in GCJPluginData.
(get_scriptable_object): Use the new is_applet_instance variable in
instance->pdata to determine what kind of object to return.
* plugin/icedteanp/IcedTeaNPPlugin.h: Add a new is_applet_instance
bool to GCJPluginData, which determines whether it is an applet
instance or a dummy one.
* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
(checkPermission): Disable js src == class src check, as NPAPI does
not allow cross site scripting.
changeset 5e20e6468dd1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5e20e6468dd1
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Sep 15 12:47:59 2009 -0400
Updates to the new NP plugin:
- Added preliminary array support (get/set from JS->Java)
- Fixed some timing issues to make plugin faster
- Implemented object resuse so that comparison of Java objects on JS
side works
* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
(newMessageOnBus): Handle certain callbacks in a more uniform
manner. (postAndWaitForResponse): Lower poll time to 200 us for
more responsiveness. (findClass): Accept instance ID which
is used for searching classes in specific applet instance
classloaders. (getArrayLength): New function. Returns length of
an array on Java side. (getSlot): New function. Returns element
at requested index in an array. (setSlot): New function. Sets
requested index in array to supplied value. (getField): Accept
object id. (getStaticField): Fix parameter ordering for
consistency. (set): New function. Sets Java side fields to given
value. (setStaticField): New function. Sets value of a static
field in a Java object. (setField): New function. Sets value
of a static field in a class. (createJavaObjectFromVariant):
Handle void and null variants. Handle case where object is
already created. (call): Use a string to store object id.
(newObject): Same. (hasPackage): Accept instance id and pass it
on.
* plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Relevant changes as
needed by the updates to the .cc file.
* plugin/icedteanp/IcedTeaNPPlugin.cc (get_scriptable_object):
Pass false for the new isArray arg to
get_scriptable_java_object.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Pass 0 as the
instance id to all findClass calls.
* plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Reuse Java object
pointers. (IcedTeaScriptableJavaPackageObject::hasProperty):
Pass the instance id to findClass.
(get_scriptable_java_object): Update code so that Java object
pointers can be reused.
(IcedTeaScriptableJavaObject::setIsArray): New function. Sets if
this object represents an array.
(IcedTeaScriptableJavaObject::getIsArray): New function. Returns if
this object represents an array.
(IcedTeaScriptableJavaObject::hasMethod): Bypass "array indexes"
passed to the method.
(IcedTeaScriptableJavaObject::javaResultToNPVariant): Handle void
and null values correctly. Handle array objects.
(IcedTeaScriptableJavaObject::invoke): Set exceptions in JS engine
if one occurred on Java side.
(IcedTeaScriptableJavaObject::hasProperty): Handle array length and
index properties.
(IcedTeaScriptableJavaObject::getProperty): Same.
(IcedTeaScriptableJavaObject::setProperty): Add support for setting
array index values.
* plugin/icedteanp/IcedTeaScriptablePluginObject.h: Changes as
necessitated by changes to the .cc file.
* plugin/icedteanp/java/sun/applet/JavaConsole.java: Handle changed
API in PluginAppletSecurityContext.
* plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
(getMatchingMethod): Handle un-castable/deferred casts.
(getMatchingConstructor): Same. (getNum): Fix handling for
characters.
* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
(associateInstance): New function. Associated a loader with an
instance. (getLoaderInfo): New function. Returns loader info in
a map. (handleMessage): Look for class in instance specific
loaders as well. Handle float/double precision upto 308 (E308 is
max for double).
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
(AppletEventListener::appletStateChanged): Fix race condition during
initialization. (handleMessage): Fix race condition to handle
GetJavaObject calls when panel is still being initialized.
diffstat:
35 files changed, 5123 insertions(+), 1322 deletions(-)
ChangeLog | 385 +++
netx/net/sourceforge/jnlp/JNLPFile.java | 38
netx/net/sourceforge/jnlp/PluginBridge.java | 6
netx/net/sourceforge/jnlp/resources/Messages.properties | 1
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 52
netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 83
netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 97
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
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 999 +++++++++-
plugin/icedteanp/IcedTeaJavaRequestProcessor.h | 131 +
plugin/icedteanp/IcedTeaNPPlugin.cc | 498 ++--
plugin/icedteanp/IcedTeaNPPlugin.h | 46
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 958 ++++++---
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 38
plugin/icedteanp/IcedTeaPluginUtils.cc | 238 +-
plugin/icedteanp/IcedTeaPluginUtils.h | 48
plugin/icedteanp/IcedTeaRunnable.cc | 3
plugin/icedteanp/IcedTeaRunnable.h | 6
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 807 ++++++++
plugin/icedteanp/IcedTeaScriptablePluginObject.h | 125 +
plugin/icedteanp/java/netscape/javascript/JSObject.java | 37
plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java | 47
plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 7
plugin/icedteanp/java/sun/applet/JavaConsole.java | 8
plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java | 591 +++++
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 648 +++---
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 118 -
plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 48
plugin/icedteanp/java/sun/applet/PluginCookieManager.java | 88
plugin/icedteanp/java/sun/applet/PluginCookieStore.java | 73
plugin/icedteanp/java/sun/applet/PluginMain.java | 4
diffs (truncated from 8456 to 500 lines):
diff -r 34fd2f476040 -r 5e20e6468dd1 ChangeLog
--- a/ChangeLog Fri Oct 02 21:34:18 2009 +0100
+++ b/ChangeLog Tue Sep 15 12:47:59 2009 -0400
@@ -1,3 +1,370 @@ 2009-10-02 Andrew John Hughes <ahughes
+2009-09-15 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+ (newMessageOnBus): Handle certain callbacks in a more uniform manner.
+ (postAndWaitForResponse): Lower poll time to 200 us for more
+ responsiveness.
+ (findClass): Accept instance ID which is used for searching classes in
+ specific applet instance classloaders.
+ (getArrayLength): New function. Returns length of an array on Java side.
+ (getSlot): New function. Returns element at requested index in an array.
+ (setSlot): New function. Sets requested index in array to supplied value.
+ (getField): Accept object id.
+ (getStaticField): Fix parameter ordering for consistency.
+ (set): New function. Sets Java side fields to given value.
+ (setStaticField): New function. Sets value of a static field in a Java
+ object.
+ (setField): New function. Sets value of a static field in a class.
+ (createJavaObjectFromVariant): Handle void and null variants. Handle case
+ where object is already created.
+ (call): Use a string to store object id.
+ (newObject): Same.
+ (hasPackage): Accept instance id and pass it on.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Relevant changes as
+ needed by the updates to the .cc file.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (get_scriptable_object): Pass false for the new isArray arg to
+ get_scriptable_java_object.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Pass 0 as the
+ instance id to all findClass calls.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Reuse Java object
+ pointers.
+ (IcedTeaScriptableJavaPackageObject::hasProperty): Pass the instance id to
+ findClass.
+ (get_scriptable_java_object): Update code so that Java object pointers can
+ be reused.
+ (IcedTeaScriptableJavaObject::setIsArray): New function. Sets if this object
+ represents an array.
+ (IcedTeaScriptableJavaObject::getIsArray): New function. Returns if this
+ object represents an array.
+ (IcedTeaScriptableJavaObject::hasMethod): Bypass "array indexes" passed to
+ the method.
+ (IcedTeaScriptableJavaObject::javaResultToNPVariant): Handle void and null
+ values correctly. Handle array objects.
+ (IcedTeaScriptableJavaObject::invoke): Set exceptions in JS engine if one
+ occurred on Java side.
+ (IcedTeaScriptableJavaObject::hasProperty): Handle array length and index
+ properties.
+ (IcedTeaScriptableJavaObject::getProperty): Same.
+ (IcedTeaScriptableJavaObject::setProperty): Add support for setting array
+ index values.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Changes as
+ necessitated by changes to the .cc file.
+ * plugin/icedteanp/java/sun/applet/JavaConsole.java: Handle changed API in
+ PluginAppletSecurityContext.
+ * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
+ (getMatchingMethod): Handle un-castable/deferred casts.
+ (getMatchingConstructor): Same.
+ (getNum): Fix handling for characters.
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+ (associateInstance): New function. Associated a loader with an instance.
+ (getLoaderInfo): New function. Returns loader info in a map.
+ (handleMessage): Look for class in instance specific loaders as well.
+ Handle float/double precision upto 308 (E308 is max for double).
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (AppletEventListener::appletStateChanged): Fix race condition during
+ initialization.
+ (handleMessage): Fix race condition to handle GetJavaObject calls when
+ panel is still being initialized.
+
+2009-08-27 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (GCJ_New): Use arg count to determine whether or not a send an applet tag
+ to Java side. Set a new is_applet_instance variable in GCJPluginData.
+ (get_scriptable_object): Use the new is_applet_instance variable in
+ instance->pdata to determine what kind of object to return.
+ * plugin/icedteanp/IcedTeaNPPlugin.h: Add a new is_applet_instance bool to
+ GCJPluginData, which determines whether it is an applet instance or a
+ dummy one.
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+ (checkPermission): Disable js src == class src check, as NPAPI does not
+ allow cross site scripting.
+
+2009-08-26 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+ (createJavaObjectFromVariant): Add conditional compilation blocks to
+ handle new API along with old. Call renamed newObjectWithConstructor
+ function.
+ (newObject): New function. Creates an object based on the most optimum
+ cost with arbitrary arguments.
+ (newObjectWithConstructor): Renamed from newObject(). Also, take source as
+ an argument to provide to Java.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Change as per above .cc
+ file changes.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Include XPCOM specific headers only
+ if xulrunner version is < 1.9.2. Instantiate internal Mozilla objects only
+ if xulrunner < 1.9.2.
+ (GCJ_New): Correctly account for documentbase length when allocating tag
+ memory to prevent corruption.
+ (GCJ_Destroy): Remove old instance mappings when destroyed.
+ (GCJ_GetJavaClass): Remove unused method.
+ (get_cookie_info): Change object signature to include length result. Based
+ on xulrunner version, either use internal Mozilla API for fetching cookie
+ info, or use NPN_GetValueForURL.
+ (plugin_get_documentbase): Define for when xulrunner is >= 1.9.2.
+ (consume_message): Deal with single proxy URL rather than components.
+ Update to handle when xulrunner is >= 1.9.2
+ (get_proxy_info): Change signature to deal with single url rather than
+ components. Use NPN_GetValueForURL if xulrunner is >= 1.9.2.
+ (NP_Initialize): Add pointers for getvalueforurl and setvalueforurl in the
+ NPPluginFuncs table. Also, handle case for when browser provides the
+ plugin .so name as the link location rather than target location.
+ * plugin/icedteanp/IcedTeaNPPlugin.h: Include XPCOM specific headers only
+ if xulrunner version is < 1.9.2.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (eval): Use the new NPN_PluginThreadAsynCcall function to dispatch events
+ to main thread asynchronously.
+ (call): Same.
+ (setMember): Same.
+ (getMember): Same.
+ (storeVariantInJava): Handle changed API when xulrunner >= 1.9.2
+ (_setMember): Account for changes in the way that the callerpacks
+ arguments.
+ (_getMember): Same.
+ (_call): Same.
+ (_eval): Same.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Include Mozilla
+ specific headers only if xulrunner is < 1.9.2. Remove old ThreadData
+ struct and add new AyncCallThreadData struct that contains results and
+ arguments.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc
+ (getSourceFromInstance): Provide null source location due to lack of a
+ secure way to get documentbase.
+ (printNPVariant): Account for change API in xulrunner 1.9.2.
+ (NPVariantToString): Same.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Include Mozilla specific headers
+ only if xulrunner is < 1.9.2.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc
+ (invoke): Pass exception over to JS engine.
+ (construct): Implement object construction.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Include Mozilla
+ specific headers only if xulrunner is < 1.9.2.
+ * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
+ (getMatchingConstructor): New method, returns a matching constructor based
+ on arguments.
+ (getMatchingConstructors): New helper method for getMatchingConstructor.
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+ (handleMessage): Handle new type of call, "NewObjectWithConstructor".
+ (checkPermission): Disable checks for the time being, as NPRuntime does
+ not allow cross-site calling anyway.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (setStatus): Remove newlines from status messages.
+ * plugin/icedteanp/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/icedteanp/sun/applet/PluginCookieManager.java: New file, extends
+ CookieManager as is set as the default cookie manager for the plugin.
+ * plugin/icedteanp/sun/applet/PluginCookieStore.java : Deleted. New design
+ uses a custom cookiemanager rather than just a custom store.
+ * plugin/icedteanp/sun/applet/PluginMain.java
+ (init): Wire in the new cookie manager.
+
+2009-08-26 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java
+ (handleMessage): Fix logic bug introduced in previous commit.
+
+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>
+
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: Add new
+ message key for CN name mismatches.
+ * netx/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.
+ * netx/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>
+
+ * netx/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.
+ * netx/net/sourceforge/jnlp/PluginBridge.java: Generate new instance
+ specific unique key.
+ * netx/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-14 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+ (newMessageOnBus): Handle additional request types.
+ (postAndWaitForResponse): Modify parameter type and reset the result
+ before proceeding.
+ (getToStringValue): Remove all heap allocations and allocate on stack.
+ (getString): Same.
+ (deleteReference): Same.
+ (addReference): Same.
+ (findClass): Same.
+ (getClassName): Same.
+ (getClassID): Same.
+ (getFieldID): Same.
+ (getStaticFieldID): Same.
+ (getField): Same. Also, send the source to Java side.
+ (getStaticField): Same.
+ (getMethodID): Remove all heap allocations and allocate on stack.
+ (getStaticMethodID): Same.
+ (callStaticMethod): Same. Also, send the source to Java side.
+ (callMethod): Same.
+ (call): Same.
+ (getObjectClass): Remove all heap allocations and allocate on stack.
+ (newObject): Same. Also, send the source to Java side.
+ (newString): Remove all heap allocations and allocate on stack.
+ (hasPackage): Same.
+ (hasMethod): Same.
+ (hasField): Same.
+ (isInstanceOf): New method.
+ (getAppletObjectInstance): Remove all heap allocations and allocate on
+ stack.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Bump timeout to 120 to
+ allow for slower connections. Other misc. changes related to the .cc file
+ changes.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Moved GCJPluginData decleration to
+ the header file. Don't initialize message bus and request processors
+ statically.
+ (GCJ_New): Initialize the buses and processors. Store source url in plugin
+ data struct.
+ (GCJ_Destroy): Cleanup source url pointer.
+ * plugin/icedteanp/IcedTeaNPPlugin.h: Moved GCJPluginData struct
+ decleration to here.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (getInstanceFromMemberPtr): Moved to plugin utils.
+ (storeInstanceID): Same.
+ (newMessageOnBus): Handle additional request types.
+ (dispatch): Remove unused method.
+ (sendWindow): Remove unnecessary heap allocations and use function stack
+ instead.
+ (eval): New function. Evaluates calls to JavaScript functions and returns
+ the result. Arrays are not yet handled.
+ (call): New function. Evaluates the given script and returns the result.
+ Arrays are not yet handled.
+ (sendString): Remove unnecessary heap allocations and use function stack
+ instead.
+ (setMember): Same.
+ (convertToNPVariant): New function. Narrows given java type to an
+ NPVariant as per type conversion specifications.
+ (sendMember): Remove unnecessary heap allocations and use function stack
+ instead.
+ (storeVariantInJava): New function. Given an NPVariant, does the
+ appropriate conversion and saves it on the Java side. Arrays are not yet
+ handled.
+ (_eval): New function. Evaluates the script via NPN_Evaluate. Meant to be
+ run in the main thread.
+ (_call): New function. Invokes the function via NPN_Invoke. Meant to be run
+ in the main thread.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Appropriate changes as
+ necessitated by the above changes in the .cc.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc
+ (constructMessagePrefix): All versions of this functions changed to remove
+ heap allocation, and instead store result in a given pre-allocated parameter.
+ (getReference): Use an ever growing reference number, and cycle when
+ integer max approaches.
+ (releaseReference): Remove code so nothing is done for now.
+ (itoa): Store result in pre-allocated parameter, rather than on heap.
+ (getSourceFromInstance): Given an NPP instance, returns the assocated
+ source.
+ (storeInstanceID): Moved from IcedTeaPluginRequestProcessor. Associates an
+ NPObject with an instance.
+ (getInstanceFromMemberPtr): Moved from IcedTeaPluginRequestProcessor.
+ Given an NPObject, returns the associated instance.
+ (variantToClassName): Remove unused method.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Appropriate changes as necessitated
+ by the above changes in the .cc.
+ * plugin/icedteanp/IcedTeaRunnable.cc (IcedTeaRunnableMethod): Change
+ result parameter type to void* so that caller/callee can use variable
+ formats.
+ * plugin/icedteanp/IcedTeaRunnable.h: Appropriate changes as necessitated
+ by the above changes in the .cc.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Call storeInstanceID
+ and getInstanceFromMemberPtr from plugin utils.
+ (IcedTeaScriptableJavaObject::getProperty): Get the source url and send it to
+ Java side when making the request.
+ (IcedTeaScriptableJavaObject::invoke): Same.
+ * plugin/icedteanp/java/netscape/javascript/JSObject.java: Merge
+ constructor access control fixes from older plugin.
+ * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java: Handle
+ void and null return types.
+ * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java: Add an
+ additional test case for Boolean.
+ (getPrimitive): Handle java.lang.Boolean (minor bug fix).
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java: Use
+ URLs when comparing source locations for security verification, rather
+ than String which return false negatives.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (handleMessage): Set status to ACTIVE only after initialization finishes.
+ (AppletEventListener::appletStateChanged): Same.
+ * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java
+ (parseReturn): Handle improper cookies from firefox.
+
+2009-08-06 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Handle error messages
+ from Java side. Add referencing/de-referencing support, and support for
+ fetching fields, invoking methods, and returning applet instances.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Decrease timeout to 20
+ seconds. Declare new functions created in the associated .cc file.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Add support for dynamic NPObject
+ creation per instance. Add a new global pthread_cond_t for message
+ availability.
+ * plugin/icedteanp/IcedTeaNPPlugin.h: Misc. changes related to the above
+ associated file.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Use condition based
+ wait for message availability, rather than periodic poll.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Make
+ getInstanceFromMemberPtr and storeInstanceID global.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: Force use of file:// src until
+ security subsystem is implemented.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Created skeletons for
+ Java and JavaPackage NPObjects, and implemented hasProperty, hasMethod,
+ getProperty and getMethod.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Appropriate header
+ changes associated with the above.
+ * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java: New file.
+ Uses a cost-based approach to resolve overloaded methods when JavaScript
+ calls Java methods with potentially ambiguous type arguments.
+
2009-10-02 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
@@ -13,7 +380,7 @@ 2009-10-02 Andrew John Hughes <ahughes
readded during the reorganisation.
Shift BOOTSTRAPPING conditional to top
with other conditionals.
-
+
2009-10-02 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
@@ -26,7 +393,7 @@ 2009-10-01 Andrew John Hughes <ahughes
* NEWS:
Updated with Makefile changes.
-
+
2009-10-01 Andrew John Hughes <ahughes at redhat.com>
Reorganise Makefile and rename some
@@ -186,7 +553,7 @@ 2009-09-23 Jon VanAlten <jon.vanalten@
2009-09-23 Jon VanAlten <jon.vanalten at redhat.com>
* Makefile.am:
- Build PulseAudio class files into distinct subdirectory.
+ Build PulseAudio class files into distinct subdirectory.
2009-09-04 Andrew John Hughes <ahughes at redhat.com>
@@ -288,12 +655,12 @@ 2009-08-06 Andrew John Hughes <ahughes
* Makefile.am:
Bump to b67.
-
+
2009-08-06 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Allow passing
as environment.
-
+
2009-08-06 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ICEDTEA_PATCHES): Make $(DISTRIBUTION_PATCHES) the
@@ -350,7 +717,7 @@ 2009-08-04 Andrew John Hughes <ahughes
* Makefile.am:
Remove IcedTeaNPPlugin.cc from EXTRA_DIST
as now under plugin directory tree.
-
+
2009-08-04 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
@@ -428,7 +795,7 @@ 2009-08-04 Andrew John Hughes <ahughes
* patches/icedtea-webstart.patch,
* patches/icedtea-liveconnect.patch:
Recreated against OpenJDK7.
-
+
2009-06-05 Omair Majid <omajid at redhat.com>
* patches/icedtea-webstart.patch: Make javax.jnlp package visible to
@@ -458,10 +825,10 @@ 2009-07-29 Omair Majid <omajid at redhat.
(checkAccess): New function.
(checkAccess): Add a new argument app.
* netx/net/sourceforge/jnlp/services/SingleInstanceLock.java
- (getLockFileName): Call FileUtils.sanitizeFileName to sanitize the
+ (getLockFileName): Call FileUtils.sanitizeFileName to sanitize the
filename.
* netx/net/sourceforge/jnlp/util/FileUtils.java: New file.
- * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: New file.
+ * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: New file.
2009-07-29 Omair Majid <omajid at redhat.com>
diff -r 34fd2f476040 -r 5e20e6468dd1 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Fri Oct 02 21:34:18 2009 +0100
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Tue Sep 15 12:47:59 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);
}
More information about the distro-pkg-dev
mailing list