import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1173947 - Make getRandomValues message be urgent (r=mrbkap) (aca1a06a9)
- Bug 1182824 - Part 1: Use move assignment rather than copy assignment with ContextState::dash. r=mattwoodrow (73af33d32)
- Bug 1182824 - Part 2: Make ContextState::dash a nsTArray. r=mattwoodrow (c66c3105d)
- Bug 1134166 - Restart toolbox if selected app re-opens. r=ochameau (e370c8f02)
- Bug 1134166 - Close toolbox if selected app dies. r=ochameau (5acb76254)
- Bug 1134166 - Check for project when updating toolbox state. r=me (c60bb8766)
- Bug 1090949 - Add way to make WebIDE runtimes configurable. r=ochameau (eef01e3e6)
- Bug 1090949 - Refactor WebIDE preferences panel style. r=ochameau (fe1a9c757)
- Bug 1135191 - Add runtime panel with toggle. r=jryans (e2e290a67)
- missing bit of  Bug 1116188 - Add async ProfileGatherer (308cfdd4f)
- Bug 1185737 - Propagate pause and resume commands to child processes. r=BenWa (2dd302569)
- Bug 1161831 - Stop using threaddsafe ISupports for nsResProtocolHandler. r=billm (0bec61aac)
- Bug 1155968 - Correct indent not multiple of 4. r=khuey (5fb8e3b20)
- Bug 1183291 - Factor idl-parser into a Python package. r=khuey (63a2f0c68)
- Bug 1155968 - Add blank lines where needed in xpcom/idl-parser. r=khuey (ce91a905b)
- Bug 1161831 - Generate an extra macro to declare a non-virtual variant of an interface. r=billm (058876228)
- Bug 1161831 - Factor the sharable bits out of nsIResProtocolHandler. r=billm (b02278fb9)
- Bug 1152997 - Cleanup app update build to exclude android. r=glandium, r=mossop (6cd935294)
- Bug 1170075 - Remove Print Progress UI and view source XUL files from Android. r=snorp (64796ae4a)
- Bug 1180921 - Create a dumping ground for simple services in toolkit/components/utils. r=Gijs (2757d43c8)
- Bug 1180921 - Support custom callbacks for allowing access per-addon load access to cross-origin URIs. r=bz,r=billm (8cc7e2c96)
- Bug 1161831 - Implement moz-extension protocol. r=bz,r=billm,sr=mcmanus (5ee451357)
- Bug 1161831 - Associate extension URIs with the appropriate addon ID. r=billm,sr=bz (f36655ac9)
- Bug 1161831 - Forbid mapping to anything but file:// and jar:// URIs. r=billm,sr=bz (144add9de)
- Bug 1180921 - Generalize test_origin to make it easier to add new origin attributes. r=gabor (b3fbc3545)
- Bug 1180921 - Add the addonId OriginAttribute. r=bholley (0723d0dec)
- Bug 1174093 - Don't recurse into caps/tests/mochitest during the build; r=mshal (76366d21a)
- Bug 1161831 - Tests. r=billm (ed116a703)
- Bug 1155547, Part 1: Fix unified build breakage in adding new sources under dom/ipc/. r=khuey (0d6875348)
- Bug 1166985 - Use two image decoding threads on dual core devices. r=tn (7f07ee8b8)
- Bug 1160422 - Prioritize size decodes over full decodes. r=tn (48d42c011)
- Bug 1151672 - Part 1: Remove the calls to nsThreadManager::SetThreadWorking() and nsThreadManager::SetThreadIdle() due to backout of bug 970307. r=seth (0428dd4a4)
- Bug 1151672 - Part 2: Block PHal::Msg_NotifyNetworkChange__ID to the Nuwa process after it is ready. r=khuey (42debf2c0)
- Bug 1176034 - MessagePort should force a close() if the structured clone algorithm fails, r=bent (3afe74856)
- Bug 1176034 - Implement JSAutoStructuredCloneBuffer::clear(with callbacks and closure), r=sfink (f28f6852b)
- Bug 1155547, Part 2: Create PNuwa protocol (managed by PBackground) for forking content processes. r=khuey (047bc5e61)
- missing bit of Bug 1170075 - Remove Print Progress UI and view source XUL (a08888308)

caps/nsScriptSecurityManager.cpp

@@ -340,6 +340,20 @@ nsScriptSecurityManager::GetChannelResultPrincipal(nsIChannel* aChannel,
     return GetChannelURIPrincipal(aChannel, aPrincipal);
 }
 
+nsresult
+nsScriptSecurityManager::MaybeSetAddonIdFromURI(OriginAttributes& aAttrs, nsIURI* aURI)
+{
+  nsAutoCString scheme;
+  nsresult rv = aURI->GetScheme(scheme);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (scheme.EqualsLiteral("moz-extension") && GetAddonPolicyService()) {
+    rv = GetAddonPolicyService()->ExtensionURIToAddonId(aURI, aAttrs.mAddonId);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  return NS_OK;
+}
+
 /* The principal of the URI that this channel is loading. This is never
  * affected by things like sandboxed loads, or loads where we forcefully
  * inherit the principal.  Think of this as the principal of the server
@@ -371,6 +385,8 @@ nsScriptSecurityManager::GetChannelURIPrincipal(nsIChannel* aChannel,
     }
 
     OriginAttributes attrs(UNKNOWN_APP_ID, false);
+    rv = MaybeSetAddonIdFromURI(attrs, uri);
+    NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(uri, attrs);
     prin.forget(aPrincipal);
     return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
@@ -732,6 +748,16 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
     // the methods that work on chains of nested URIs and they will only look
     // at the flags for our one URI.
 
+    // Special case: moz-extension has a whitelist of URIs that are loadable by
+    // anyone.
+    if (targetScheme.EqualsLiteral("moz-extension") && GetAddonPolicyService()) {
+      bool loadable = false;
+      rv = GetAddonPolicyService()->ExtensionURILoadableByAnyone(targetBaseURI, &loadable);
+      if (NS_SUCCEEDED(rv) && loadable) {
+        return NS_OK;
+      }
+    }
+
     // Check for system target URI
     rv = DenyAccessIfURIHasFlags(targetBaseURI,
                                  nsIProtocolHandler::URI_DANGEROUS_TO_LOAD);
@@ -1062,6 +1088,8 @@ nsScriptSecurityManager::
   OriginAttributes attrs;
   aLoadContext->GetAppId(&attrs.mAppId);
   aLoadContext->GetIsInBrowserElement(&attrs.mInBrowser);
+  nsresult rv = MaybeSetAddonIdFromURI(attrs, aURI);
+  NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
   prin.forget(aPrincipal);
   return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
@@ -1074,6 +1102,8 @@ nsScriptSecurityManager::GetDocShellCodebasePrincipal(nsIURI* aURI,
 {
   // XXXbholley - Make this more general in bug 1165466.
   OriginAttributes attrs(aDocShell->GetAppId(), aDocShell->GetIsInBrowserElement());
+  nsresult rv = MaybeSetAddonIdFromURI(attrs, aURI);
+  NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
   prin.forget(aPrincipal);
   return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;