Bug 370765 - remove webPanelSecurityCheck from contentAreaUtils. r=gavin

browser/base/content/browser.js

@@ -4416,8 +4416,6 @@ function asyncOpenWebPanel(event)
        // XXX Now that markLinkVisited is gone, we may not need to field _main and
        // _content here.
        target = wrapper.getAttribute("target");
-       var docWrapper = wrapper.ownerDocument;
-       var locWrapper = docWrapper.location;
        if (fieldNormalClicks &&
            (!target || target == "_content" || target  == "_main"))
          // IE uses _main, SeaMonkey uses _content, we support both
@@ -4433,8 +4431,12 @@ function asyncOpenWebPanel(event)
          if (wrapper.href.substr(0, 5) === "data:")
            return true;
 
-         if (!webPanelSecurityCheck(locWrapper.href, wrapper.href))
+         try {
+           urlSecurityCheck(wrapper.href, wrapper.ownerDocument.nodePrincipal);
+         }
+         catch(ex) {
            return false;
+         } 
 
          var postData = { };
          var url = getShortcutOrURI(wrapper.href, postData);
@@ -4466,17 +4468,17 @@ function asyncOpenWebPanel(event)
          // Used in WinIE as a way of transiently loading pages in a sidebar.  We
          // mimic that WinIE functionality here and also load the page transiently.
 
-         // javascript links targeting the sidebar shouldn't be allowed
-         // we copied this from IE, and IE blocks this completely
-         if (wrapper.href.substr(0, 11) === "javascript:")
-           return false;
-
-         // data: URIs are just as dangerous
-         if (wrapper.href.substr(0, 5) === "data:")
-           return false;
-
-         if (!webPanelSecurityCheck(locWrapper.href, wrapper.href))
+         // DISALLOW_INHERIT_PRINCIPAL is used here in order to also
+         // block javascript and data: links targeting the sidebar.
+         try {
+           const nsIScriptSecurityMan = Ci.nsIScriptSecurityManager;
+           urlSecurityCheck(wrapper.href,
+                            wrapper.ownerDocument.nodePrincipal,
+                            nsIScriptSecurityMan.DISALLOW_INHERIT_PRINCIPAL);
+         }
+         catch(ex) {
            return false;
+         } 
 
          openWebPanel(gNavigatorBundle.getString("webPanels"), wrapper.href);
          event.preventDefault();

toolkit/content/contentAreaUtils.js

@@ -68,23 +68,11 @@ function urlSecurityCheck(aURL, aPrincipal, aFlags)
     else
       secMan.checkLoadURIStrWithPrincipal(aPrincipal, aURL, aFlags);
   } catch (e) {
-    // XXXmano: dump the prinicipal url here too
+    // XXXmano: dump the principal url here too
     throw "Load of " + aURL + " denied.";
   }
 }
 
-function webPanelSecurityCheck(aSourceURL, aDestURL) {
-  const nsIScriptSecurityManager = Components.interfaces.nsIScriptSecurityManager;
-  var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
-                         .getService(nsIScriptSecurityManager);
-  try {
-    secMan.checkLoadURIStr(aSourceURL, aDestURL, nsIScriptSecurityManager.STANDARD);
-  } catch (e) {
-    return false;
-  }
-  return true;
-}
-
 function isContentFrame(aFocusedWindow)
 {
   if (!aFocusedWindow)