Index: third_party/WebKit/LayoutTests/http/tests/security/suborigins/suborigin-unsafe-cookies.php |
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/suborigins/suborigin-unsafe-cookies.php b/third_party/WebKit/LayoutTests/http/tests/security/suborigins/suborigin-unsafe-cookies.php |
index e78f671a2662ac722b2b4ec908cb569ca25e0edd..3ce36709dea0a857729bceb248e2edc5b21bc04f 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/security/suborigins/suborigin-unsafe-cookies.php |
+++ b/third_party/WebKit/LayoutTests/http/tests/security/suborigins/suborigin-unsafe-cookies.php |
@@ -1,106 +1,120 @@ |
<?php |
setcookie("test_cookie", "a_value"); |
-header("Suborigin: foobar 'unsafe-cookies';"); |
+header("Suborigin: foobar 'unsafe-cookies'"); |
?> |
<!DOCTYPE html> |
<html> |
<head> |
+<meta charset="utf-8"> |
<script src="/resources/testharness.js"></script> |
<script src="/resources/testharnessreport.js"></script> |
</head> |
<body> |
<script> |
test(t => { |
- assert_equals(document.cookie, "test_cookie=a_value"); |
- document.cookie = "foo=bar"; |
- assert_equals(document.cookie, "test_cookie=a_value; foo=bar"); |
+ assert_equals(document.cookie, 'test_cookie=a_value'); |
+ document.cookie = 'foo=bar'; |
+ assert_equals(document.cookie, 'test_cookie=a_value; foo=bar'); |
t.done(); |
-}, "Document is not cookie-averse"); |
+ }, 'Document is not cookie-averse'); |
test(t => { |
Object.defineProperties(document, { |
- "cookie": { |
- get: function() { return this.x; }, |
- set: function(x) { this.x = x; } |
+ 'cookie': { |
+ get: function() { return this.x; }, |
+ set: function(x) { this.x = x; } |
} |
- }); |
+ }); |
- document.cookie = "foo"; |
- assert_equals(document.cookie, "foo"); |
+ document.cookie = 'foo'; |
+ assert_equals(document.cookie, 'foo'); |
delete document.cookie; |
t.done(); |
-}, "Document getters and setters still work"); |
+ }, 'Document getters and setters still work'); |
async_test(t => { |
window.addEventListener('message', function(event) { |
- if (event.data.test_name != "iframetest") |
- return; |
+ if (event.data.test_name != 'iframetest') |
+ return; |
var cookie_val = event.data.cookie_val; |
- assert_equals(cookie_val, "test_cookie=a_value; foo=bar"); |
+ assert_equals(cookie_val, 'test_cookie=a_value; foo=bar'); |
t.done(); |
- }); |
+ }); |
var iframe = document.createElement('iframe'); |
- iframe.src = "resources/post-document-cookie.php?testname=iframetest"; |
+ iframe.src = 'resources/post-document-cookie.php?testname=iframetest'; |
document.body.appendChild(iframe); |
-}, "Cookies set in a frame with a regular, same-origin src modify the suborigin's document.cookie"); |
- |
-function makeIframeString(test_name) { |
- var postMessageContent = "{cookie_val: document.cookie, test_name: '" + test_name + "'}"; |
- return "document.cookie = 'foo=bar'; window.parent.postMessage(" + postMessageContent + ", '*')"; |
+ }, |
+ 'Cookies set in a frame with a regular, same-origin src modify the ' + |
+ 'suborigin\'s document.cookie'); |
+ |
+function make_iframe_string(test_name) { |
+ var post_message_content = '{cookie_val: document.cookie, ' + |
+ 'test_name: \'' + test_name + '\'}'; |
+ return 'document.cookie = \'foo=bar\'; window.parent.postMessage(' + |
+ post_message_content + ', \'*\')'; |
} |
async_test(t => { |
window.addEventListener('message', function(event) { |
- if (event.data.test_name != "about:blanktest") |
- return; |
+ if (event.data.test_name != 'about:blanktest') |
+ return; |
- assert_equals(event.data.cookie_val, "test_cookie=a_value; foo=bar"); |
+ assert_equals(event.data.cookie_val, 'test_cookie=a_value; foo=bar'); |
t.done(); |
- }); |
+ }); |
var iframe = document.createElement('iframe'); |
- iframe.src = "about:blank"; |
+ iframe.src = 'about:blank'; |
iframe.onload = function() { |
- var script = iframe.contentWindow.document.createElement("script"); |
- script.innerHTML = makeIframeString("about:blanktest"); |
- iframe.contentWindow.document.body.appendChild(script); |
+ var script = iframe.contentWindow.document.createElement('script'); |
+ script.innerHTML = make_iframe_string('about:blanktest'); |
+ iframe.contentWindow.document.body.appendChild(script); |
}; |
document.body.appendChild(iframe); |
-}, "Cookies set in an about:blank frame modify the suborigin's document.cookie and also have the same document.cookie"); |
+ }, |
+ 'Cookies set in an about:blank frame modify the suborigin\'s ' + |
+ 'document.cookie and also have the same document.cookie'); |
+// TODO(jww): Re-enabled this test after https://crbug.com/649893 is addressed. |
+/* |
async_test(t => { |
window.addEventListener('message', function(event) { |
- if (event.data.test_name != "blob:test") |
+ if (event.data.test_name != 'blob:test') |
return; |
- assert_equals(event.data.cookie_val, ""); |
+ assert_equals(event.data.cookie_val, ''); |
t.done(); |
}); |
var iframe = document.createElement('iframe'); |
- var script = "<" + "script>" + makeIframeString("blob:test") + "<" + "/script>"; |
+ var script = '<' + 'script>' + make_iframe_string('blob:test') + '<' + '/script>'; |
var blob = new Blob([script], {type: 'text/html'}); |
iframe.src = URL.createObjectURL(blob); |
document.body.appendChild(iframe); |
-}, "Cookies set in a blob: frame do not modify the suborigin's document.cookie and also have an empty document.cookie (blobs are still different origin)"); |
+ }, |
+ 'Cookies set in a blob: frame do not modify the suborigin\'s ' + |
+ 'document.cookie and also have an empty document.cookie (blobs are still different origin)'); |
+*/ |
async_test(t => { |
window.addEventListener('message', function(event) { |
- if (event.data.test_name != "srcdoc:test") |
- return; |
+ if (event.data.test_name != 'srcdoc:test') |
+ return; |
- assert_equals(event.data.cookie_val, "test_cookie=a_value; foo=bar"); |
+ assert_equals(event.data.cookie_val, 'test_cookie=a_value; foo=bar'); |
t.done(); |
- }); |
+ }); |
var iframe = document.createElement('iframe'); |
- var script = "<" + "script>" + makeIframeString("srcdoc:test") + "<" + "/script>"; |
- iframe.srcdoc = "srcdoc:" + script; |
+ var script = '<' + 'script>' + make_iframe_string('srcdoc:test') + |
+ '<' + '/script>'; |
+ iframe.srcdoc = 'srcdoc:' + script; |
document.body.appendChild(iframe); |
-}, "Cookies set in a srcdoc frame modify the suborigin's document.cookie and also have the same document.cookie"); |
- |
+ }, |
+ 'Cookies set in a srcdoc frame modify the suborigin\'s ' + |
+ 'document.cookie and also have the same document.cookie'); |
</script> |
</body> |
</html> |