Skip to content

GitLab

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

[WPT/referrer-policy] Rename delivery_method to delivery_type 

To align spec.src.json with other parts of common/security-features/
such as common.js.

Generated files will be updated after some more changes, not now.

Bug: 906850
Change-Id: I87479bcf8ec6cdbf08e10a38a79885940b51e457
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1716109
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarKenichi Ishibashi <bashi@chromium.org>
Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: default avatarMike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681065}
parent 5cfaf945
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 53 deletions
third_party/blink/web_tests/external/wpt/referrer-policy/generic/tools/generate.py
View file @ ad77da0e
......@@ -13,7 +13,7 @@ import generate
class ReferrerPolicyConfig(object):
def __init__(self):
self.selection_pattern = '%(delivery_method)s/' + \
self.selection_pattern = '%(delivery_type)s/' + \
'%(origin)s/' + \
'%(source_protocol)s-%(target_protocol)s/' + \
'%(subresource)s/' + \
......@@ -24,7 +24,7 @@ class ReferrerPolicyConfig(object):
self.test_description_template = '''The referrer URL is %(expectation)s when a
document served over %(source_protocol)s requires an %(target_protocol)s
sub-resource via %(subresource)s using the %(delivery_method)s
sub-resource via %(subresource)s using the %(delivery_type)s
delivery method with %(redirection)s and when
the target request is %(origin)s.'''
......@@ -43,30 +43,30 @@ the target request is %(origin)s.'''
os.path.join(script_directory, '..', '..'))
def handleDelivery(self, selection, spec):
delivery_method = selection['delivery_method']
delivery_type = selection['delivery_type']
delivery_value = spec['referrer_policy']
meta = ''
headers = []
if delivery_value != None:
if delivery_method == 'meta-referrer':
if delivery_type == 'meta-referrer':
meta = \
'<meta name="referrer" content="%s">' % delivery_value
elif delivery_method == 'http-rp':
elif delivery_type == 'http-rp':
meta = \
"<!-- No meta: Referrer policy delivered via HTTP headers. -->"
headers.append('Referrer-Policy: ' + '%s' % delivery_value)
# TODO(kristijanburnik): Limit to WPT origins.
headers.append('Access-Control-Allow-Origin: *')
elif delivery_method == 'attr-referrer':
elif delivery_type == 'attr-referrer':
# attr-referrer is supported by the JS test wrapper.
pass
elif delivery_method == 'rel-noreferrer':
elif delivery_type == 'rel-noreferrer':
# rel=noreferrer is supported by the JS test wrapper.
pass
else:
raise ValueError('Not implemented delivery_method: ' \
+ delivery_method)
raise ValueError('Not implemented delivery_type: ' \
+ delivery_type)
return {"meta": meta, "headers": headers}
......
third_party/blink/web_tests/external/wpt/referrer-policy/generic/tools/spec_validator.py
View file @ ad77da0e
......@@ -128,7 +128,7 @@ def validate(spec_json, details):
# Validate the test_expansion schema members.
details['object'] = test_expansion_schema
assert_contains_only_fields(test_expansion_schema, [
'expansion', 'delivery_method', 'redirection', 'origin',
'expansion', 'delivery_type', 'redirection', 'origin',
'source_protocol', 'target_protocol', 'subresource', 'expectation'
])
# Validate excluded tests.
......
third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json
View file @ ad77da0e
......@@ -12,7 +12,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -23,7 +23,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -34,7 +34,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -45,7 +45,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -65,7 +65,7 @@
"expansion": "default",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -85,7 +85,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -96,7 +96,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -107,7 +107,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -118,7 +118,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -138,7 +138,7 @@
"expansion": "default",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -158,7 +158,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -169,7 +169,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -180,7 +180,7 @@
"expansion": "override",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "swap-origin-redirect",
"origin": "same-origin",
"subresource": "*",
......@@ -191,7 +191,7 @@
"expansion": "default",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "cross-origin",
"subresource": "*",
......@@ -211,7 +211,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -222,7 +222,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -233,7 +233,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -244,7 +244,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -255,7 +255,7 @@
"expansion": "override",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "swap-origin-redirect",
"origin": "same-origin",
"subresource": "*",
......@@ -266,7 +266,7 @@
"expansion": "default",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "cross-origin",
"subresource": "*",
......@@ -286,7 +286,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -297,7 +297,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -308,7 +308,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -319,7 +319,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -339,7 +339,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -350,7 +350,7 @@
"expansion": "override",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "swap-origin-redirect",
"origin": "same-origin",
"subresource": "*",
......@@ -361,7 +361,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "cross-origin",
"subresource": "*",
......@@ -372,7 +372,7 @@
"expansion": "default",
"source_protocol": "http",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -383,7 +383,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "http",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -394,7 +394,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "same-origin",
"subresource": "*",
......@@ -405,7 +405,7 @@
"expansion": "override",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "swap-origin-redirect",
"origin": "same-origin",
"subresource": "*",
......@@ -416,7 +416,7 @@
"expansion": "default",
"source_protocol": "https",
"target_protocol": "https",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "cross-origin",
"subresource": "*",
......@@ -436,7 +436,7 @@
"expansion": "default",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["http-rp", "meta-referrer", "attr-referrer"],
"delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -455,7 +455,7 @@
"source_protocol": "*",
"target_protocol": "*",
"redirection": "*",
"delivery_method": "*",
"delivery_type": "*",
"origin": "cross-origin",
"subresource": [
"worker-request",
......@@ -469,7 +469,7 @@
"expansion": "*",
"source_protocol": "http",
"target_protocol": "https",
"delivery_method": "*",
"delivery_type": "*",
"redirection": "*",
"origin": "*",
"subresource": [
......@@ -484,7 +484,7 @@
"expansion": "*",
"source_protocol": "https",
"target_protocol": "http",
"delivery_method": "*",
"delivery_type": "*",
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -495,7 +495,7 @@
"expansion": "*",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["attr-referrer"],
"delivery_type": ["attr-referrer"],
"redirection": "*",
"origin": "*",
"subresource": [
......@@ -512,7 +512,7 @@
"expansion": "*",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": ["rel-noreferrer"],
"delivery_type": ["rel-noreferrer"],
"redirection": "*",
"origin": "*",
"subresource": [
......@@ -533,7 +533,7 @@
"expansion": "*",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": "*",
"delivery_type": "*",
"redirection": "*",
"origin": "*",
"subresource": "area-tag",
......@@ -544,7 +544,7 @@
"expansion": "*",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": "*",
"delivery_type": "*",
"redirection": "swap-origin-redirect",
"origin": "*",
"subresource": [
......@@ -559,7 +559,7 @@
"expansion": "*",
"source_protocol": "*",
"target_protocol": "*",
"delivery_method": "*",
"delivery_type": "*",
"redirection": ["keep-origin-redirect", "swap-origin-redirect"],
"origin": "*",
"subresource": ["a-tag", "area-tag"],
......@@ -570,7 +570,7 @@
"expansion": "*",
"source_protocol": "https",
"target_protocol": "*",
"delivery_method": "*",
"delivery_type": "*",
"redirection": "*",
"origin": "*",
"subresource": "*",
......@@ -596,7 +596,7 @@
"override"
],
"delivery_method": [
"delivery_type": [
"http-rp",
"meta-referrer",
"attr-referrer",
......
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