Skip to content

GitLab

T
tangled
Commit efaa1992 authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot
Browse files
Options

[WPT/referrer-policy] Move delivery_type control out of test_expansion 

A subsequent CL [1] will introduce `delivery_type_schema`
that controls relationship between source contexts,
subresource types, and delivery types.

As a preparation, this CL removes the restriction on `delivery_type`
specified in `elements-not-supporting-attr-referrer`,
`elements-not-supporting-rel-noreferrer`, and
`test_expansion` entries, that will be replaced by
`delivery_type_schema` in [1].

Generated files will be updated after some more changes, not now.
Also, changes needed in JavaScripts to handle new generated values
are not included in this CL and will land later.

Just after this CL, the generator produces more files than before
due to lack of `delivery_type_schema`, but this will be fixed
by [1].

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1586548

Bug: 906850
Change-Id: I3d6ecfc6fc377864884f367ba554c2a7fafac671
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717535
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarKenichi Ishibashi <bashi@chromium.org>
Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681098}
parent b68dea23
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 213 deletions
third_party/blink/web_tests/external/wpt/referrer-policy/generic/tools/generate.py
View file @ efaa1992
...@@ -49,7 +49,7 @@ the target request is %(origin)s.''' ...@@ -49,7 +49,7 @@ the target request is %(origin)s.'''
meta = '' meta = ''
headers = [] headers = []
if delivery_value != None: if delivery_value != None:
if delivery_type == 'meta-referrer': if delivery_type == 'meta':
meta = \ meta = \
'<meta name="referrer" content="%s">' % delivery_value '<meta name="referrer" content="%s">' % delivery_value
elif delivery_type == 'http-rp': elif delivery_type == 'http-rp':
...@@ -58,10 +58,10 @@ the target request is %(origin)s.''' ...@@ -58,10 +58,10 @@ the target request is %(origin)s.'''
headers.append('Referrer-Policy: ' + '%s' % delivery_value) headers.append('Referrer-Policy: ' + '%s' % delivery_value)
# TODO(kristijanburnik): Limit to WPT origins. # TODO(kristijanburnik): Limit to WPT origins.
headers.append('Access-Control-Allow-Origin: *') headers.append('Access-Control-Allow-Origin: *')
elif delivery_type == 'attr-referrer': elif delivery_type == 'attr':
# attr-referrer is supported by the JS test wrapper. # attr-referrer is supported by the JS test wrapper.
pass pass
elif delivery_type == 'rel-noreferrer': elif delivery_type == 'rel-noref':
# rel=noreferrer is supported by the JS test wrapper. # rel=noreferrer is supported by the JS test wrapper.
pass pass
else: else:
......
third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json
View file @ efaa1992
...@@ -10,11 +10,7 @@ ...@@ -10,11 +10,7 @@
"name": "insecure-protocol", "name": "insecure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -28,11 +24,7 @@ ...@@ -28,11 +24,7 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -46,11 +38,7 @@ ...@@ -46,11 +38,7 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -64,11 +52,7 @@ ...@@ -64,11 +52,7 @@
"name": "secure-protocol", "name": "secure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -90,11 +74,7 @@ ...@@ -90,11 +74,7 @@
"name": "generic", "name": "generic",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "no-referrer", "delivery_value": "no-referrer",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": "*",
...@@ -113,11 +93,7 @@ ...@@ -113,11 +93,7 @@
"name": "insecure-protocol", "name": "insecure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -131,11 +107,7 @@ ...@@ -131,11 +107,7 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -149,11 +121,7 @@ ...@@ -149,11 +121,7 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -167,11 +135,7 @@ ...@@ -167,11 +135,7 @@
"name": "secure-protocol", "name": "secure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -193,11 +157,7 @@ ...@@ -193,11 +157,7 @@
"name": "generic", "name": "generic",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "origin", "delivery_value": "origin",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": "*",
...@@ -216,11 +176,7 @@ ...@@ -216,11 +176,7 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "*", "redirection": "*",
"origin": "same-http", "origin": "same-http",
...@@ -231,11 +187,7 @@ ...@@ -231,11 +187,7 @@
"name": "same-origin-secure-default", "name": "same-origin-secure-default",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "*", "redirection": "*",
"origin": "same-https", "origin": "same-https",
...@@ -246,11 +198,7 @@ ...@@ -246,11 +198,7 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "override", "expansion": "override",
"source_protocol": "*", "source_protocol": "*",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "swap-origin", "redirection": "swap-origin",
"origin": [ "origin": [
...@@ -264,11 +212,7 @@ ...@@ -264,11 +212,7 @@
"name": "cross-origin", "name": "cross-origin",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -290,11 +234,7 @@ ...@@ -290,11 +234,7 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-http", "origin": "same-http",
...@@ -305,11 +245,7 @@ ...@@ -305,11 +245,7 @@
"name": "same-origin-secure-default", "name": "same-origin-secure-default",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-https", "origin": "same-https",
...@@ -320,11 +256,7 @@ ...@@ -320,11 +256,7 @@
"name": "same-origin-upgrade", "name": "same-origin-upgrade",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-https", "origin": "same-https",
...@@ -335,11 +267,7 @@ ...@@ -335,11 +267,7 @@
"name": "same-origin-downgrade", "name": "same-origin-downgrade",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-http", "origin": "same-http",
...@@ -350,11 +278,7 @@ ...@@ -350,11 +278,7 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "override", "expansion": "override",
"source_protocol": "*", "source_protocol": "*",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "swap-origin", "redirection": "swap-origin",
"origin": [ "origin": [
...@@ -368,11 +292,7 @@ ...@@ -368,11 +292,7 @@
"name": "cross-origin", "name": "cross-origin",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -394,11 +314,7 @@ ...@@ -394,11 +314,7 @@
"name": "insecure-protocol", "name": "insecure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -412,11 +328,7 @@ ...@@ -412,11 +328,7 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -430,11 +342,7 @@ ...@@ -430,11 +342,7 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -448,11 +356,7 @@ ...@@ -448,11 +356,7 @@
"name": "secure-protocol", "name": "secure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -474,11 +378,7 @@ ...@@ -474,11 +378,7 @@
"name": "same-insecure", "name": "same-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-http", "origin": "same-http",
...@@ -489,11 +389,7 @@ ...@@ -489,11 +389,7 @@
"name": "same-insecure", "name": "same-insecure",
"expansion": "override", "expansion": "override",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "swap-origin", "redirection": "swap-origin",
"origin": "same-http", "origin": "same-http",
...@@ -504,11 +400,7 @@ ...@@ -504,11 +400,7 @@
"name": "cross-insecure", "name": "cross-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "cross-http", "origin": "cross-http",
...@@ -519,11 +411,7 @@ ...@@ -519,11 +411,7 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -537,11 +425,7 @@ ...@@ -537,11 +425,7 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": [ "origin": [
...@@ -555,11 +439,7 @@ ...@@ -555,11 +439,7 @@
"name": "same-secure", "name": "same-secure",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-https", "origin": "same-https",
...@@ -570,11 +450,7 @@ ...@@ -570,11 +450,7 @@
"name": "same-secure", "name": "same-secure",
"expansion": "override", "expansion": "override",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "swap-origin", "redirection": "swap-origin",
"origin": "same-https", "origin": "same-https",
...@@ -585,11 +461,7 @@ ...@@ -585,11 +461,7 @@
"name": "cross-secure", "name": "cross-secure",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "cross-https", "origin": "cross-https",
...@@ -608,11 +480,7 @@ ...@@ -608,11 +480,7 @@
"name": "generic", "name": "generic",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"delivery_type": [ "delivery_type": "*",
"http-rp",
"meta-referrer",
"attr-referrer"
],
"delivery_value": "unsafe-url", "delivery_value": "unsafe-url",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": "*",
...@@ -674,48 +542,6 @@ ...@@ -674,48 +542,6 @@
"subresource": "*", "subresource": "*",
"expectation": "*" "expectation": "*"
}, },
{
"name": "elements-not-supporting-attr-referrer",
"expansion": "*",
"source_protocol": "*",
"delivery_type": [
"attr-referrer"
],
"delivery_value": "*",
"redirection": "*",
"origin": "*",
"subresource": [
"xhr-request",
"worker-request",
"module-worker",
"shared-worker",
"fetch-request"
],
"expectation": "*"
},
{
"name": "elements-not-supporting-rel-noreferrer",
"expansion": "*",
"source_protocol": "*",
"delivery_type": [
"rel-noreferrer"
],
"delivery_value": "*",
"redirection": "*",
"origin": "*",
"subresource": [
"iframe-tag",
"img-tag",
"script-tag",
"xhr-request",
"worker-request",
"module-worker",
"shared-worker",
"fetch-request",
"area-tag"
],
"expectation": "*"
},
{ {
"name": "area-tag", "name": "area-tag",
"expansion": "*", "expansion": "*",
...@@ -769,6 +595,26 @@ ...@@ -769,6 +595,26 @@
"origin": "*", "origin": "*",
"subresource": "*", "subresource": "*",
"expectation": "*" "expectation": "*"
},
{
"name": "<link rel=noreferrer>'s delivery_value should be no-referrer",
"expansion": "*",
"source_protocol": "*",
"delivery_type": "rel-noref",
"delivery_value": [
null,
"no-referrer-when-downgrade",
"same-origin",
"origin",
"origin-when-cross-origin",
"strict-origin",
"strict-origin-when-cross-origin",
"unsafe-url"
],
"redirection": "*",
"origin": "*",
"subresource": "*",
"expectation": "*"
} }
], ],
"test_expansion_schema": { "test_expansion_schema": {
...@@ -777,10 +623,10 @@ ...@@ -777,10 +623,10 @@
"override" "override"
], ],
"delivery_type": [ "delivery_type": [
"attr",
"rel-noref",
"http-rp", "http-rp",
"meta-referrer", "meta"
"attr-referrer",
"rel-noreferrer"
], ],
"delivery_value": [ "delivery_value": [
null, null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment