Skip to content

GitLab

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

[WPT/referrer-policy] Merge target_protocol and origin 

As we've already merged `target_protocol` and `origin` into one
`origin` value in underlying JavaScripts, this CL applies
this conversion also in generators.

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.

spec.src.json changes are made by:

originTypeConversion = {
  "same-origin-http": "same-http",
  "same-origin-https": "same-https",
  "cross-origin-http": "cross-http",
  "cross-origin-https": "cross-https"
}
for test_expansion in sum([s['test_expansion'] for s in spec["specification"]],
                          []) + spec["excluded_tests"]:
  if 'target_protocol' in test_expansion:
    protocols = test_expansion['target_protocol']
    origins = test_expansion['origin']
    if protocols == '*':
      protocols = ['http', 'https']
    if origins == '*':
      origins = ['same-origin', 'cross-origin']
    if isinstance(protocols, unicode):
      protocols = [protocols]
    if isinstance(origins, unicode):
      origins = [origins]
    new_origins = []
    for protocol in protocols:
      for origin in origins:
        new_origins.append(originTypeConversion[origin + '-' + protocol])
    if len(set(new_origins)) == 4:
      new_origins = u"*"
    if len(new_origins) == 1:
      new_origins = new_origins[0]
    test_expansion['origin'] = new_origins
    del test_expansion['target_protocol']
spec['test_expansion_schema']['origin'] = [
    "same-http", "same-https", "cross-http", "cross-https"
]
del spec['test_expansion_schema']['target_protocol']

Bug: 906850
Change-Id: Iaf4af8c0b599f9cc843244658a2db7577dddeb4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717470
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@{#681090}
parent 17308745
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 86 deletions
third_party/blink/web_tests/external/wpt/referrer-policy/generic/tools/generate.py
View file @ 8b34445d
...@@ -15,7 +15,7 @@ class ReferrerPolicyConfig(object): ...@@ -15,7 +15,7 @@ class ReferrerPolicyConfig(object):
def __init__(self): def __init__(self):
self.selection_pattern = '%(delivery_type)s/' + \ self.selection_pattern = '%(delivery_type)s/' + \
'%(origin)s/' + \ '%(origin)s/' + \
'%(source_protocol)s-%(target_protocol)s/' + \ '%(source_protocol)s/' + \
'%(subresource)s/' + \ '%(subresource)s/' + \
'%(redirection)s/' '%(redirection)s/'
...@@ -23,7 +23,7 @@ class ReferrerPolicyConfig(object): ...@@ -23,7 +23,7 @@ class ReferrerPolicyConfig(object):
'%(name)s.%(source_protocol)s.html' '%(name)s.%(source_protocol)s.html'
self.test_description_template = '''The referrer URL is %(expectation)s when a self.test_description_template = '''The referrer URL is %(expectation)s when a
document served over %(source_protocol)s requires an %(target_protocol)s document served over %(source_protocol)s requires a
sub-resource via %(subresource)s using the %(delivery_type)s sub-resource via %(subresource)s using the %(delivery_type)s
delivery method with %(redirection)s and when delivery method with %(redirection)s and when
the target request is %(origin)s.''' the target request is %(origin)s.'''
......
third_party/blink/web_tests/external/wpt/referrer-policy/generic/tools/spec_validator.py
View file @ 8b34445d
...@@ -126,9 +126,8 @@ def validate(spec_json, details): ...@@ -126,9 +126,8 @@ def validate(spec_json, details):
# Validate the test_expansion schema members. # Validate the test_expansion schema members.
details['object'] = test_expansion_schema details['object'] = test_expansion_schema
assert_contains_only_fields(test_expansion_schema, [ assert_contains_only_fields(test_expansion_schema, [
'expansion', 'delivery_type', 'delivery_value', 'redirection', 'expansion', 'source_protocol', 'delivery_type', 'delivery_value',
'origin', 'source_protocol', 'target_protocol', 'subresource', 'redirection', 'subresource', 'origin', 'expectation'
'expectation'
]) ])
# Validate excluded tests. # Validate excluded tests.
details['object'] = excluded_tests details['object'] = excluded_tests
......
third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json
View file @ 8b34445d
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
"name": "insecure-protocol", "name": "insecure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -18,7 +17,10 @@ ...@@ -18,7 +17,10 @@
], ],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -26,7 +28,6 @@ ...@@ -26,7 +28,6 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -34,7 +35,10 @@ ...@@ -34,7 +35,10 @@
], ],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -42,7 +46,6 @@ ...@@ -42,7 +46,6 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -50,7 +53,10 @@ ...@@ -50,7 +53,10 @@
], ],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "omitted" "expectation": "omitted"
}, },
...@@ -58,7 +64,6 @@ ...@@ -58,7 +64,6 @@
"name": "secure-protocol", "name": "secure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -66,7 +71,10 @@ ...@@ -66,7 +71,10 @@
], ],
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
} }
...@@ -82,7 +90,6 @@ ...@@ -82,7 +90,6 @@
"name": "generic", "name": "generic",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -106,7 +113,6 @@ ...@@ -106,7 +113,6 @@
"name": "insecure-protocol", "name": "insecure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -114,7 +120,10 @@ ...@@ -114,7 +120,10 @@
], ],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -122,7 +131,6 @@ ...@@ -122,7 +131,6 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -130,7 +138,10 @@ ...@@ -130,7 +138,10 @@
], ],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -138,7 +149,6 @@ ...@@ -138,7 +149,6 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -146,7 +156,10 @@ ...@@ -146,7 +156,10 @@
], ],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "omitted" "expectation": "omitted"
}, },
...@@ -154,7 +167,6 @@ ...@@ -154,7 +167,6 @@
"name": "secure-protocol", "name": "secure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -162,7 +174,10 @@ ...@@ -162,7 +174,10 @@
], ],
"delivery_value": "no-referrer-when-downgrade", "delivery_value": "no-referrer-when-downgrade",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
} }
...@@ -178,7 +193,6 @@ ...@@ -178,7 +193,6 @@
"name": "generic", "name": "generic",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -202,7 +216,6 @@ ...@@ -202,7 +216,6 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -210,7 +223,7 @@ ...@@ -210,7 +223,7 @@
], ],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-http",
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -218,7 +231,6 @@ ...@@ -218,7 +231,6 @@
"name": "same-origin-secure-default", "name": "same-origin-secure-default",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -226,7 +238,7 @@ ...@@ -226,7 +238,7 @@
], ],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-https",
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -234,7 +246,6 @@ ...@@ -234,7 +246,6 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "override", "expansion": "override",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -242,7 +253,10 @@ ...@@ -242,7 +253,10 @@
], ],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "swap-origin-redirect", "redirection": "swap-origin-redirect",
"origin": "same-origin", "origin": [
"same-http",
"same-https"
],
"subresource": "*", "subresource": "*",
"expectation": "omitted" "expectation": "omitted"
}, },
...@@ -250,7 +264,6 @@ ...@@ -250,7 +264,6 @@
"name": "cross-origin", "name": "cross-origin",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -258,7 +271,10 @@ ...@@ -258,7 +271,10 @@
], ],
"delivery_value": "same-origin", "delivery_value": "same-origin",
"redirection": "*", "redirection": "*",
"origin": "cross-origin", "origin": [
"cross-http",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "omitted" "expectation": "omitted"
} }
...@@ -274,7 +290,6 @@ ...@@ -274,7 +290,6 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -282,7 +297,7 @@ ...@@ -282,7 +297,7 @@
], ],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-http",
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -290,7 +305,6 @@ ...@@ -290,7 +305,6 @@
"name": "same-origin-secure-default", "name": "same-origin-secure-default",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -298,7 +312,7 @@ ...@@ -298,7 +312,7 @@
], ],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-https",
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -306,7 +320,6 @@ ...@@ -306,7 +320,6 @@
"name": "same-origin-upgrade", "name": "same-origin-upgrade",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -314,7 +327,7 @@ ...@@ -314,7 +327,7 @@
], ],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-https",
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -322,7 +335,6 @@ ...@@ -322,7 +335,6 @@
"name": "same-origin-downgrade", "name": "same-origin-downgrade",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -330,7 +342,7 @@ ...@@ -330,7 +342,7 @@
], ],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-http",
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -338,7 +350,6 @@ ...@@ -338,7 +350,6 @@
"name": "same-origin-insecure", "name": "same-origin-insecure",
"expansion": "override", "expansion": "override",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -346,7 +357,10 @@ ...@@ -346,7 +357,10 @@
], ],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "swap-origin-redirect", "redirection": "swap-origin-redirect",
"origin": "same-origin", "origin": [
"same-http",
"same-https"
],
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -354,7 +368,6 @@ ...@@ -354,7 +368,6 @@
"name": "cross-origin", "name": "cross-origin",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -362,7 +375,10 @@ ...@@ -362,7 +375,10 @@
], ],
"delivery_value": "origin-when-cross-origin", "delivery_value": "origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "cross-origin", "origin": [
"cross-http",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
} }
...@@ -378,7 +394,6 @@ ...@@ -378,7 +394,6 @@
"name": "insecure-protocol", "name": "insecure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -386,7 +401,10 @@ ...@@ -386,7 +401,10 @@
], ],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -394,7 +412,6 @@ ...@@ -394,7 +412,6 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -402,7 +419,10 @@ ...@@ -402,7 +419,10 @@
], ],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -410,7 +430,6 @@ ...@@ -410,7 +430,6 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -418,7 +437,10 @@ ...@@ -418,7 +437,10 @@
], ],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "omitted" "expectation": "omitted"
}, },
...@@ -426,7 +448,6 @@ ...@@ -426,7 +448,6 @@
"name": "secure-protocol", "name": "secure-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -434,7 +455,10 @@ ...@@ -434,7 +455,10 @@
], ],
"delivery_value": "strict-origin", "delivery_value": "strict-origin",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
} }
...@@ -450,7 +474,6 @@ ...@@ -450,7 +474,6 @@
"name": "same-insecure", "name": "same-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -458,7 +481,7 @@ ...@@ -458,7 +481,7 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-http",
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -466,7 +489,6 @@ ...@@ -466,7 +489,6 @@
"name": "same-insecure", "name": "same-insecure",
"expansion": "override", "expansion": "override",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -474,7 +496,7 @@ ...@@ -474,7 +496,7 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "swap-origin-redirect", "redirection": "swap-origin-redirect",
"origin": "same-origin", "origin": "same-http",
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -482,7 +504,6 @@ ...@@ -482,7 +504,6 @@
"name": "cross-insecure", "name": "cross-insecure",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -490,7 +511,7 @@ ...@@ -490,7 +511,7 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "cross-origin", "origin": "cross-http",
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -498,7 +519,6 @@ ...@@ -498,7 +519,6 @@
"name": "upgrade-protocol", "name": "upgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -506,7 +526,10 @@ ...@@ -506,7 +526,10 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -514,7 +537,6 @@ ...@@ -514,7 +537,6 @@
"name": "downgrade-protocol", "name": "downgrade-protocol",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "http",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -522,7 +544,10 @@ ...@@ -522,7 +544,10 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "omitted" "expectation": "omitted"
}, },
...@@ -530,7 +555,6 @@ ...@@ -530,7 +555,6 @@
"name": "same-secure", "name": "same-secure",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -538,7 +562,7 @@ ...@@ -538,7 +562,7 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "same-origin", "origin": "same-https",
"subresource": "*", "subresource": "*",
"expectation": "stripped-referrer" "expectation": "stripped-referrer"
}, },
...@@ -546,7 +570,6 @@ ...@@ -546,7 +570,6 @@
"name": "same-secure", "name": "same-secure",
"expansion": "override", "expansion": "override",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -554,7 +577,7 @@ ...@@ -554,7 +577,7 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "swap-origin-redirect", "redirection": "swap-origin-redirect",
"origin": "same-origin", "origin": "same-https",
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
}, },
...@@ -562,7 +585,6 @@ ...@@ -562,7 +585,6 @@
"name": "cross-secure", "name": "cross-secure",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "https",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -570,7 +592,7 @@ ...@@ -570,7 +592,7 @@
], ],
"delivery_value": "strict-origin-when-cross-origin", "delivery_value": "strict-origin-when-cross-origin",
"redirection": "*", "redirection": "*",
"origin": "cross-origin", "origin": "cross-https",
"subresource": "*", "subresource": "*",
"expectation": "origin" "expectation": "origin"
} }
...@@ -586,7 +608,6 @@ ...@@ -586,7 +608,6 @@
"name": "generic", "name": "generic",
"expansion": "default", "expansion": "default",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"http-rp", "http-rp",
"meta-referrer", "meta-referrer",
...@@ -607,11 +628,13 @@ ...@@ -607,11 +628,13 @@
"name": "cross-origin-workers", "name": "cross-origin-workers",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"redirection": "*", "redirection": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"origin": "cross-origin", "origin": [
"cross-http",
"cross-https"
],
"subresource": [ "subresource": [
"worker-request", "worker-request",
"module-worker", "module-worker",
...@@ -623,11 +646,13 @@ ...@@ -623,11 +646,13 @@
"name": "upgraded-protocol-workers", "name": "upgraded-protocol-workers",
"expansion": "*", "expansion": "*",
"source_protocol": "http", "source_protocol": "http",
"target_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-https",
"cross-https"
],
"subresource": [ "subresource": [
"worker-request", "worker-request",
"module-worker", "module-worker",
...@@ -639,11 +664,13 @@ ...@@ -639,11 +664,13 @@
"name": "mixed-content-insecure-subresources", "name": "mixed-content-insecure-subresources",
"expansion": "*", "expansion": "*",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "http",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "*", "redirection": "*",
"origin": "*", "origin": [
"same-http",
"cross-http"
],
"subresource": "*", "subresource": "*",
"expectation": "*" "expectation": "*"
}, },
...@@ -651,7 +678,6 @@ ...@@ -651,7 +678,6 @@
"name": "elements-not-supporting-attr-referrer", "name": "elements-not-supporting-attr-referrer",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"attr-referrer" "attr-referrer"
], ],
...@@ -671,7 +697,6 @@ ...@@ -671,7 +697,6 @@
"name": "elements-not-supporting-rel-noreferrer", "name": "elements-not-supporting-rel-noreferrer",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": [ "delivery_type": [
"rel-noreferrer" "rel-noreferrer"
], ],
...@@ -695,7 +720,6 @@ ...@@ -695,7 +720,6 @@
"name": "area-tag", "name": "area-tag",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "*", "redirection": "*",
...@@ -707,7 +731,6 @@ ...@@ -707,7 +731,6 @@
"name": "worker-requests-with-swap-origin-redirect", "name": "worker-requests-with-swap-origin-redirect",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "swap-origin-redirect", "redirection": "swap-origin-redirect",
...@@ -723,7 +746,6 @@ ...@@ -723,7 +746,6 @@
"name": "overhead-for-redirection", "name": "overhead-for-redirection",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_protocol": "*",
"target_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": [ "redirection": [
...@@ -741,7 +763,6 @@ ...@@ -741,7 +763,6 @@
"name": "source-https-unsupported-by-web-platform-tests-runners", "name": "source-https-unsupported-by-web-platform-tests-runners",
"expansion": "*", "expansion": "*",
"source_protocol": "https", "source_protocol": "https",
"target_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "*", "redirection": "*",
...@@ -773,17 +794,15 @@ ...@@ -773,17 +794,15 @@
"unsafe-url" "unsafe-url"
], ],
"origin": [ "origin": [
"same-origin", "same-http",
"cross-origin" "same-https",
"cross-http",
"cross-https"
], ],
"source_protocol": [ "source_protocol": [
"http", "http",
"https" "https"
], ],
"target_protocol": [
"http",
"https"
],
"redirection": [ "redirection": [
"no-redirect", "no-redirect",
"keep-origin-redirect", "keep-origin-redirect",
......
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