/hg/icedtea6: - Fix static instantiation support for xulrunner >...
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Thu Aug 27 10:12:20 PDT 2009
changeset c2ab93e26ed7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c2ab93e26ed7
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.
diffstat:
4 files changed, 35 insertions(+), 39 deletions(-)
ChangeLog | 14 ++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 31 +++++-----
plugin/icedteanp/IcedTeaNPPlugin.h | 2
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 27 --------
diffs (146 lines):
diff -r be41014d9d9b -r c2ab93e26ed7 ChangeLog
--- a/ChangeLog Thu Aug 27 17:48:27 2009 +0200
+++ b/ChangeLog Thu Aug 27 13:16:24 2009 -0400
@@ -1,3 +1,17 @@ 2009-08-27 Kees Cook <kees at canonical.co
+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-27 Kees Cook <kees at canonical.com>
* patches/hotspot/default/icedtea-gcc-stack-markings.patch: New.
diff -r be41014d9d9b -r c2ab93e26ed7 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Aug 27 17:48:27 2009 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Aug 27 13:16:24 2009 -0400
@@ -334,11 +334,8 @@ GCJ_New (NPMIMEType pluginType, NPP inst
// Documentbase retrieval.
documentbase = plugin_get_documentbase (instance);
- if (documentbase)
- {
- // => dummy plugin instantiation
-
-
+ if (documentbase && argc != 0)
+ {
// Send applet tag message to appletviewer.
applet_tag = plugin_create_applet_tag (argc, argn, argv);
@@ -347,6 +344,13 @@ GCJ_New (NPMIMEType pluginType, NPP inst
//plugin_send_message_to_appletviewer (data, data->instance_string);
plugin_send_message_to_appletviewer (tag_message);
+
+ data->is_applet_instance = true;
+ }
+
+ if (argc == 0)
+ {
+ data->is_applet_instance = false;
}
g_mutex_unlock (data->appletviewer_mutex);
@@ -1979,8 +1983,6 @@ NP_Initialize (NPNetscapeFuncs* browserT
filename[filename_size] = '\0';
}
- printf("FILENAME=%s\n", filename);
-
if (!filename)
{
PLUGIN_ERROR ("Failed to create plugin shared object filename.");
@@ -2205,15 +2207,10 @@ NPObject*
NPObject*
get_scriptable_object(NPP instance)
{
-
- printf("Calling plugin_get_documentbase\n");
- gchar* document_base = plugin_get_documentbase(instance);
NPObject* obj;
-
- if (!document_base) // dummy instance/package?
- {
- obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(instance, "");
- } else
+ GCJPluginData* data = (GCJPluginData*) instance->pdata;
+
+ if (data->is_applet_instance) // dummy instance/package?
{
JavaRequestProcessor java_request = JavaRequestProcessor();
JavaResultData* java_result;
@@ -2246,6 +2243,10 @@ get_scriptable_object(NPP instance)
applet_class_id.append(*(java_result->return_string));
obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(instance, applet_class_id, instance_id);
+
+ } else
+ {
+ obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(instance, "");
}
return obj;
diff -r be41014d9d9b -r c2ab93e26ed7 plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h Thu Aug 27 17:48:27 2009 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h Thu Aug 27 13:16:24 2009 -0400
@@ -84,6 +84,8 @@ struct GCJPluginData
guint32 window_height;
// The source location for this instance
gchar* source;
+ // If this is an actual applet instance, or a dummy instance for static calls
+ bool is_applet_instance;
};
// Queue processing threads
diff -r be41014d9d9b -r c2ab93e26ed7 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Thu Aug 27 17:48:27 2009 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Thu Aug 27 13:16:24 2009 -0400
@@ -1122,36 +1122,15 @@ public class PluginAppletSecurityContext
/**
* Checks if the calling script is allowed to access the specified class
*
- * See http://java.sun.com/j2se/1.3/docs/guide/plugin/security.html#liveconnect for details
- *
* @param jsSrc The source of the script
* @param target The target class that the script is trying to access
* @param acc AccessControlContext for this execution
* @throws AccessControlException If the script has insufficient permissions
*/
public void checkPermission(String jsSrc, Class target, AccessControlContext acc) throws AccessControlException {
-
- // target classloader == null => primordial loader. Allow this.
- if (target.getClassLoader() == null)
- return;
-
- URL classSrcURL = this.classLoaders.get(target.getClassLoader());
- URL jsSrcURL = null;
- try {
- jsSrcURL = new URL(jsSrc);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- PluginDebug.debug("target = " + target + " jsSrc=" + jsSrc + " classSrc=" + classSrcURL);
-
- // NPRuntime does not allow cross-site calling. The code below is kept
- // in case that changes in the future..
-
- // if src is not a file and class loader does not map to the same base, UniversalBrowserRead (BrowserReadPermission) must be set
- //if (!jsSrc.equals("file://") && !jsSrc.equals("[System]") && !classSrcURL.equals(jsSrcURL)) {
- // acc.checkPermission(new BrowserReadPermission());
- //}
+ // NPRuntime does not allow cross-site calling. We therefore always
+ // allow this, for the time being
+ return;
}
private void write(int reference, String message) {
More information about the distro-pkg-dev
mailing list