KotJohansson/UXP-Fixed
1
0
Fork 0
mirror of https://github.com/ManchildProductions/UXP-Fixed.git synced 2026-05-29 18:24:47 +00:00
Code Issues Projects Releases Wiki Activity

Bug 1329288: Allow content policy consumers to identify contentPolicy checks from docshell

Browse Source
This commit is contained in:
janekptacijarabaci
2018-04-22 20:38:02 +02:00
parent a38e87d455
commit 95c4608241
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolkit/modules/addons/WebRequestContent.js
+10
View File
@@ -80,6 +80,16 @@ var ContentPolicy = {
shouldLoad(policyType, contentLocation, requestOrigin,
node, mimeTypeGuess, extra, requestPrincipal) {
// Loads of TYPE_DOCUMENT and TYPE_SUBDOCUMENT perform a ConPol check
// within docshell as well as within the ContentSecurityManager. To avoid
// duplicate evaluations we ignore ConPol checks performed within docShell.
if (extra instanceof Ci.nsISupportsString) {
if (extra.data === "conPolCheckFromDocShell") {
return Ci.nsIContentPolicy.ACCEPT;
}
}
if (requestPrincipal &&
Services.scriptSecurityManager.isSystemPrincipal(requestPrincipal)) {
return Ci.nsIContentPolicy.ACCEPT;