Bug 1038072 - call unpacked jar verification from XPIProvider. r=mossop

--HG--
extra : rebase_source : de5a3ea103ca93a6dab98410aa121428a31a7f08
extra : source : 266853fe89654e03923048aa4e50789b411a97fc

toolkit/mozapps/extensions/internal/XPIProvider.jsm

@@ -1357,8 +1357,18 @@ function verifyDirSignedState(aDir, aAddon) {
   if (!SIGNED_TYPES.has(aAddon.type))
     return Promise.resolve(undefined);
 
-  // TODO: Get the certificate for an unpacked add-on (bug 1038072)
-  return Promise.resolve(AddonManager.SIGNEDSTATE_MISSING);
+  let certDB = Cc["@mozilla.org/security/x509certdb;1"]
+               .getService(Ci.nsIX509CertDB);
+
+  let root = Ci.nsIX509CertDB.AddonsPublicRoot;
+  if (!REQUIRE_SIGNING && Preferences.get(PREF_XPI_SIGNATURES_DEV_ROOT, false))
+    root = Ci.nsIX509CertDB.AddonsStageRoot;
+
+  return new Promise(resolve => {
+    certDB.verifySignedDirectoryAsync(root, aDir, (aRv, aCert) => {
+      resolve(getSignedStatus(aRv, aCert, aAddon.id));
+    });
+  });
 }
 
 /**

toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini

@@ -236,6 +236,12 @@ fail-if = buildapp == "mulet" || os == "android"
 [test_pref_properties.js]
 [test_registry.js]
 [test_safemode.js]
+[test_signed_verify.js]
+[test_signed_inject.js]
+skip-if = true
+[test_signed_install.js]
+run-sequentially = Uses hardcoded ports in xpi files.
+[test_signed_migrate.js]
 [test_startup.js]
 # Bug 676992: test consistently fails on Android
 fail-if = os == "android"

toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini

@@ -22,12 +22,6 @@ skip-if = appname != "firefox"
 [test_provider_unsafe_access_shutdown.js]
 [test_provider_unsafe_access_startup.js]
 [test_shutdown.js]
-[test_signed_verify.js]
-[test_signed_inject.js]
-skip-if = true
-[test_signed_install.js]
-run-sequentially = Uses hardcoded ports in xpi files.
-[test_signed_migrate.js]
 [test_XPIcancel.js]
 [test_XPIStates.js]