From 37f676efc43b73f5a46c5f4fada4cf1f42da56a8 Mon Sep 17 00:00:00 2001
From: Adam Domurad <adomurad@redhat.com>
Date: Tue, 15 Jan 2013 14:34:47 -0500
Subject: Fix for PR1198: JSObject passed incorrectly to Javascript
---
.../java/netscape/javascript/JSObject.java | 10 +++++
.../javascript/JSObjectUnboxPermission.java | 49 ++++++++++++++++++++++
.../icedteanp/java/netscape/javascript/JSUtil.java | 14 ++++++-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 plugin/icedteanp/java/netscape/javascript/JSObjectUnboxPermission.java
(limited to 'plugin/icedteanp/java/netscape')
diff --git a/plugin/icedteanp/java/netscape/javascript/JSObject.java b/plugin/icedteanp/java/netscape/javascript/JSObject.java
index 0de500f..489efa6 100644
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java
@@ -99,6 +99,16 @@ public final class JSObject {
PluginDebug.debug("JSObject INITIALIZER");
}
+ /**
+ * Package-private method used through JSUtil#getJSObjectInternalReference.
+ * We make this package-private to avoid polluting the public interface.
+ * @return the internal identifier
+ */
+ long getInternalReference() {
+ AccessController.getContext().checkPermission(new JSObjectUnboxPermission());
+ return internal;
+ }
+
/**
* it is illegal to construct a JSObject manually
*/
diff --git a/plugin/icedteanp/java/netscape/javascript/JSObjectUnboxPermission.java b/plugin/icedteanp/java/netscape/javascript/JSObjectUnboxPermission.java
new file mode 100644
index 0000000..724ddb3
--- /dev/null
+++ b/plugin/icedteanp/java/netscape/javascript/JSObjectUnboxPermission.java
@@ -0,0 +1,49 @@
+/* JSObjectUnboxPermission.java
+ Copyright (C) 2012 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 netscape.javascript;
+
+import java.security.BasicPermission;
+
+/**
+ * Permission to access internal reference of JSObject
+ */
+public class JSObjectUnboxPermission extends BasicPermission {
+ public JSObjectUnboxPermission() {
+ super("JSObjectUnbox");
+ }
+}
diff --git a/plugin/icedteanp/java/netscape/javascript/JSUtil.java b/plugin/icedteanp/java/netscape/javascript/JSUtil.java
index 14dfda0..8e841fc 100644
--- a/plugin/icedteanp/java/netscape/javascript/JSUtil.java
+++ b/plugin/icedteanp/java/netscape/javascript/JSUtil.java
@@ -57,4 +57,16 @@ public class JSUtil {
return captureStream.toString();
}
-}
+
+ /**
+ * Uses package-private method JSObject.getInternalReference.
+ * This is package-private to avoid polluting the public interface.
+ * @param js JSObject to unbox
+ * @return the internal reference stored by the JSObject
+ */
+ public static long getJSObjectInternalReference(JSObject js) {
+ // NB: permission is checked in JSObject
+ return js.getInternalReference();
+ }
+
+}
\ No newline at end of file
--
cgit v1.2.3