Issue 3486 - Issue reporter: remove content window access

chrome/content/ui/sendReport.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus 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 Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //
 // Report data template, more data will be added during data collection
 //
 
 let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 let {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
 
 const MILLISECONDS_IN_SECOND = 1000;
 const SECONDS_IN_MINUTE = 60;
 const SECONDS_IN_HOUR = 60 * SECONDS_IN_MINUTE;
 const SECONDS_IN_DAY = 24 * SECONDS_IN_HOUR;
 
-let contentWindow = window.arguments[0];
+let outerWindowID = window.arguments[0];
 let windowURI = window.arguments[1];
 if (typeof windowURI == "string")
   windowURI = Services.newURI(windowURI, null, null);
 let browser = window.arguments[2];
 let isPrivate = false;
 
 let reportData = new DOMParser().parseFromString("<report></report>", "text/xml");
 
 // Some helper functions to work with the report data
 function reportElement(tag)
@@ skipping 63 matching lines @@
 };
 
 //
 // Data collectors
 //
 
 var reportsListDataSource =
 {
   list: [],
 
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
     let data = Prefs.recentReports;
     if (data && "length" in data)
     {
       for (let i = 0; i < data.length; i++)
       {
         let entry = data[i];
         if (typeof entry.reportURL == "string" && entry.reportURL &&
             typeof entry.time == "number" && Date.now() - entry.time < 30*24*60*60*1000)
         {
@@ skipping 62 matching lines @@
 };
 
 var requestsDataSource =
 {
   requests: reportElement("requests"),
   origRequests: [],
   requestNotifier: null,
   callback: null,
   nodeByKey: Object.create(null),
 
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
-    let outerWindowID = wnd.QueryInterface(Ci.nsIInterfaceRequestor)
-                           .getInterface(Ci.nsIDOMWindowUtils)
-                           .outerWindowID;
     this.callback = callback;
     this.requestNotifier = new RequestNotifier(outerWindowID, this.onRequestFound, this);
   },
 
   onRequestFound: function(entry, scanComplete)
   {
     if (entry)
     {
       let key = entry.location + " " + entry.type + " " + entry.docDomain;
       let requestXML;
@@ skipping 29 matching lines @@
       this.requestNotifier = null;
       this.callback();
     }
   }
 };
 
 var filtersDataSource =
 {
   origFilters: [],
 
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
-    let outerWindowID = wnd.QueryInterface(Ci.nsIInterfaceRequestor)
-                           .getInterface(Ci.nsIDOMWindowUtils)
-                           .outerWindowID;
     RequestNotifier.getWindowStatistics(outerWindowID, (wndStats) =>
     {
       if (wndStats)
       {
         let filters = reportElement("filters");
         for (let f in wndStats.filters)
         {
           let filter = Filter.fromText(f)
           let hitCount = wndStats.filters[f];
           appendElement(filters, "filter", {
@@ skipping 13 matching lines @@
 {
   subscriptionFilter: function(s)
   {
     if (s.disabled || !(s instanceof RegularSubscription))
       return false;
     if (s instanceof DownloadableSubscription && !/^(http|https|ftp):/i.test(s.url))
       return false;
     return true;
   },
 
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
     let subscriptions = reportElement("subscriptions");
     let now = Math.round(Date.now() / 1000);
     for (let i = 0; i < FilterStorage.subscriptions.length; i++)
     {
       let subscription = FilterStorage.subscriptions[i];
       if (!this.subscriptionFilter(subscription))
         continue;
 
       let subscriptionXML = appendElement(subscriptions, "subscription", {
@@ skipping 14 matching lines @@
           subscriptionXML.setAttribute("hardExpiration", subscription.expires - now);
         subscriptionXML.setAttribute("downloadStatus", subscription.downloadStatus);
       }
     }
     callback();
   }
 };
 
 var remoteDataSource =
 {
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
-    let outerWindowID = wnd.QueryInterface(Ci.nsIInterfaceRequestor)
-                           .getInterface(Ci.nsIDOMWindowUtils)
-                           .outerWindowID;
     let dataCollector = require("dataCollector");
     let screenshotWidth = screenshotDataSource.getWidth();
     dataCollector.collectData(outerWindowID, screenshotWidth, data => {
       screenshotDataSource.setData(data && data.screenshot);
       framesDataSource.setData(windowURI, data && data.opener, data && data.referrer, data && data.frames);
 
       if (data && data.isPrivate)
         isPrivate = true;
       let element = reportElement("options");
       appendElement(element, "option", {id: "privateBrowsing"}, isPrivate);
@@ skipping 242 matching lines @@
       let frameXML = appendElement(xmlList, "frame", {
         url: censorURL(frame.url)
       });
       this.addFrames(frame.frames, frameXML);
     }
   }
 };
 
 var errorsDataSource =
 {
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
     let {addonID} = require("info");
     addonID = addonID.replace(/[\{\}]/g, "");
 
     // See https://bugzilla.mozilla.org/show_bug.cgi?id=664695 - starting with
     // Gecko 19 this function returns the result, before that it wrote to a
     // parameter.
     let outparam = {};
     let messages = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService).getMessageArray(outparam, {});
     messages = messages || outparam.value || [];
@@ skipping 54 matching lines @@
     }
 
     callback();
   }
 };
 
 var extensionsDataSource =
 {
   data: reportData.createElement("extensions"),
 
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
     try
     {
       let AddonManager = Cu.import("resource://gre/modules/AddonManager.jsm", null).AddonManager;
       AddonManager.getAddonsByTypes(["extension", "plugin"], function(items)
       {
         for (let i = 0; i < items.length; i++)
         {
           let item = items[i];
           if (!item.isActive)
@@ skipping 32 matching lines @@
   needUpdate: null,
 
   subscriptionFilter: function(s)
   {
     if (s instanceof DownloadableSubscription)
       return subscriptionsDataSource.subscriptionFilter(s);
     else
       return false;
   },
 
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
     this.browser = browser;
     let now = Date.now() / MILLISECONDS_IN_SECOND;
     let outdatedThreshold = now - 14 * SECONDS_IN_DAY;
     let needUpdateThreshold = now - 1 * SECONDS_IN_HOUR;
 
     this.outdated = [];
     this.needUpdate = [];
 
     let subscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter);
@@ skipping 145 matching lines @@
     if (s instanceof DownloadableSubscription &&
         s.url != Prefs.subscriptions_exceptionsurl &&
         s.url != Prefs.subscriptions_antiadblockurl)
     {
       return subscriptionsDataSource.subscriptionFilter(s);
     }
     else
       return false;
   },
 
-  collectData: function(wnd, windowURI, browser, callback)
+  collectData: function(outerWindowID, windowURI, browser, callback)
   {
     this.browser = browser;
     this.whitelistFilter = Policy.isWhitelisted(windowURI.spec);
 
     if (!this.whitelistFilter && this.isEnabled)
     {
       // Find disabled filters in active subscriptions matching any of the requests
       let disabledMatcher = new CombinedMatcher();
       for (let subscription of FilterStorage.subscriptions)
       {
@@ skipping 337 matching lines @@
     {
       let progressMeter = E("dataCollectorProgress");
       progressMeter.mode = "determined";
       progressMeter.value = progress;
     }
 
     // Continue with the next data source, asynchronously to allow progress meter to update
     let dataSource = dataCollectors.shift();
     Utils.runAsync(function()
     {
-      dataSource.collectData(contentWindow, windowURI, browser, initNextDataSource);
+      dataSource.collectData(outerWindowID, windowURI, browser, initNextDataSource);
     });
   };
 
   initNextDataSource();
 }
 
 function initTypeSelectorPage()
 {
   E("progressBar").activeItem = E("typeSelectorHeader");
   let header = document.getAnonymousElementByAttribute(document.documentElement, "class", "wizard-header");
@@ skipping 302 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }