Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 00:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 06b855d93dad (bug 1660452) for causing failures on test_bug1660452_https.html. CLOSED TREE

Browse Source
This commit is contained in:
Csoregi Natalia 2021-07-22 19:30:49 +03:00
parent 09f9646233
commit 91127acdb7
4 changed files with 1 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/base/nsGlobalWindowOuter.cpp
View File

@ -1889,14 +1889,7 @@ bool nsGlobalWindowOuter::ComputeIsSecureContext(Document* aDocument,
}
if (principal->GetIsNullPrincipal()) {
// If the NullPrincipal has a valid precursor URI we want to use it to
// construct the principal otherwise we fall back to the original document
// URI.
nsCOMPtr<nsIPrincipal> precursorPrin = principal->GetPrecursorPrincipal();
nsCOMPtr<nsIURI> uri = precursorPrin ? precursorPrin->GetURI() : nullptr;
if (!uri) {
uri = aDocument->GetOriginalURI();
}
nsCOMPtr<nsIURI> uri = aDocument->GetOriginalURI();
// IsOriginPotentiallyTrustworthy doesn't care about origin attributes so
// it doesn't actually matter what we use here, but reusing the document
// principal's attributes is convenient.

3
dom/security/test/general/mochitest.ini
View File

@ -64,6 +64,3 @@ support-files = file_xfo_error_page.sjs
support-files =
file_meta_referrer_in_head.html
file_meta_referrer_notin_head.html
[test_bug1660452_http.html]
[test_bug1660452_https.html]
scheme = https

39
dom/security/test/general/test_bug1660452_http.html
View File

@ -1,39 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 1660452: NullPrincipals need to know whether they were spun off of a Secure Context</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
ok(!window.isSecureContext, "top level should not be a secure context");
// eslint-disable-next-line
let newWin = window.open("data:text/html,<script><"+"/script>");
ok(!newWin.isSecureContext, "data uri window should not be a secure context");
newWin.close();
window.addEventListener("message", (event) => {
ok(!event.data.isSecureContext, "data uri frames should not be a secure context");
if(event.data.finish) {
SimpleTest.finish();
return;
}
let f2 = document.createElement("iframe");
// eslint-disable-next-line
f2.src = "data:text/html,<iframe src=\"data:text/html,<script>parent.parent.postMessage({isSecureContext: window.isSecureContext, finish: true}, 'http://mochi.test:8888');<"+"/script>\"></iframe>";
document.body.appendChild(f2);
});
let f = document.createElement("iframe");
// eslint-disable-next-line
f.src = "data:text/html,<script>parent.postMessage({isSecureContext: window.isSecureContext}, 'http://mochi.test:8888');<"+"/script>";
document.body.appendChild(f);
</script>
</body>
</html>

39
dom/security/test/general/test_bug1660452_https.html
View File

@ -1,39 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 1660452: NullPrincipals need to know whether they were spun off of a Secure Context</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
ok(window.isSecureContext, "top level should be a secure context");
// eslint-disable-next-line
let newWin = window.open("data:text/html,<script><"+"/script>");
ok(newWin.isSecureContext, "data uri window should be a secure context");
newWin.close();
window.addEventListener("message", (event) => {
ok(event.data.isSecureContext, "data uri frames should be a secure context");
if(event.data.finish) {
SimpleTest.finish();
return;
}
let f2 = document.createElement("iframe");
// eslint-disable-next-line
f2.src = "data:text/html,<iframe src=\"data:text/html,<script>parent.parent.postMessage({isSecureContext: window.isSecureContext, finish: true}, 'https://example.com');<"+"/script>\"></iframe>";
document.body.appendChild(f2);
});
let f = document.createElement("iframe");
// eslint-disable-next-line
f.src = "data:text/html,<script>parent.postMessage({isSecureContext: window.isSecureContext}, 'https://example.com');<"+"/script>";
document.body.appendChild(f);
</script>
</body>
</html>