author Andrew Swan <aswan@mozilla.com>

Tue, 03 Jan 2017 10:55:25 -0800

changeset 455424 af3d107ccdca9eb17b649e5811b5e339fc6690e8

parent 455333 cad2ea346d06ec5a3a70eda912513201dff0c21e

child 455461 2933613458285f4ef39c2e09549a026a8488d67d

push id 40230

push user aswan@mozilla.com

push date Tue, 03 Jan 2017 18:58:06 +0000

bugs 1308309

milestone 53.0a1

browser/base/content/popup-notifications.inc file | annotate | diff | comparison | revisions

browser/base/content/test/general/browser.ini file | annotate | diff | comparison | revisions

browser/base/content/test/general/browser_extension_permissions.js file | annotate | diff | comparison | revisions

browser/base/content/test/general/browser_webext_nopermissions.xpi file | annotate | diff | comparison | revisions

browser/base/content/test/general/browser_webext_permissions.xpi file | annotate | diff | comparison | revisions

browser/base/content/test/general/file_install_extensions.html file | annotate | diff | comparison | revisions

browser/components/nsBrowserGlue.js file | annotate | diff | comparison | revisions

browser/modules/ExtensionsUI.jsm file | annotate | diff | comparison | revisions

browser/modules/moz.build file | annotate | diff | comparison | revisions

browser/themes/linux/browser.css file | annotate | diff | comparison | revisions

browser/themes/osx/browser.css file | annotate | diff | comparison | revisions

browser/themes/windows/browser.css file | annotate | diff | comparison | revisions

toolkit/components/extensions/Extension.jsm file | annotate | diff | comparison | revisions

toolkit/mozapps/extensions/AddonManager.jsm file | annotate | diff | comparison | revisions

toolkit/mozapps/extensions/internal/XPIProvider.jsm file | annotate | diff | comparison | revisions
--- a/browser/base/content/popup-notifications.inc
+++ b/browser/base/content/popup-notifications.inc
@@ -66,8 +66,16 @@
         <progressmeter id="addon-progress-notification-progressmeter"/>
         <label id="addon-progress-notification-progresstext" crop="end"/>
       </popupnotificationcontent>
     </popupnotification>
 
     <popupnotification id="addon-install-confirmation-notification" hidden="true">
       <popupnotificationcontent id="addon-install-confirmation-content" orient="vertical"/>
     </popupnotification>
+
+    <popupnotification id="addon-webext-permissions-notification" hidden="true">
+      <popupnotificationcontent orient="vertical">
+        <description id="addon-webext-perm-header" class="addon-webext-perm-header"/>
+        <label id="addon-webext-perm-text" class="addon-webext-perm-text"/>
+        <html:ul id="addon-webext-perm-list" class="addon-webext-perm-list"/>
+      </popupnotificationcontent>
+    </popupnotification>
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -112,16 +112,19 @@ support-files =
   test_mcb_redirect_image.html
   test_mcb_double_redirect_image.html
   test_mcb_redirect.js
   test_mcb_redirect.sjs
   file_bug1045809_1.html
   file_bug1045809_2.html
   file_csp_block_all_mixedcontent.html
   file_csp_block_all_mixedcontent.js
+  file_install_extensions.html
+  browser_webext_permissions.xpi
+  browser_webext_nopermissions.xpi
   !/image/test/mochitest/blue.png
   !/toolkit/components/passwordmgr/test/browser/form_basic.html
   !/toolkit/components/passwordmgr/test/browser/insecure_test.html
   !/toolkit/components/passwordmgr/test/browser/insecure_test_subframe.html
   !/toolkit/content/tests/browser/common/mockTransfer.js
   !/toolkit/modules/tests/browser/metadata_*.html
   !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
@@ -293,16 +296,17 @@ skip-if = !datareporting
 skip-if = os == "mac" # decoder doctor isn't implemented on osx
 [browser_devedition.js]
 [browser_discovery.js]
 [browser_double_close_tab.js]
 [browser_documentnavigation.js]
 [browser_duplicateIDs.js]
 [browser_drag.js]
 skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
+[browser_extension_permissions.js]
 [browser_favicon_change.js]
 [browser_favicon_change_not_in_document.js]
 [browser_findbarClose.js]
 [browser_focusonkeydown.js]
 [browser_fullscreen-window-open.js]
 tags = fullscreen
 skip-if = os == "linux" # Linux: Intermittent failures - bug 941575.
 [browser_fxaccounts.js]
new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/general/browser_extension_permissions.js
@@ -0,0 +1,111 @@
+"use strict";
+
+const BASE = getRootDirectory(gTestPath)
+  .replace("chrome://mochitests/content/", "https://example.com/");
+
+const PAGE = `${BASE}/file_install_extensions.html`;
+const PERMS_XPI = `${BASE}/browser_webext_permissions.xpi`;
+const NO_PERMS_XPI = `${BASE}/browser_webext_nopermissions.xpi`;
+const ID = "permissions@test.mozilla.org";
+
+const DEFAULT_EXTENSION_ICON = "chrome://browser/content/extension.svg";
+
+function promisePopupNotificationShown(name) {
+  return new Promise(resolve => {
+    PopupNotifications.panel.addEventListener("popupshown", () => {
+      let notification = PopupNotifications.getNotification(name);
+      ok(notification, `${name} notification shown`);
+      ok(PopupNotifications.isPanelOpen, "notification panel open");
+
+      resolve(PopupNotifications.panel.firstChild);
+    }, {once: true});
+  });
+}
+
+function promiseGetAddonByID(id) {
+  return new Promise(resolve => {
+    AddonManager.getAddonByID(id, resolve);
+  });
+}
+
+function checkNotification(panel, url) {
+  let icon = panel.getAttribute("icon");
+
+  let uls = panel.firstChild.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "ul");
+  is(uls.length, 1, "Found the permissions list");
+  let ul = uls[0];
+
+  let headers = panel.firstChild.getElementsByClassName("addon-webext-perm-text");
+  is(headers.length, 1, "Found the header");
+  let header = headers[0];
+
+  if (url == PERMS_XPI) {
+    // The icon should come from the extension, don't bother with the precise
+    // path, just make sure we've got a jar url pointing to the right path
+    // inside the jar.
+    ok(icon.startsWith("jar:file://"), "Icon is a jar url");
+    ok(icon.endsWith("/icon.png"), "Icon is icon.png inside a jar");
+
+    is(header.getAttribute("hidden"), "", "Permission list header is visible");
+    is(ul.childElementCount, 4, "Permissions list has 4 entries");
+    // Real checking of the contents here is deferred until bug 1316996 lands
+  } else if (url == NO_PERMS_XPI) {
+    // This extension has no icon, it should have the default
+    is(icon, DEFAULT_EXTENSION_ICON, "Icon is the default extension icon");
+
+    is(header.getAttribute("hidden"), "true", "Permission list header is hidden");
+    is(ul.childElementCount, 0, "Permissions list has 0 entries");
+  }
+}
+
+const INSTALL_FUNCTIONS = [
+  function installMozAM(url) {
+    return ContentTask.spawn(gBrowser.selectedBrowser, url, function*(cUrl) {
+      return content.wrappedJSObject.installMozAM(cUrl);
+    });
+  },
+];
+
+add_task(function* () {
+  yield SpecialPowers.pushPrefEnv({set: [
+    ["extensions.webapi.testing", true],
+    ["extensions.install.requireBuiltInCerts", false],
+
+    // XXX remove this when prompts are enabled by default
+    ["extensions.webextPermissionPrompts", true],
+  ]});
+
+  function* runOnce(installFn, url, cancel) {
+    let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
+
+    let installPromise = installFn(url);
+
+    let panel = yield promisePopupNotificationShown("addon-webext-permissions");
+    checkNotification(panel, url);
+
+    if (cancel) {
+      panel.secondaryButton.click();
+    } else {
+      panel.button.click();
+    }
+
+    let result = yield installPromise;
+    let addon = yield promiseGetAddonByID(ID);
+    if (cancel) {
+      is(result, "onInstallCancelled", "Installation was cancelled");
+      is(addon, null, "Extension is not installed");
+    } else {
+      is(result, "onInstallEnded", "Installation completed");
+      isnot(addon, null, "Extension is installed");
+      addon.uninstall();
+    }
+
+    yield BrowserTestUtils.removeTab(tab);
+  }
+
+  for (let installFn of INSTALL_FUNCTIONS) {
+    yield runOnce(installFn, NO_PERMS_XPI, true);
+    yield runOnce(installFn, PERMS_XPI, true);
+    yield runOnce(installFn, PERMS_XPI, false);
+  }
+});
new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/general/file_install_extensions.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+  <meta charset="utf-8">
+</head>
+<body>
+<script type="text/javascript">
+function installMozAM(url) {
+  return navigator.mozAddonManager.createInstall({url}).then(install => new Promise(resolve => {
+    const EVENTS = [
+      "onDownloadCancelled",
+      "onDownloadFailed",
+      "onInstallCancelled",
+      "onInstallEnded",
+      "onInstallFailed",
+    ];
+    for (let event of EVENTS) {
+      install.addEventListener(event, () => { resolve(event); });
+    }
+    install.install();
+  }));
+}
+</script>
+</body>
+</html>
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -52,16 +52,17 @@ XPCOMUtils.defineLazyServiceGetter(this,
   ["BrowserUITelemetry", "resource:///modules/BrowserUITelemetry.jsm"],
   ["BrowserUsageTelemetry", "resource:///modules/BrowserUsageTelemetry.jsm"],
   ["CaptivePortalWatcher", "resource:///modules/CaptivePortalWatcher.jsm"],
   ["ContentClick", "resource:///modules/ContentClick.jsm"],
   ["ContentPrefServiceParent", "resource://gre/modules/ContentPrefServiceParent.jsm"],
   ["ContentSearch", "resource:///modules/ContentSearch.jsm"],
   ["DateTimePickerHelper", "resource://gre/modules/DateTimePickerHelper.jsm"],
   ["DirectoryLinksProvider", "resource:///modules/DirectoryLinksProvider.jsm"],
+  ["ExtensionsUI", "resource:///modules/ExtensionsUI.jsm"],
   ["Feeds", "resource:///modules/Feeds.jsm"],
   ["FileUtils", "resource://gre/modules/FileUtils.jsm"],
   ["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"],
   ["Integration", "resource://gre/modules/Integration.jsm"],
   ["LightweightThemeManager", "resource://gre/modules/LightweightThemeManager.jsm"],
   ["LoginHelper", "resource://gre/modules/LoginHelper.jsm"],
   ["LoginManagerParent", "resource://gre/modules/LoginManagerParent.jsm"],
   ["NetUtil", "resource://gre/modules/NetUtil.jsm"],
@@ -1064,16 +1065,18 @@ BrowserGlue.prototype = {
         if (!(addon.permissions & AddonManager.PERM_CAN_ENABLE)) {
           continue;
         }
 
         win.openUILinkIn("about:newaddon?id=" + addon.id, "tab");
       }
     });
 
+    ExtensionsUI.init();
+
     let signingRequired;
     if (AppConstants.MOZ_REQUIRE_SIGNING) {
       signingRequired = true;
     } else {
       signingRequired = Services.prefs.getBoolPref("xpinstall.signatures.required");
     }
 
     if (signingRequired) {
new file mode 100644
--- /dev/null
+++ b/browser/modules/ExtensionsUI.jsm
@@ -0,0 +1,155 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
+
+this.EXPORTED_SYMBOLS = ["ExtensionsUI"];
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+const DEFAULT_EXENSION_ICON = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+
+const HTML_NS = "http://www.w3.org/1999/xhtml";
+
+this.ExtensionsUI = {
+  init() {
+    Services.obs.addObserver(this, "webextension-permission-prompt", false);
+  },
+
+  observe(subject, topic, data) {
+    if (topic == "webextension-permission-prompt") {
+      let {target, info} = subject.wrappedJSObject;
+      this.showPermissionsPrompt(target, info).then(answer => {
+        Services.obs.notifyObservers(subject, "webextension-permission-response",
+                                     JSON.stringify(answer));
+      });
+    }
+  },
+
+  showPermissionsPrompt(target, info) {
+    let perms = info.addon.userPermissions;
+    if (!perms) {
+      return Promise.resolve();
+    }
+
+    let win = target.ownerGlobal;
+
+    let name = info.addon.name;
+    if (name.length > 50) {
+      name = name.slice(0, 49) + "…";
+    }
+
+    // The strings below are placeholders, they will switch over to the
+    // bundle.get*String() calls as part of bug 1316996.
+
+    // let bundle = win.gNavigatorBundle;
+    // let header = bundle.getFormattedString("webextPerms.header", [name])
+    // let listHeader = bundle.getString("webextPerms.listHeader");
+    let header = "Add ADDON?".replace("ADDON", name);
+    let listHeader = "It can:";
+
+    let formatPermission = perm => {
+      try {
+        // return bundle.getString(`webextPerms.description.${perm}`);
+        return `localized description of permission ${perm}`;
+      } catch (err) {
+        // return bundle.getFormattedString("webextPerms.description.unknown",
+        //                                  [perm]);
+        return `localized description of unknown permission ${perm}`;
+      }
+    };
+
+    let formatHostPermission = perm => {
+      if (perm == "<all_urls>") {
+        // return bundle.getString("webextPerms.hostDescription.allUrls");
+        return "localized description of <all_urls> host permission";
+      }
+      let match = /^[htps*]+:\/\/([^/]+)\//.exec(perm);
+      if (!match) {
+        throw new Error("Unparseable host permission");
+      }
+      if (match[1].startsWith("*.")) {
+        let domain = match[1].slice(2);
+        // return bundle.getFormattedString("webextPerms.hostDescription.wildcard", [domain]);
+        return `localized description of wildcard host permission for ${domain}`;
+      }
+
+      //  return bundle.getFormattedString("webextPerms.hostDescription.oneSite", [match[1]]);
+      return `localized description of single host permission for ${match[1]}`;
+    };
+
+    let msgs = [
+      ...perms.permissions.map(formatPermission),
+      ...perms.hosts.map(formatHostPermission),
+    ];
+
+    // let acceptText = bundle.getString("webextPerms.accept.label");
+    // let acceptKey = bundle.getString("webextPerms.accept.accessKey");
+    // let cancelText = bundle.getString("webextPerms.cancel.label");
+    // let cancelKey = bundle.getString("webextPerms.cancel.accessKey");
+    let acceptText = "Add extension";
+    let acceptKey = "A";
+    let cancelText = "Cancel";
+    let cancelKey = "C";
+
+    let rendered = false;
+    let popupOptions = {
+      hideClose: true,
+      popupIconURL: info.icon,
+      persistent: true,
+
+      eventCallback(topic) {
+        if (topic == "showing") {
+          // This check can be removed when bug 1325223 is resolved.
+          if (rendered) {
+            return false;
+          }
+
+          let doc = this.browser.ownerDocument;
+          doc.getElementById("addon-webext-perm-header").textContent = header;
+
+          let list = doc.getElementById("addon-webext-perm-list");
+          while (list.firstChild) {
+            list.firstChild.remove();
+          }
+
+          let listHeaderEl = doc.getElementById("addon-webext-perm-text");
+          listHeaderEl.value = listHeader;
+          listHeaderEl.hidden = (msgs.length == 0);
+
+          for (let msg of msgs) {
+            let item = doc.createElementNS(HTML_NS, "li");
+            item.textContent = msg;
+            list.appendChild(item);
+          }
+          rendered = true;
+        } else if (topic == "dismissed") {
+          rendered = false;
+        } else if (topic == "swapping") {
+          rendered = false;
+          return true;
+        }
+        return false;
+      },
+    };
+
+    return new Promise(resolve => {
+      win.PopupNotifications.show(target, "addon-webext-permissions", "",
+                                  "addons-notification-icon",
+                                  {
+                                    label: acceptText,
+                                    accessKey: acceptKey,
+                                    callback: () => resolve(true),
+                                  },
+                                  [
+                                    {
+                                      label: cancelText,
+                                      accessKey: cancelKey,
+                                      callback: () => resolve(false),
+                                    },
+                                  ], popupOptions);
+    });
+  },
+};
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -21,16 +21,17 @@ EXTRA_JS_MODULES += [
     'ContentClick.jsm',
     'ContentCrashHandlers.jsm',
     'ContentLinkHandler.jsm',
     'ContentObservers.jsm',
     'ContentSearch.jsm',
     'ContentWebRTC.jsm',
     'DirectoryLinksProvider.jsm',
     'E10SUtils.jsm',
+    'ExtensionsUI.jsm',
     'Feeds.jsm',
     'FormSubmitObserver.jsm',
     'FormValidationHandler.jsm',
     'HiddenFrame.jsm',
     'LaterRun.jsm',
     'NetworkPrioritizer.jsm',
     'offlineAppCache.jsm',
     'PermissionUI.jsm',
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -828,16 +828,21 @@ menuitem.bookmark-item {
   width: 28em;
   max-width: 28em;
 }
 
 .addon-install-confirmation-name {
   font-weight: bold;
 }
 
+.addon-webext-perm-header {
+  font-weight: bold;
+  font-size: 1.3em;
+}
+
 /* Notification icon box */
 
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText;
 }
 
 /* Translation infobar */
 
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3086,16 +3086,21 @@ menulist.translate-infobar-element > .me
   width: 28em;
   max-width: 28em;
 }
 
 .addon-install-confirmation-name {
   font-weight: bold;
 }
 
+.addon-webext-perm-header {
+  font-weight: bold;
+  font-size: 1.3em;
+}
+
 /* Status panel */
 
 .statuspanel-label {
   margin: 0;
   padding: 2px 4px;
   background: linear-gradient(#fff, #ddd);
   border: 1px none #ccc;
   border-top-style: solid;
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2131,16 +2131,21 @@ toolbarbutton.bookmark-item[dragover="tr
   width: 28em;
   max-width: 28em;
 }
 
 .addon-install-confirmation-name {
   font-weight: bold;
 }
 
+.addon-webext-perm-header {
+  font-weight: bold;
+  font-size: 1.3em;
+}
+
 /* Notification icon box */
 
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText;
 }
 
 /* Translation infobar */
 
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -372,16 +372,22 @@ this.ExtensionData = class {
   // manifest.  The current implementation just returns the contents
   // of the permissions attribute, if we add things like url_overrides,
   // they should also be added here.
   userPermissions() {
     let result = {
       hosts: this.whiteListedHosts.pat,
       apis: [...this.apiNames],
     };
+
+    if (Array.isArray(this.manifest.content_scripts)) {
+      for (let entry of this.manifest.content_scripts) {
+        result.hosts.push(...entry.matches);
+      }
+    }
     const EXP_PATTERN = /^experiments\.\w+/;
     result.permissions = [...this.permissions]
       .filter(p => !result.hosts.includes(p) && !EXP_PATTERN.test(p));
     return result;
   }
 
   // Reads the extension's |manifest.json| file, and stores its
   // parsed contents in |this.manifest|.
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -42,16 +42,17 @@ const PREF_EM_HOTFIX_URL              = 
 const PREF_EM_CERT_CHECKATTRIBUTES    = "extensions.hotfix.cert.checkAttributes";
 const PREF_EM_HOTFIX_CERTS            = "extensions.hotfix.certs.";
 const PREF_MATCH_OS_LOCALE            = "intl.locale.matchOS";
 const PREF_SELECTED_LOCALE            = "general.useragent.locale";
 const UNKNOWN_XPCOM_ABI               = "unknownABI";
 
 const PREF_MIN_WEBEXT_PLATFORM_VERSION = "extensions.webExtensionsMinPlatformVersion";
 const PREF_WEBAPI_TESTING             = "extensions.webapi.testing";
+const PREF_WEBEXT_PREF_PROMPTS        = "extensions.webextPermissionPrompts";
 
 const UPDATE_REQUEST_VERSION          = 2;
 const CATEGORY_UPDATE_PARAMS          = "extension-update-params";
 
 const XMLURI_BLOCKLIST                = "http://www.mozilla.org/2006/addons-blocklist";
 
 const KEY_PROFILEDIR                  = "ProfD";
 const KEY_APPDIR                      = "XCurProcD";
@@ -73,16 +74,18 @@ const WEBAPI_TEST_INSTALL_HOSTS = [
 ];
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AsyncShutdown.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Preferences",
+                                  "resource://gre/modules/Preferences.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AddonRepository",
                                   "resource://gre/modules/addons/AddonRepository.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Extension",
                                   "resource://gre/modules/Extension.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
                                   "resource://gre/modules/FileUtils.jsm");
@@ -2833,16 +2836,40 @@ var AddonManagerInternal = {
       try {
         checkInstallUrl(options.url);
       } catch (err) {
         return Promise.reject({message: err.message});
       }
 
       return AddonManagerInternal.getInstallForURL(options.url, "application/x-xpinstall",
                                                    options.hash).then(install => {
+        if (Preferences.get(PREF_WEBEXT_PREF_PROMPTS, false)) {
+          install._permHandler = info => new Promise((resolve, reject) => {
+            const observer = {
+              observe(subject, topic, data) {
+                if (topic == "webextension-permission-response" &&
+                    subject.wrappedJSObject.info.addon == info.addon) {
+                  let answer = JSON.parse(data);
+                  Services.obs.removeObserver(this, "webextension-permission-response");
+                  if (answer) {
+                    resolve();
+                  } else {
+                    reject();
+                  }
+                }
+              }
+            };
+
+            Services.obs.addObserver(observer, "webextension-permission-response", false);
+
+            let subject = {wrappedJSObject: {target, info}};
+            Services.obs.notifyObservers(subject, "webextension-permission-prompt", null);
+          });
+        }
+
         let id = this.nextInstall++;
         let listener = this.makeListener(id, target.messageManager);
         install.addListener(listener);
 
         this.installs.set(id, {install, target, listener});
 
         let result = {id};
         this.copyProps(install, result);
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -82,16 +82,22 @@ XPCOMUtils.defineLazyServiceGetter(this,
                                    "amIAddonPathService");
 
 XPCOMUtils.defineLazyGetter(this, "CertUtils", function() {
   let certUtils = {};
   Components.utils.import("resource://gre/modules/CertUtils.jsm", certUtils);
   return certUtils;
 });
 
+XPCOMUtils.defineLazyGetter(this, "IconDetails", () => {
+  const {ExtensionUtils} = Cu.import("resource://gre/modules/ExtensionUtils.jsm", {});
+  return ExtensionUtils.IconDetails;
+});
+
+
 Cu.importGlobalProperties(["URL"]);
 
 const nsIFile = Components.Constructor("@mozilla.org/file/local;1", "nsIFile",
                                        "initWithPath");
 
 const PREF_DB_SCHEMA                  = "extensions.databaseSchema";
 const PREF_INSTALL_CACHE              = "extensions.installCache";
 const PREF_XPI_STATE                  = "extensions.xpiState";
@@ -5691,29 +5697,42 @@ class AddonInstall {
       this.addon.compatibilityOverrides = repoAddon ?
         repoAddon.compatibilityOverrides :
         null;
       this.addon.appDisabled = !isUsableAddon(this.addon);
       return undefined;
     }).bind(this));
   }
 
+  getIcon(desiredSize = 64) {
+    if (!this.addon.icons || !this.file) {
+      return null;
+    }
+
+    let {icon} = IconDetails.getPreferredIcon(this.addon.icons, null, desiredSize);
+    if (icon.startsWith("chrome://")) {
+      return icon;
+    }
+    return buildJarURI(this.file, icon).spec;
+  }
+
   /**
    * This method should be called when the XPI is ready to be installed,
    * i.e., when a download finishes or when a local file has been verified.
    * It should only be called from install() when the install is in
    * STATE_DOWNLOADED (which actually means that the file is available
    * and has been verified).
    */
   checkPermissions() {
     Task.spawn((function*() {
       if (this.permHandler) {
         let info = {
-          existinAddon: this.existingAddon,
-          addon: this.addon,
+          existingAddon: this.existingAddon ? this.existingAddon.wrapper : null,
+          addon: this.addon.wrapper,
+          icon: this.getIcon(),
         };
 
         try {
           yield this.permHandler(info);
         } catch (err) {
           logger.info(`Install of ${this.addon.id} cancelled since user declined permissions`);
           this.state = AddonManager.STATE_CANCELLED;
           XPIProvider.removeActiveInstall(this);
@@ -7653,16 +7672,20 @@ AddonWrapper.prototype = {
     let addon = addonFor(this);
     let hotfixID = Preferences.get(PREF_EM_HOTFIX_ID, undefined);
     if (hotfixID && hotfixID == addon.id) {
       return false;
     }
     return (addon._installLocation.name == KEY_APP_PROFILE);
   },
 
+  get userPermissions() {
+    return addonFor(this).userPermissions;
+  },
+
   isCompatibleWith(aAppVersion, aPlatformVersion) {
     return addonFor(this).isCompatibleWith(aAppVersion, aPlatformVersion);
   },
 
   uninstall(alwaysAllowUndo) {
     let addon = addonFor(this);
     XPIProvider.uninstallAddon(addon, alwaysAllowUndo);
   },
author	Andrew Swan <aswan@mozilla.com>
	Tue, 03 Jan 2017 10:55:25 -0800
changeset 455424	af3d107ccdca9eb17b649e5811b5e339fc6690e8
parent 455333	cad2ea346d06ec5a3a70eda912513201dff0c21e
child 455461	2933613458285f4ef39c2e09549a026a8488d67d
push id	40230
push user	aswan@mozilla.com
push date	Tue, 03 Jan 2017 18:58:06 +0000
bugs	1308309
milestone	53.0a1
browser/base/content/popup-notifications.inc		file \| annotate \| diff \| comparison \| revisions
browser/base/content/test/general/browser.ini		file \| annotate \| diff \| comparison \| revisions
browser/base/content/test/general/browser_extension_permissions.js		file \| annotate \| diff \| comparison \| revisions
browser/base/content/test/general/browser_webext_nopermissions.xpi		file \| annotate \| diff \| comparison \| revisions
browser/base/content/test/general/browser_webext_permissions.xpi		file \| annotate \| diff \| comparison \| revisions
browser/base/content/test/general/file_install_extensions.html		file \| annotate \| diff \| comparison \| revisions
browser/components/nsBrowserGlue.js		file \| annotate \| diff \| comparison \| revisions
browser/modules/ExtensionsUI.jsm		file \| annotate \| diff \| comparison \| revisions
browser/modules/moz.build		file \| annotate \| diff \| comparison \| revisions
browser/themes/linux/browser.css		file \| annotate \| diff \| comparison \| revisions
browser/themes/osx/browser.css		file \| annotate \| diff \| comparison \| revisions
browser/themes/windows/browser.css		file \| annotate \| diff \| comparison \| revisions
toolkit/components/extensions/Extension.jsm		file \| annotate \| diff \| comparison \| revisions
toolkit/mozapps/extensions/AddonManager.jsm		file \| annotate \| diff \| comparison \| revisions
toolkit/mozapps/extensions/internal/XPIProvider.jsm		file \| annotate \| diff \| comparison \| revisions