From fa224fd23043edd3c315f80dfd5b2f3cb8cd3c7e Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Thu, 6 Mar 2025 21:01:23 +0000 Subject: [PATCH 01/14] Patch skeleton --- spec.bs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spec.bs b/spec.bs index ac2a91e..dcaa79c 100644 --- a/spec.bs +++ b/spec.bs @@ -221,6 +221,7 @@ spec: fetch; urlPrefix: https://fetch.spec.whatwg.org/ type: dfn text: queue a cross-origin embedder policy CORP violation report; url: queue-a-cross-origin-embedder-policy-corp-violation-report text: should request be blocked due to a bad port; url: block-bad-port + text: resolve an origin; url: resolve-an-origin for: response text: has-cross-origin-redirects; url: response-has-cross-origin-redirects spec: mixed-content; urlPrefix: https://w3c.github.io/webappsec-mixed-content/ @@ -2237,6 +2238,18 @@ The network revocation mechanism requires the following monkeypatches to the [[F (WICG/fenced-frame#191) +
+ Modify the [=resolve an origin=] algorithm to include an extra parameter: an [=url=] |url|. + + Insert these steps immediately after step 2: + + 1. Let |nonce| be |key|'s [=network partition key/nonce=]. + + 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=] and |url| does not [=set/exist=] in it, then: + + 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, return. +
+ The network revocation mechanism requires the following monkeypatch to the [[WebSockets]] Standard. From 4ecca78e34e467433d70daaea19f5079b807c2c7 Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Thu, 6 Mar 2025 21:01:34 +0000 Subject: [PATCH 02/14] Formatted --- spec.bs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index dcaa79c..9e08521 100644 --- a/spec.bs +++ b/spec.bs @@ -2245,7 +2245,8 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. Let |nonce| be |key|'s [=network partition key/nonce=]. - 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=] and |url| does not [=set/exist=] in it, then: + 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=] and |url| does + not [=set/exist=] in it, then: 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, return. From 98b5f042059da3e5645f32d91abe8859577f7e05 Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Wed, 12 Mar 2025 12:08:54 -0400 Subject: [PATCH 03/14] Change to a [=URL=] Co-authored-by: Dominic Farolino --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index b991a1c..4c9928c 100644 --- a/spec.bs +++ b/spec.bs @@ -2258,7 +2258,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F
- Modify the [=resolve an origin=] algorithm to include an extra parameter: an [=url=] |url|. + Modify the [=resolve an origin=] algorithm to include an extra parameter: a [=URL=] |url|. Insert these steps immediately after step 2: From 89230c2c93091c5c10e20eea6b7fa147633a0d15 Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Wed, 12 Mar 2025 12:09:07 -0400 Subject: [PATCH 04/14] Add "then" Co-authored-by: Dominic Farolino --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index 4c9928c..d58bb7d 100644 --- a/spec.bs +++ b/spec.bs @@ -2267,7 +2267,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=] and |url| does not [=set/exist=] in it, then: - 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, return. + 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return.
The network revocation mechanism requires the following monkeypatch to the [[WebSockets]] From 7c39fe00a440c1962ac67d56d723425158cf722c Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Wed, 12 Mar 2025 18:02:40 +0000 Subject: [PATCH 05/14] Change exempt condition --- spec.bs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec.bs b/spec.bs index d58bb7d..63dff44 100644 --- a/spec.bs +++ b/spec.bs @@ -2264,8 +2264,8 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. Let |nonce| be |key|'s [=network partition key/nonce=]. - 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=] and |url| does - not [=set/exist=] in it, then: + 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but and [=network revocation exemption map=][|nonce|][|url|] does + not exist, then: 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return. From 43db5be04984f7a9eac49dee04daf84e9735182d Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Wed, 12 Mar 2025 18:03:20 +0000 Subject: [PATCH 06/14] Typo fixed. --- spec.bs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec.bs b/spec.bs index 63dff44..4ea7811 100644 --- a/spec.bs +++ b/spec.bs @@ -2264,8 +2264,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. Let |nonce| be |key|'s [=network partition key/nonce=]. - 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but and [=network revocation exemption map=][|nonce|][|url|] does - not exist, then: + 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network revocation exemption map=][|nonce|][|url|] does not exist, then: 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return. From 88da4734107ba9ce7228634a5ba7911e047aebfc Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Wed, 12 Mar 2025 18:03:31 +0000 Subject: [PATCH 07/14] Formatted --- spec.bs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index 4ea7811..0e387c1 100644 --- a/spec.bs +++ b/spec.bs @@ -2264,7 +2264,8 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. Let |nonce| be |key|'s [=network partition key/nonce=]. - 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network revocation exemption map=][|nonce|][|url|] does not exist, then: + 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network + revocation exemption map=][|nonce|][|url|] does not exist, then: 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return. From bd2ae5f994e2c26446d223f65aaa2a02eba71e8e Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Thu, 13 Mar 2025 09:59:25 -0400 Subject: [PATCH 08/14] Use map/exist Co-authored-by: Dominic Farolino --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index 0e387c1..25906f3 100644 --- a/spec.bs +++ b/spec.bs @@ -2265,7 +2265,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. Let |nonce| be |key|'s [=network partition key/nonce=]. 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network - revocation exemption map=][|nonce|][|url|] does not exist, then: + revocation exemption map=][|nonce|][|url|] does not [=map/exist=], then: 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return. From e2ea4d2833e1aae10b83213738d12d025f9bad22 Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Thu, 13 Mar 2025 14:01:33 +0000 Subject: [PATCH 09/14] Correct indent --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index 25906f3..d92ac3c 100644 --- a/spec.bs +++ b/spec.bs @@ -2267,7 +2267,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network revocation exemption map=][|nonce|][|url|] does not [=map/exist=], then: - 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return. + 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return. The network revocation mechanism requires the following monkeypatch to the [[WebSockets]] From 9cba8a965bbce6bf4bd1a3d551701b2d4493755f Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Thu, 27 Mar 2025 14:20:57 +0000 Subject: [PATCH 10/14] Add var ignore --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index 5d3fd5f..a68b6ae 100644 --- a/spec.bs +++ b/spec.bs @@ -2272,7 +2272,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F Insert these steps immediately after step 2: - 1. Let |nonce| be |key|'s [=network partition key/nonce=]. + 1. Let |nonce| be key's [=network partition key/nonce=]. 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network revocation exemption map=][|nonce|][|url|] does not [=map/exist=], then: From ed5574137ea66040bd650eece809abca44fb31a6 Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Fri, 28 Mar 2025 09:48:58 -0400 Subject: [PATCH 11/14] Return failure. Co-authored-by: Liam Brady --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index a68b6ae..a101d0c 100644 --- a/spec.bs +++ b/spec.bs @@ -2277,7 +2277,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network revocation exemption map=][|nonce|][|url|] does not [=map/exist=], then: - 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return. + 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return failure. The network revocation mechanism requires the following monkeypatch to the [[WebSockets]] From 96270159565613927b258f0e68a16b5a6b6599ad Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Fri, 28 Mar 2025 14:07:44 +0000 Subject: [PATCH 12/14] Change insert position --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index a101d0c..8e63145 100644 --- a/spec.bs +++ b/spec.bs @@ -2270,7 +2270,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F
Modify the [=resolve an origin=] algorithm to include an extra parameter: a [=URL=] |url|. - Insert these steps immediately after step 2: + Insert these steps before step 1: 1. Let |nonce| be key's [=network partition key/nonce=]. From 18fe0abe7994ca3a7c161e207ff07dec7a5106d8 Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Fri, 28 Mar 2025 14:12:40 +0000 Subject: [PATCH 13/14] Specfmt --- spec.bs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index 8e63145..7def5e8 100644 --- a/spec.bs +++ b/spec.bs @@ -2277,7 +2277,8 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network revocation exemption map=][|nonce|][|url|] does not [=map/exist=], then: - 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return failure. + 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return + failure.
The network revocation mechanism requires the following monkeypatch to the [[WebSockets]] From 6cfda867fadb9885edfafcbc9031ef112dc1a03f Mon Sep 17 00:00:00 2001 From: Xiaochen Zhou Date: Fri, 28 Mar 2025 12:51:27 -0400 Subject: [PATCH 14/14] Get rid of extra space Co-authored-by: Liam Brady --- spec.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.bs b/spec.bs index 7def5e8..02c93c4 100644 --- a/spec.bs +++ b/spec.bs @@ -2277,7 +2277,7 @@ The network revocation mechanism requires the following monkeypatches to the [[F 1. If the user agent's [=network revocation exemption map=][|nonce|] [=map/exists=], but [=network revocation exemption map=][|nonce|][|url|] does not [=map/exist=], then: - 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return + 1. If the user agent's [=network revocation nonce set=] [=set/contains=] |nonce|, then return failure.