Skip to content

Commit

Permalink
Revert "Modify errors from try server,"
Browse files Browse the repository at this point in the history
This reverts commit 05e8454.

This appears to have been an accident, see
#7531 (comment)
  • Loading branch information
foolip committed Oct 5, 2017
1 parent 2f8a988 commit 52611a2
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 0 deletions.
47 changes: 47 additions & 0 deletions cookies/secure/set-from-dom.sub.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!doctype html>
<html>
<head>
<meta charset=utf-8>
<title>Set 'secure' cookie from `document.cookie` on a non-secure page</title>
<meta name=help href="https://tools.ietf.org/html/draft-west-leave-secure-cookies-alone">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/cookies/resources/testharness-helpers.js"></script>
</head>
<body>
<div id=log></div>
<script>
var tests = [
[
"'secure' cookie not set in `document.cookie`",
function () {
var originalCookie = document.cookie;
document.cookie = "secure_from_nonsecure_dom=1; secure; path=/";
assert_equals(document.cookie, originalCookie);
this.done();
}
],
[
"'secure' cookie not sent in HTTP request",
function () {
document.cookie = "secure_from_nonsecure_dom=1; secure; path=/";
fetch("https://{{host}}:{{ports[https][0]}}/cookies/resources/echo-json.py", { "credentials": "include" })
.then(this.step_func(function (r) {
return r.json();
}))
.then(this.step_func_done(function (j) {
assert_equals(j["secure_from_nonsecure_dom"], undefined);
}));
}
]
];

function clearKnownCookie() {
document.cookie = "secure_from_nonsecure_dom=0; Secure; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/";
}

executeTestsSerially(tests, clearKnownCookie, clearKnownCookie);
</script>
</body>
</html>

36 changes: 36 additions & 0 deletions cookies/secure/set-from-http.sub.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!doctype html>
<html>
<head>
<meta charset=utf-8>
<title>Set 'secure' cookie from `Set-Cookie` HTTP header on a non-secure page</title>
<meta name=help href="https://tools.ietf.org/html/draft-west-leave-secure-cookies-alone">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/cookies/resources/testharness-helpers.js"></script>
</head>
<body>
<div id=log></div>
<script>
function clearKnownCookie() {
document.cookie = "secure_from_nonsecure_http=0; Secure; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/";
}

test(function () {
assert_equals(document.cookie.match(/secure_from_nonsecure_http=1/), null);
}, "'secure' cookie not present in `document.cookie`");

promise_test(function (t) {
t.add_cleanup(clearKnownCookie);
return fetch("https://{{host}}:{{ports[https][0]}}/cookies/resources/echo-json.py",
{ "credentials": "include" })
.then(function (r) {
return r.json();
})
.then(function (j) {
assert_equals(j["secure_from_nonsecure_http"], undefined);
});
}, "'secure' cookie not sent in HTTP request");
</script>
</body>
</html>

0 comments on commit 52611a2

Please sign in to comment.