зеркало из https://github.com/mozilla/gecko-dev.git
Bug 909029 - Fix incorrect parsing of CSP source list due to early return
This commit is contained in:
Garrett Robinson
Родитель
2f7940fb2e
Коммит
0307595a6f
|
|
@ -986,7 +986,6 @@ CSPSourceList.fromString = function(aStr, aCSPRep, self, enforceSelfChecks) {
|
|||
// if a source is a *, then we can permit all sources
|
||||
if (src.permitAll) {
|
||||
slObj._permitAllSources = true;
|
||||
return slObj;
|
||||
} else {
|
||||
slObj._sources.push(src);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<!-- file_CSP.sjs mocks a resource load -->
|
||||
<link rel='stylesheet' type='text/css'
|
||||
href='file_CSP.sjs?testid=noneExternalStylesBlocked&type=text/css' />
|
||||
</head>
|
||||
<body>
|
||||
<p id="inline-style">This should be green</p>
|
||||
<p id="inline-script">This should be black</p>
|
||||
<style>
|
||||
p#inline-style { color:rgb(0, 128, 0); }
|
||||
</style>
|
||||
<script>
|
||||
// Use inline script to set a style attribute
|
||||
document.getElementById("inline-script").style.color = "rgb(0, 128, 0)";
|
||||
</script>
|
||||
<img src="file_CSP.sjs?testid=noneExternalImgLoaded&type=img/png" />
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1 @@
|
|||
Content-Security-Policy: default-src * ; style-src 'none' 'unsafe-inline';
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<link rel='stylesheet' type='text/css'
|
||||
href='file_CSP.sjs?testid=starExternalStylesLoaded&type=text/css' />
|
||||
</head>
|
||||
<body>
|
||||
<p id="inline-style">This should be green</p>
|
||||
<p id="inline-script">This should be black</p>
|
||||
<style>
|
||||
p#inline-style { color:rgb(0, 128, 0); }
|
||||
</style>
|
||||
<script>
|
||||
// Use inline script to set a style attribute
|
||||
document.getElementById("inline-script").style.color = "rgb(0, 128, 0)";
|
||||
</script>
|
||||
<img src="file_CSP.sjs?testid=starExternalImgLoaded&type=img/png" />
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1 @@
|
|||
Content-Security-Policy: default-src *; style-src * 'unsafe-inline';
|
||||
|
|
@ -78,6 +78,10 @@ support-files =
|
|||
file_CSP_bug910139.sjs
|
||||
file_CSP_bug910139.xml
|
||||
file_CSP_bug910139.xsl
|
||||
file_CSP_bug909029_star.html
|
||||
file_CSP_bug909029_star.html^headers^
|
||||
file_CSP_bug909029_none.html
|
||||
file_CSP_bug909029_none.html^headers^
|
||||
|
||||
[test_CSP.html]
|
||||
[test_CSP_bug663567.html]
|
||||
|
|
@ -94,3 +98,4 @@ support-files =
|
|||
[test_bug836922_npolicies.html]
|
||||
[test_csp_redirects.html]
|
||||
[test_CSP_bug910139.html]
|
||||
[test_CSP_bug909029.html]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,140 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Bug 909029 - CSP source-lists ignore some source expressions like 'unsafe-inline' when * or 'none' are used (e.g., style-src, script-src)</title>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id=content style="visibility:hidden">
|
||||
<iframe id=testframe1></iframe>
|
||||
<iframe id=testframe2></iframe>
|
||||
</div>
|
||||
<script class="testbody" type="text/javascript">
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
|
||||
window.tests = {
|
||||
starExternalStylesLoaded: -1,
|
||||
starExternalImgLoaded: -1,
|
||||
noneExternalStylesBlocked: -1,
|
||||
noneExternalImgLoaded: -1,
|
||||
starInlineStyleAllowed: -1,
|
||||
starInlineScriptBlocked: -1,
|
||||
noneInlineStyleAllowed: -1,
|
||||
noneInlineScriptBlocked: -1
|
||||
}
|
||||
|
||||
function examiner() {
|
||||
SpecialPowers.addObserver(this, "csp-on-violate-policy", false);
|
||||
SpecialPowers.addObserver(this, "http-on-modify-request", false);
|
||||
}
|
||||
examiner.prototype = {
|
||||
observe: function(subject, topic, data) {
|
||||
// subject should be an nsURI, and should be either allowed or blocked.
|
||||
if (!SpecialPowers.can_QI(subject))
|
||||
return;
|
||||
|
||||
var testpat = new RegExp("testid=([a-zA-Z]+)");
|
||||
|
||||
if (topic === "http-on-modify-request") {
|
||||
//these things were allowed by CSP
|
||||
var asciiSpec = SpecialPowers.getPrivilegedProps(SpecialPowers.do_QueryInterface(subject, "nsIHttpChannel"), "URI.asciiSpec");
|
||||
if (!testpat.test(asciiSpec))
|
||||
return;
|
||||
var testid = testpat.exec(asciiSpec)[1];
|
||||
window.testResult(testid,
|
||||
/Loaded/.test(testid),
|
||||
"resource loaded");
|
||||
}
|
||||
|
||||
if(topic === "csp-on-violate-policy") {
|
||||
// these were blocked... record that they were blocked
|
||||
// try because the subject could be an nsIURI or an nsISupportsCString
|
||||
try {
|
||||
var asciiSpec = SpecialPowers.getPrivilegedProps(SpecialPowers.do_QueryInterface(subject, "nsIURI"), "asciiSpec");
|
||||
if (!testpat.test(asciiSpec)) return;
|
||||
var testid = testpat.exec(asciiSpec)[1];
|
||||
window.testResult(testid,
|
||||
/Blocked/.test(testid),
|
||||
"resource blocked by CSP");
|
||||
} catch(e) {
|
||||
// if that fails, the subject is probably a string. Strings are only
|
||||
// reported for inline and eval violations. Since we are testing those
|
||||
// via the observed effects of script on CSSOM, we can simply ignore
|
||||
// these subjects.
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// must eventually call this to remove the listener,
|
||||
// or mochitests might get borked.
|
||||
remove: function() {
|
||||
SpecialPowers.removeObserver(this, "csp-on-violate-policy");
|
||||
SpecialPowers.removeObserver(this, "http-on-modify-request");
|
||||
}
|
||||
}
|
||||
|
||||
window.examiner = new examiner();
|
||||
|
||||
window.testResult = function(testname, result, msg) {
|
||||
//dump("in testResult: testname = " + testname + "\n");
|
||||
|
||||
//test already complete.... forget it... remember the first result.
|
||||
if (window.tests[testname] != -1)
|
||||
return;
|
||||
|
||||
window.tests[testname] = result;
|
||||
is(result, true, testname + ' test: ' + msg);
|
||||
|
||||
// if any test is incomplete, keep waiting
|
||||
for (var v in window.tests)
|
||||
if(tests[v] == -1)
|
||||
return;
|
||||
|
||||
// ... otherwise, finish
|
||||
window.examiner.remove();
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
// Helpers for inline script/style checks
|
||||
var black = 'rgb(0, 0, 0)';
|
||||
var green = 'rgb(0, 128, 0)';
|
||||
function getElementColorById(doc, id) {
|
||||
return window.getComputedStyle(doc.contentDocument.getElementById(id)).color;
|
||||
}
|
||||
|
||||
function checkInlineWithStar() {
|
||||
var testframe = document.getElementById('testframe1');
|
||||
window.testResult("starInlineStyleAllowed",
|
||||
getElementColorById(testframe, 'inline-style') === green,
|
||||
"Inline styles should be allowed (style-src 'unsafe-inline' with star)");
|
||||
window.testResult("starInlineScriptBlocked",
|
||||
getElementColorById(testframe, 'inline-script') === black,
|
||||
"Inline scripts should be blocked (style-src 'unsafe-inline' with star)");
|
||||
}
|
||||
|
||||
function checkInlineWithNone() {
|
||||
// If a directive has 'none' in addition to other sources, 'none' is ignored
|
||||
// and the other sources are used. 'none' is only a valid source if it is
|
||||
// used by itself.
|
||||
var testframe = document.getElementById('testframe2');
|
||||
window.testResult("noneInlineStyleAllowed",
|
||||
getElementColorById(testframe, 'inline-style') === green,
|
||||
"Inline styles should be allowed (style-src 'unsafe-inline' with none)");
|
||||
window.testResult("noneInlineScriptBlocked",
|
||||
getElementColorById(testframe, 'inline-script') === black,
|
||||
"Inline scripts should be blocked (style-src 'unsafe-inline' with none)");
|
||||
}
|
||||
|
||||
SpecialPowers.pushPrefEnv(
|
||||
{'set':[["security.csp.speccompliant", true]]},
|
||||
function () {
|
||||
document.getElementById('testframe1').src = 'file_CSP_bug909029_star.html';
|
||||
document.getElementById('testframe1').addEventListener('load', checkInlineWithStar, false);
|
||||
document.getElementById('testframe2').src = 'file_CSP_bug909029_none.html';
|
||||
document.getElementById('testframe2').addEventListener('load', checkInlineWithNone, false);
|
||||
}
|
||||
);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -209,6 +209,7 @@
|
|||
"content/base/test/csp/test_CSP.html":"observer not working",
|
||||
"content/base/test/csp/test_bug836922_npolicies.html":"observer not working",
|
||||
"content/base/test/csp/test_CSP_bug916446.html":"observer not working",
|
||||
"content/base/test/csp/test_CSP_bug909029.html":"observer not working",
|
||||
|
||||
"content/base/test/test_CrossSiteXHR_origin.html":"https not working, bug 907770",
|
||||
"content/base/test/test_plugin_freezing.html":"",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче