Commit 40bb4864 authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

[WPT/common/security-features] Rename source_protocol to source_scheme

Follow-up of
https://chromium-review.googlesource.com/c/chromium/src/+/1717115.

Because "scheme" is more spec-conformant name.

Bug: 906850
Change-Id: Ie27cf2a4329b624d7692b6808928e8888d897500
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1718991
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@{#681102}
parent 1fe0ceb5
...@@ -126,7 +126,7 @@ def validate(spec_json, details): ...@@ -126,7 +126,7 @@ 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', 'source_protocol', 'delivery_type', 'delivery_value', 'expansion', 'source_scheme', 'delivery_type', 'delivery_value',
'redirection', 'subresource', 'origin', 'expectation' 'redirection', 'subresource', 'origin', 'expectation'
]) ])
# Validate excluded tests. # Validate excluded tests.
......
...@@ -22,12 +22,12 @@ class MixedContentConfig(object): ...@@ -22,12 +22,12 @@ class MixedContentConfig(object):
self.test_file_path_pattern = self.selection_pattern + \ self.test_file_path_pattern = self.selection_pattern + \
'%(spec_name)s/' + \ '%(spec_name)s/' + \
'%(name)s.%(source_protocol)s.html' '%(name)s.%(source_scheme)s.html'
self.test_description_template = '''delivery_type: %(delivery_type)s self.test_description_template = '''delivery_type: %(delivery_type)s
delivery_value: %(delivery_value)s delivery_value: %(delivery_value)s
origin: %(origin)s origin: %(origin)s
source_scheme: %(source_protocol)s source_scheme: %(source_scheme)s
context_nesting: top-level context_nesting: top-level
redirection: %(redirection)s redirection: %(redirection)s
subresource: %(subresource)s subresource: %(subresource)s
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
{ {
"name": "opt-in-blocks", "name": "opt-in-blocks",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_scheme": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"redirection": "*", "redirection": "*",
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
{ {
"name": "no-opt-in-allows", "name": "no-opt-in-allows",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_scheme": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
{ {
"name": "opt-in-blocks", "name": "opt-in-blocks",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_scheme": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"redirection": "*", "redirection": "*",
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
{ {
"name": "no-opt-in-blocks", "name": "no-opt-in-blocks",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_scheme": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
{ {
"name": "ws-downgrade-blocks", "name": "ws-downgrade-blocks",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_scheme": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "*", "redirection": "*",
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
{ {
"name": "allowed", "name": "allowed",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_scheme": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": [ "redirection": [
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
{ {
"name": "websocket-allowed", "name": "websocket-allowed",
"expansion": "default", "expansion": "default",
"source_protocol": "https", "source_scheme": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": [ "redirection": [
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
{ {
"name": "Skip-redundant-no-opt-in", "name": "Skip-redundant-no-opt-in",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_scheme": "*",
"delivery_type": "http-rp", "delivery_type": "http-rp",
"delivery_value": null, "delivery_value": null,
"redirection": "*", "redirection": "*",
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
{ {
"name": "Redundant-subresources", "name": "Redundant-subresources",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_scheme": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "*", "redirection": "*",
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
{ {
"name": "Skip-origins-not-applicable-to-websockets", "name": "Skip-origins-not-applicable-to-websockets",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_scheme": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"redirection": "*", "redirection": "*",
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
{ {
"name": "Skip-redundant-for-opt-in-method", "name": "Skip-redundant-for-opt-in-method",
"expansion": "*", "expansion": "*",
"source_protocol": "*", "source_scheme": "*",
"delivery_type": "meta", "delivery_type": "meta",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"redirection": [ "redirection": [
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
"default", "default",
"override" "override"
], ],
"source_protocol": [ "source_scheme": [
"http", "http",
"https" "https"
], ],
......
...@@ -15,15 +15,15 @@ class ReferrerPolicyConfig(object): ...@@ -15,15 +15,15 @@ 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/' + \ '%(source_scheme)s/' + \
'%(subresource)s/' + \ '%(subresource)s/' + \
'%(redirection)s/' '%(redirection)s/'
self.test_file_path_pattern = '%(spec_name)s/' + self.selection_pattern + \ self.test_file_path_pattern = '%(spec_name)s/' + self.selection_pattern + \
'%(name)s.%(source_protocol)s.html' '%(name)s.%(source_scheme)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 a document served over %(source_scheme)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.'''
......
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