Changeset 626

Timestamp:

01/19/08 14:26:38 (11 months ago)

Author:

boo..@youngpup.net

Message:

Update to simplify and tighten Anthony's unsafeWindow patch. Moving GM_apiLeak
into greasemonkey.js allows us to restrict to just one file:// URL and all
chrome:// URLs.

Files:

• trunk/src/chrome/chromeFiles/content/menucommander.js (modified) (1 diff)
• trunk/src/chrome/chromeFiles/content/utils.js (modified) (1 diff)
• trunk/src/components/greasemonkey.js (modified) (2 diffs)

trunk/src/chrome/chromeFiles/content/menucommander.js

@@ -20 +20 @@
-GM_MenuCommander.prototype.registerMenuCommand =
-  function(commandName, commandFunc, accelKey, accelModifiers, accessKey) {
-    GM_apiLeakCheck();
-
-    GM_log("> GM_MenuCommander.registerMenuCommand");
-

trunk/src/chrome/chromeFiles/content/utils.js

@@ -6 +6 @@
-var GM_consoleService = Components.classes["@mozilla.org/consoleservice;1"]
-                        .getService(Components.interfaces.nsIConsoleService);
-
-function GM_apiLeakCheck() {
-  var stack = Components.stack;
-
-  do {
-    if (2 == stack.language) {
-      if ('file' != stack.filename.substr(0, 4) &&
-          'chrome' != stack.filename.substr(0, 6)) {
-        throw new Error("Greasemonkey access violation");
-      }
-    }
-
-    stack = stack.caller;
-  } while (stack);
-};
-
-function GM_isDef(thing) {

trunk/src/components/greasemonkey.js

@@ -13 +13 @@
-    .getService(Ci.nsIPromptService)
-    .alert(null, "Greasemonkey alert", msg);
+};
+
+// Examines the stack to determine if an API should be callable.
+// NOTE: This function's mechanism relies on the fact that it is implemented
+// in this file.
+function GM_apiLeakCheck() {
+  var stack = Components.stack;
+  var gmSvcFilename = stack.filename;
+
+  do {
+    // Valid stack frames for GM api calls are: native and js when coming from
+    // chrome:// URLs and the greasemonkey.js component's file:// URL.
+    if (2 == stack.language) {
+      if ('chrome' != stack.filename.substr(0, 6) &&
+          gmSvcFilename != stack.filename) {
+        throw new Error("Greasemonkey access violation");
+      }
+    }
+
+    stack = stack.caller;
+  } while (stack);
-};
-
@@ -314 +335 @@
-  registerMenuCommand: function(unsafeContentWin, commandName, commandFunc,
-                                accelKey, accelModifiers, accessKey) {
+    GM_apiLeakCheck();
+
-    var command = {name: commandName,
-                   accelKey: accelKey,