From 0e04940e1ad26bc05edd6f4dd0c363dea97a849c Mon Sep 17 00:00:00 2001 From: Johann Hofmann Date: Thu, 2 Jun 2016 17:14:27 +0200 Subject: [PATCH] Bug 1277524 - Add moz-extension to the list of potentially trustworthy origins. r=tanvi MozReview-Commit-ID: BvR7Xb0AE9N --HG-- extra : rebase_source : dfe2d600b15a6cffd49be454b3394106c3ff9bb3 extra : histedit_source : 8b03564ebced1305ce79652d904e7bb95a92a2e8 --- dom/security/nsContentSecurityManager.cpp | 1 + dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js | 1 + 2 files changed, 2 insertions(+) diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index aab5a2d6fd01..2ddc8d1a6ec7 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -645,6 +645,7 @@ nsContentSecurityManager::IsOriginPotentiallyTrustworthy(nsIPrincipal* aPrincipa scheme.EqualsLiteral("file") || scheme.EqualsLiteral("resource") || scheme.EqualsLiteral("app") || + scheme.EqualsLiteral("moz-extension") || scheme.EqualsLiteral("wss")) { *aIsTrustWorthy = true; return NS_OK; diff --git a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js index de1834fbc881..12c59108dc27 100644 --- a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js +++ b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js @@ -27,6 +27,7 @@ add_task(function* test_isOriginPotentiallyTrustworthy() { ["http://127.0.0.1/", true], ["file:///", true], ["resource:///", true], + ["moz-extension://", true], ["about:config", false], ["urn:generic", false], ]) {