From d87ca5f2ec613f862cce147ffb33107dda485ac1 Mon Sep 17 00:00:00 2001 From: Andrew Guertin Date: Mon, 10 Nov 2014 15:32:28 -0500 Subject: [PATCH 1/2] Enable the cors/ wpt subset Fixes #3781 --- tests/wpt/include.ini | 2 + tests/wpt/metadata/cors/allow-headers.htm.ini | 23 ++++++ tests/wpt/metadata/cors/basic.htm.ini | 5 ++ .../metadata/cors/credentials-flag.htm.ini | 3 + .../metadata/cors/late-upload-events.htm.ini | 8 ++ tests/wpt/metadata/cors/origin.htm.ini | 23 ++++++ .../wpt/metadata/cors/preflight-cache.htm.ini | 17 +++++ .../wpt/metadata/cors/redirect-origin.htm.ini | 56 ++++++++++++++ .../cors/redirect-preflight-2.htm.ini | 5 ++ .../metadata/cors/redirect-userinfo.htm.ini | 5 ++ tests/wpt/metadata/cors/remote-origin.htm.ini | 3 + .../wpt/metadata/cors/request-headers.htm.ini | 14 ++++ .../metadata/cors/response-headers.htm.ini | 47 ++++++++++++ .../wpt/metadata/cors/simple-requests.htm.ini | 74 +++++++++++++++++++ tests/wpt/metadata/cors/status-async.htm.ini | 53 +++++++++++++ .../metadata/cors/status-preflight.htm.ini | 50 +++++++++++++ tests/wpt/metadata/cors/status.htm.ini | 8 ++ 17 files changed, 396 insertions(+) create mode 100644 tests/wpt/metadata/cors/allow-headers.htm.ini create mode 100644 tests/wpt/metadata/cors/basic.htm.ini create mode 100644 tests/wpt/metadata/cors/credentials-flag.htm.ini create mode 100644 tests/wpt/metadata/cors/late-upload-events.htm.ini create mode 100644 tests/wpt/metadata/cors/origin.htm.ini create mode 100644 tests/wpt/metadata/cors/preflight-cache.htm.ini create mode 100644 tests/wpt/metadata/cors/redirect-origin.htm.ini create mode 100644 tests/wpt/metadata/cors/redirect-preflight-2.htm.ini create mode 100644 tests/wpt/metadata/cors/redirect-userinfo.htm.ini create mode 100644 tests/wpt/metadata/cors/remote-origin.htm.ini create mode 100644 tests/wpt/metadata/cors/request-headers.htm.ini create mode 100644 tests/wpt/metadata/cors/response-headers.htm.ini create mode 100644 tests/wpt/metadata/cors/simple-requests.htm.ini create mode 100644 tests/wpt/metadata/cors/status-async.htm.ini create mode 100644 tests/wpt/metadata/cors/status-preflight.htm.ini create mode 100644 tests/wpt/metadata/cors/status.htm.ini diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini index 55e1f50c925..42ca56505e8 100644 --- a/tests/wpt/include.ini +++ b/tests/wpt/include.ini @@ -85,3 +85,5 @@ skip: true skip: true [script_scheduling] skip: false +[cors] + skip: false diff --git a/tests/wpt/metadata/cors/allow-headers.htm.ini b/tests/wpt/metadata/cors/allow-headers.htm.ini new file mode 100644 index 00000000000..338f4dbbe81 --- /dev/null +++ b/tests/wpt/metadata/cors/allow-headers.htm.ini @@ -0,0 +1,23 @@ +[allow-headers.htm] + type: testharness + [Allow origin: *] + expected: FAIL + + [Allow origin: _*__] + expected: FAIL + + [Allow origin: [tab\]*] + expected: FAIL + + [Allow origin: undefined//undefined] + expected: FAIL + + [Allow origin: _undefined//undefined] + expected: FAIL + + [Allow origin: _undefined//undefined___[tab\]_] + expected: FAIL + + [Allow origin: [tab\]undefined//undefined] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/basic.htm.ini b/tests/wpt/metadata/cors/basic.htm.ini new file mode 100644 index 00000000000..21c462766aa --- /dev/null +++ b/tests/wpt/metadata/cors/basic.htm.ini @@ -0,0 +1,5 @@ +[basic.htm] + type: testharness + [Cross domain basic usage] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/credentials-flag.htm.ini b/tests/wpt/metadata/cors/credentials-flag.htm.ini new file mode 100644 index 00000000000..73ff35ab17c --- /dev/null +++ b/tests/wpt/metadata/cors/credentials-flag.htm.ini @@ -0,0 +1,3 @@ +[credentials-flag.htm] + type: testharness + expected: TIMEOUT diff --git a/tests/wpt/metadata/cors/late-upload-events.htm.ini b/tests/wpt/metadata/cors/late-upload-events.htm.ini new file mode 100644 index 00000000000..d5b211708c4 --- /dev/null +++ b/tests/wpt/metadata/cors/late-upload-events.htm.ini @@ -0,0 +1,8 @@ +[late-upload-events.htm] + type: testharness + [Late listeners: No preflight] + expected: FAIL + + [Late listeners: Preflight] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/origin.htm.ini b/tests/wpt/metadata/cors/origin.htm.ini new file mode 100644 index 00000000000..f22e263fbb2 --- /dev/null +++ b/tests/wpt/metadata/cors/origin.htm.ini @@ -0,0 +1,23 @@ +[origin.htm] + type: testharness + [Allow origin: *] + expected: FAIL + + [Allow origin: _*__] + expected: FAIL + + [Allow origin: [tab\]*] + expected: FAIL + + [Allow origin: undefined//undefined] + expected: FAIL + + [Allow origin: _undefined//undefined] + expected: FAIL + + [Allow origin: _undefined//undefined___[tab\]_] + expected: FAIL + + [Allow origin: [tab\]undefined//undefined] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/preflight-cache.htm.ini b/tests/wpt/metadata/cors/preflight-cache.htm.ini new file mode 100644 index 00000000000..c61b6a45bdc --- /dev/null +++ b/tests/wpt/metadata/cors/preflight-cache.htm.ini @@ -0,0 +1,17 @@ +[preflight-cache.htm] + type: testharness + [Test preflight] + expected: FAIL + + [preflight for x-print should be cached] + expected: FAIL + + [age = 0, should not be cached] + expected: FAIL + + [age = -1, should not be cached] + expected: FAIL + + [preflight first request, second from cache, wait, third should preflight again] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/redirect-origin.htm.ini b/tests/wpt/metadata/cors/redirect-origin.htm.ini new file mode 100644 index 00000000000..a25f2bb4f4d --- /dev/null +++ b/tests/wpt/metadata/cors/redirect-origin.htm.ini @@ -0,0 +1,56 @@ +[redirect-origin.htm] + type: testharness + [local (*) to remote (*), expect origin=undefined//undefined] + expected: FAIL + + [local (*) to remote (undefined//undefined), expect origin=undefined//undefined] + expected: FAIL + + [local (undefined//undefined) to remote (*), expect origin=undefined//undefined] + expected: FAIL + + [local (undefined//undefined) to remote (undefined//undefined), expect origin=undefined//undefined] + expected: FAIL + + [local (null) to remote (*), expect origin=undefined//undefined] + expected: FAIL + + [local (none) to remote (*), expect origin=undefined//undefined] + expected: FAIL + + [remote (*) to local (*), expect origin=null] + expected: FAIL + + [remote (*) to local (null), expect origin=null] + expected: FAIL + + [remote (undefined//undefined) to local (*), expect origin=null] + expected: FAIL + + [remote (undefined//undefined) to local (null), expect origin=null] + expected: FAIL + + [remote (*) to remote (*), expect origin=undefined//undefined] + expected: FAIL + + [remote (*) to remote (undefined//undefined), expect origin=undefined//undefined] + expected: FAIL + + [remote (undefined//undefined) to remote (*), expect origin=undefined//undefined] + expected: FAIL + + [remote (undefined//undefined) to remote (undefined//undefined), expect origin=undefined//undefined] + expected: FAIL + + [remote (*) to remote2 (*), expect origin=null] + expected: FAIL + + [remote (*) to remote2 (null), expect origin=null] + expected: FAIL + + [remote (undefined//undefined) to remote2 (*), expect origin=null] + expected: FAIL + + [remote (undefined//undefined) to remote2 (null), expect origin=null] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/redirect-preflight-2.htm.ini b/tests/wpt/metadata/cors/redirect-preflight-2.htm.ini new file mode 100644 index 00000000000..21e4a65c0a5 --- /dev/null +++ b/tests/wpt/metadata/cors/redirect-preflight-2.htm.ini @@ -0,0 +1,5 @@ +[redirect-preflight-2.htm] + type: testharness + [Same-origin custom-header request, redirect to cross-origin succeeds after doing a preflight] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/redirect-userinfo.htm.ini b/tests/wpt/metadata/cors/redirect-userinfo.htm.ini new file mode 100644 index 00000000000..c09a4c753b0 --- /dev/null +++ b/tests/wpt/metadata/cors/redirect-userinfo.htm.ini @@ -0,0 +1,5 @@ +[redirect-userinfo.htm] + type: testharness + [Allow redirect with userinfo (//@)] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/remote-origin.htm.ini b/tests/wpt/metadata/cors/remote-origin.htm.ini new file mode 100644 index 00000000000..7e23c184655 --- /dev/null +++ b/tests/wpt/metadata/cors/remote-origin.htm.ini @@ -0,0 +1,3 @@ +[remote-origin.htm] + type: testharness + expected: TIMEOUT diff --git a/tests/wpt/metadata/cors/request-headers.htm.ini b/tests/wpt/metadata/cors/request-headers.htm.ini new file mode 100644 index 00000000000..6cf0c04c833 --- /dev/null +++ b/tests/wpt/metadata/cors/request-headers.htm.ini @@ -0,0 +1,14 @@ +[request-headers.htm] + type: testharness + [basic request header] + expected: FAIL + + [Simple request headers need not be in allow-headers] + expected: FAIL + + [Strange allowheaders (case insensitive)] + expected: FAIL + + [INVALID_STATE_ERR on setRequestHeader after send()] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/response-headers.htm.ini b/tests/wpt/metadata/cors/response-headers.htm.ini new file mode 100644 index 00000000000..917fed7e41d --- /dev/null +++ b/tests/wpt/metadata/cors/response-headers.htm.ini @@ -0,0 +1,47 @@ +[response-headers.htm] + type: testharness + [getResponseHeader: Expose Access-Control-Expose-Headers (x-custom-header-comma)] + expected: FAIL + + [getResponseHeader: Expose second Access-Control-Expose-Headers (x-second-expose)] + expected: FAIL + + [getResponseHeader: Don\'t trim whitespace] + expected: FAIL + + [getResponseHeader: x-custom-header bytes] + expected: FAIL + + [getResponseHeader: Exposed server field readable (Date)] + expected: FAIL + + [getResponseHeader: Cache-Control: readable by default] + expected: FAIL + + [getResponseHeader: Content-Language: readable by default] + expected: FAIL + + [getResponseHeader: Expires: readable by default] + expected: FAIL + + [getResponseHeader: Last-Modified: readable by default] + expected: FAIL + + [getResponseHeader: Pragma: readable by default] + expected: FAIL + + [getResponseHeader: Server: unreadable by default] + expected: FAIL + + [getResponseHeader: X-Powered-By: unreadable by default] + expected: FAIL + + [getResponseHeader: Combined testing of cors response headers] + expected: FAIL + + [getResponse: don\'t expose x-nonexposed] + expected: FAIL + + [getAllResponseHeaders: don\'t expose x-nonexposed] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/simple-requests.htm.ini b/tests/wpt/metadata/cors/simple-requests.htm.ini new file mode 100644 index 00000000000..a77dd4d5c58 --- /dev/null +++ b/tests/wpt/metadata/cors/simple-requests.htm.ini @@ -0,0 +1,74 @@ +[simple-requests.htm] + type: testharness + [No preflight GET and {"Accept":"test"}] + expected: FAIL + + [No preflight HEAD and {"Accept":"test"}] + expected: FAIL + + [No preflight POST and {"Accept":"test"}] + expected: FAIL + + [No preflight GET and {"accept-language":"test"}] + expected: FAIL + + [No preflight HEAD and {"accept-language":"test"}] + expected: FAIL + + [No preflight POST and {"accept-language":"test"}] + expected: FAIL + + [No preflight GET and {"CONTENT-language":"test"}] + expected: FAIL + + [No preflight HEAD and {"CONTENT-language":"test"}] + expected: FAIL + + [No preflight POST and {"CONTENT-language":"test"}] + expected: FAIL + + [No preflight GET and {"Content-Type":"application/x-www-form-urlencoded"}] + expected: FAIL + + [No preflight HEAD and {"Content-Type":"application/x-www-form-urlencoded"}] + expected: FAIL + + [No preflight POST and {"Content-Type":"application/x-www-form-urlencoded"}] + expected: FAIL + + [No preflight GET and {"content-type":"multipart/form-data"}] + expected: FAIL + + [No preflight HEAD and {"content-type":"multipart/form-data"}] + expected: FAIL + + [No preflight POST and {"content-type":"multipart/form-data"}] + expected: FAIL + + [No preflight GET and {"content-type":"text/plain"}] + expected: FAIL + + [No preflight HEAD and {"content-type":"text/plain"}] + expected: FAIL + + [No preflight POST and {"content-type":"text/plain"}] + expected: FAIL + + [No preflight GET and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}] + expected: FAIL + + [No preflight HEAD and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}] + expected: FAIL + + [No preflight POST and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}] + expected: FAIL + + [No preflight Get and {"content-type":"text/plain; parameter=extra_bonus"}] + expected: FAIL + + [No preflight post and {"content-type":"text/plain"}] + expected: FAIL + + [Check simple headers (async)] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/status-async.htm.ini b/tests/wpt/metadata/cors/status-async.htm.ini new file mode 100644 index 00000000000..37b5f558b8e --- /dev/null +++ b/tests/wpt/metadata/cors/status-async.htm.ini @@ -0,0 +1,53 @@ +[status-async.htm] + type: testharness + [Status on GET 200] + expected: FAIL + + [Status on GET 201] + expected: FAIL + + [Status on GET 202] + expected: FAIL + + [Status on GET 203] + expected: FAIL + + [Status on GET 204] + expected: FAIL + + [Status on GET 205] + expected: FAIL + + [Status on GET 206] + expected: FAIL + + [Status on GET 209] + expected: FAIL + + [Status on GET 299] + expected: FAIL + + [Status on POST 200] + expected: FAIL + + [Status on HEAD 200] + expected: FAIL + + [Status on PUT 200] + expected: FAIL + + [Status on CHICKEN 200] + expected: FAIL + + [Status on GET 400] + expected: FAIL + + [Status on HEAD 401] + expected: FAIL + + [Status on POST 404] + expected: FAIL + + [Status on POST 500] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/status-preflight.htm.ini b/tests/wpt/metadata/cors/status-preflight.htm.ini new file mode 100644 index 00000000000..f6b79144a24 --- /dev/null +++ b/tests/wpt/metadata/cors/status-preflight.htm.ini @@ -0,0 +1,50 @@ +[status-preflight.htm] + type: testharness + [CORS - status after preflight on GET 200] + expected: FAIL + + [CORS - status after preflight on GET 204] + expected: FAIL + + [CORS - status after preflight on GET 400] + expected: FAIL + + [CORS - status after preflight on GET 401] + expected: FAIL + + [CORS - status after preflight on HEAD 200] + expected: FAIL + + [CORS - status after preflight on HEAD 204] + expected: FAIL + + [CORS - status after preflight on HEAD 400] + expected: FAIL + + [CORS - status after preflight on HEAD 401] + expected: FAIL + + [CORS - status after preflight on HEAD 501] + expected: FAIL + + [CORS - status after preflight on HEAD 699] + expected: FAIL + + [CORS - status after preflight on POST 204] + expected: FAIL + + [CORS - status after preflight on POST 400] + expected: FAIL + + [CORS - status after preflight on POST 401] + expected: FAIL + + [CORS - status after preflight on POST 404] + expected: FAIL + + [CORS - status after preflight on PUT 699] + expected: FAIL + + [CORS - status after preflight on CHICKEN 501] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/status.htm.ini b/tests/wpt/metadata/cors/status.htm.ini new file mode 100644 index 00000000000..f8ff634de40 --- /dev/null +++ b/tests/wpt/metadata/cors/status.htm.ini @@ -0,0 +1,8 @@ +[status.htm] + type: testharness + [3. CORS allowed, response status 400.] + expected: FAIL + + [4. CORS allowed, preflight status 200, response status 400.] + expected: FAIL + From 468fae89143772527d9b652aba7bd85719a83e01 Mon Sep 17 00:00:00 2001 From: Andrew Guertin Date: Tue, 11 Nov 2014 09:40:51 -0500 Subject: [PATCH 2/2] Change /cors/remote-origin.htm.ini to CRASH --- tests/wpt/metadata/cors/remote-origin.htm.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/wpt/metadata/cors/remote-origin.htm.ini b/tests/wpt/metadata/cors/remote-origin.htm.ini index 7e23c184655..2d9f7dcbcd2 100644 --- a/tests/wpt/metadata/cors/remote-origin.htm.ini +++ b/tests/wpt/metadata/cors/remote-origin.htm.ini @@ -1,3 +1,3 @@ [remote-origin.htm] type: testharness - expected: TIMEOUT + expected: CRASH