зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1370468 - frame-ancestor tests added for userpass r=ckerschb,fkiefer
MozReview-Commit-ID: 4wW24JnxaKh --HG-- extra : rebase_source : b926ea06208c1fbd91fe1a9fdee100f8cb21e8d1
This commit is contained in:
vinoth
Родитель
ab63775b86
Коммит
9d7a2186b4
|
|
@ -0,0 +1,10 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>CSP frame ancestors tests</title>
|
||||
</head>
|
||||
<body>
|
||||
<tt>Nested Frames</tt><br/>
|
||||
<iframe src='http://sampleuser:samplepass@mochi.test:8888/tests/dom/security/test/csp/file_frameancestors_userpass_frame_a.html'></iframe><br/>
|
||||
<iframe src='http://sampleuser:samplepass@example.com/tests/dom/security/test/csp/file_frameancestors_userpass_frame_b.html'></iframe><br/>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>Nested frame</title>
|
||||
<script>
|
||||
parent.parent.postMessage({call: "frameLoaded", testname: "frame_a", uri: window.location.toString()}, "*");
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<tt>IFRAME A</tt><br/>
|
||||
<iframe src='http://sampleuser:samplepass@mochi.test:8888/tests/dom/security/test/csp/file_frameancestors_userpass_frame_c.html'></iframe><br/>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>Nested frame</title>
|
||||
<script>
|
||||
parent.parent.postMessage({call: "frameLoaded", testname: "frame_b", uri: window.location.toString()}, "*");
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<tt>IFRAME B</tt><br/>
|
||||
<iframe src='http://sampleuser:samplepass@example.com/tests/dom/security/test/csp/file_frameancestors_userpass_frame_d.html'></iframe><br/>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>Nested frame</title>
|
||||
</head>
|
||||
<body>
|
||||
Nested frame C content
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1 @@
|
|||
Content-Security-Policy: default-src 'none'; frame-ancestors http://mochi.test:8888/ ; script-src 'self';
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>Nested frame</title>
|
||||
</head>
|
||||
<body>
|
||||
Nested frame D content
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1 @@
|
|||
Content-Security-Policy: default-src 'none'; frame-ancestors http://sampleuser:samplepass@example.com/ ; script-src 'self';
|
||||
|
|
@ -31,6 +31,13 @@ support-files =
|
|||
file_frameancestors_main.html
|
||||
file_frameancestors_main.js
|
||||
file_frameancestors.sjs
|
||||
file_frameancestors_userpass.html
|
||||
file_frameancestors_userpass_frame_a.html
|
||||
file_frameancestors_userpass_frame_b.html
|
||||
file_frameancestors_userpass_frame_c.html
|
||||
file_frameancestors_userpass_frame_c.html^headers^
|
||||
file_frameancestors_userpass_frame_d.html
|
||||
file_frameancestors_userpass_frame_d.html^headers^
|
||||
file_inlinescript.html
|
||||
file_inlinestyle_main.html
|
||||
file_inlinestyle_main.html^headers^
|
||||
|
|
@ -238,6 +245,7 @@ support-files =
|
|||
[test_bug888172.html]
|
||||
[test_evalscript.html]
|
||||
[test_frameancestors.html]
|
||||
[test_frameancestors_userpass.html]
|
||||
skip-if = toolkit == 'android' # Times out, not sure why (bug 1008445)
|
||||
[test_inlinescript.html]
|
||||
[test_inlinestyle.html]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,141 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<title>Test for Userpass in Frame Ancestors directive</title>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
</div>
|
||||
<iframe style="width:100%;height:300px;" id='cspframe'></iframe>
|
||||
<script class="testbody" type="text/javascript">
|
||||
|
||||
// These are test results: -1 means it hasn't run,
|
||||
// true/false is the pass/fail result.
|
||||
var framesThatShouldLoad = {
|
||||
frame_a: -1, /* frame a allowed */
|
||||
frame_b: -1, /* frame b allowed */
|
||||
};
|
||||
|
||||
// Number of tests that pass for this file should be 1
|
||||
var expectedViolationsLeft = 1;
|
||||
|
||||
// This is used to watch the blocked data bounce off CSP and allowed data
|
||||
// get sent out to the wire.
|
||||
function examiner() {
|
||||
SpecialPowers.addObserver(this, "csp-on-violate-policy");
|
||||
}
|
||||
examiner.prototype = {
|
||||
observe: function(subject, topic, data) {
|
||||
// subject should be an nsURI... though could be null since CSP
|
||||
// prohibits cross-origin URI reporting during frame ancestors checks.
|
||||
if (subject && !SpecialPowers.can_QI(subject))
|
||||
return;
|
||||
|
||||
var asciiSpec = subject;
|
||||
|
||||
try {
|
||||
asciiSpec = SpecialPowers.getPrivilegedProps(
|
||||
SpecialPowers.do_QueryInterface(subject, "nsIURI"),
|
||||
"asciiSpec");
|
||||
|
||||
// skip checks on the test harness -- can't do this skipping for
|
||||
// cross-origin blocking since the observer doesn't get the URI. This
|
||||
// can cause this test to over-succeed (but only in specific cases).
|
||||
if (asciiSpec.includes("test_frameancestors_userpass.html")) {
|
||||
return;
|
||||
}
|
||||
} catch (ex) {
|
||||
// was not an nsIURI, so it was probably a cross-origin report.
|
||||
}
|
||||
|
||||
|
||||
if (topic === "csp-on-violate-policy") {
|
||||
//these were blocked... record that they were blocked
|
||||
window.frameBlocked(asciiSpec, data);
|
||||
}
|
||||
},
|
||||
|
||||
// must eventually call this to remove the listener,
|
||||
// or mochitests might get borked.
|
||||
remove: function() {
|
||||
SpecialPowers.removeObserver(this, "csp-on-violate-policy");
|
||||
}
|
||||
}
|
||||
|
||||
// called when a frame is loaded
|
||||
// -- if it's not enumerated above, it should not load!
|
||||
var frameLoaded = function(testname, uri) {
|
||||
//test already complete.... forget it... remember the first result.
|
||||
if (window.framesThatShouldLoad[testname] != -1)
|
||||
return;
|
||||
|
||||
if (typeof window.framesThatShouldLoad[testname] === 'undefined') {
|
||||
// uh-oh, we're not expecting this frame to load!
|
||||
ok(false, testname + ' framed site should not have loaded: ' + uri);
|
||||
} else {
|
||||
//Check if @ symbol is there in URI.
|
||||
if (uri.includes('@')) {
|
||||
ok(false, ' URI contains userpass. Fetched URI is ' + uri);
|
||||
} else {
|
||||
framesThatShouldLoad[testname] = true;
|
||||
ok(true, ' URI doesn\'t contain userpass. Fetched URI is ' + uri);
|
||||
}
|
||||
}
|
||||
checkTestResults();
|
||||
}
|
||||
|
||||
// called when a frame is blocked
|
||||
// -- we can't determine *which* frame was blocked, but at least we can count them
|
||||
var frameBlocked = function(uri, policy) {
|
||||
|
||||
//Check if @ symbol is there in URI or in csp policy.
|
||||
if (policy.includes('@') || uri.includes('@')) {
|
||||
ok(false, ' a CSP policy blocked frame from being loaded. But contains' +
|
||||
' userpass. Policy is: ' + policy + ';URI is: ' + uri );
|
||||
} else {
|
||||
ok(true, ' a CSP policy blocked frame from being loaded. Doesn\'t contain'+
|
||||
' userpass. Policy is: ' + policy + ';URI is: ' + uri );
|
||||
}
|
||||
expectedViolationsLeft--;
|
||||
checkTestResults();
|
||||
}
|
||||
|
||||
|
||||
// Check to see if all the tests have run
|
||||
var checkTestResults = function() {
|
||||
// if any test is incomplete, keep waiting
|
||||
for (var v in framesThatShouldLoad)
|
||||
if(window.framesThatShouldLoad[v] == -1)
|
||||
return;
|
||||
|
||||
if (window.expectedViolationsLeft > 0)
|
||||
return;
|
||||
|
||||
// ... otherwise, finish
|
||||
window.examiner.remove();
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
window.addEventListener("message", receiveMessage);
|
||||
|
||||
function receiveMessage(event) {
|
||||
if (event.data.call && event.data.call == 'frameLoaded')
|
||||
frameLoaded(event.data.testname, event.data.uri);
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// set up and go
|
||||
window.examiner = new examiner();
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
|
||||
// save this for last so that our listeners are registered.
|
||||
// ... this loads the testbed of good and bad requests.
|
||||
document.getElementById('cspframe').src = 'file_frameancestors_userpass.html';
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -802,6 +802,8 @@ TEST(CSPParser, GoodGeneratedPolicies)
|
|||
"frame-ancestors http://a.b.c.d.e.f.g.h.i.j.k.l.x.com" },
|
||||
{ "frame-ancestors https://self.com:34",
|
||||
"frame-ancestors https://self.com:34" },
|
||||
{ "frame-ancestors http://sampleuser:samplepass@example.com",
|
||||
"frame-ancestors 'none'" },
|
||||
{ "default-src 'none'; frame-ancestors 'self'",
|
||||
"default-src 'none'; frame-ancestors http://www.selfuri.com" },
|
||||
{ "frame-ancestors http://self:80",
|
||||
|
|
@ -1132,4 +1134,3 @@ TEST(CSPParser, FuzzyPoliciesIncDirLimASCII)
|
|||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче