[WPT/common/security-features] Add formatter of spec.src.json

Bug: 906850
Change-Id: I486eef6697a7ef5ff1360549321236add8e1c75b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717499
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681079}

third_party/blink/web_tests/external/wpt/common/security-features/tools/format_spec_src_json.py

+import collections
+import json
+import os
+
+
+def main():
+    '''Formats spec.src.json.'''
+    script_directory = os.path.dirname(os.path.abspath(__file__))
+    for dir in ['mixed-content', 'referrer-policy']:
+        filename = os.path.join(script_directory, '..', '..', '..', dir,
+                                'spec.src.json')
+        spec = json.load(
+            open(filename, 'r'), object_pairs_hook=collections.OrderedDict)
+        with open(filename, 'w') as f:
+            f.write(json.dumps(spec, indent=2, separators=(',', ': ')))
+            f.write('\n')
+
+
+if __name__ == '__main__':
+    main()

third_party/blink/web_tests/external/wpt/mixed-content/spec.src.json

@@ -17,7 +17,10 @@
             "blockable": [],
             "optionally-blockable": "*"
           },
-          "origin": ["cross-origin-http", "same-host-http"],
+          "origin": [
+            "cross-origin-http",
+            "same-host-http"
+          ],
           "expectation": "blocked"
         },
         {
@@ -31,7 +34,10 @@
             "blockable": [],
             "optionally-blockable": "*"
           },
-          "origin": ["cross-origin-http", "same-host-http"],
+          "origin": [
+            "cross-origin-http",
+            "same-host-http"
+          ],
           "expectation": "allowed"
         }
       ]
@@ -53,7 +59,10 @@
             "blockable": "*",
             "optionally-blockable": []
           },
-          "origin": ["cross-origin-http", "same-host-http"],
+          "origin": [
+            "cross-origin-http",
+            "same-host-http"
+          ],
           "expectation": "blocked"
         },
         {
@@ -67,7 +76,10 @@
             "blockable": "*",
             "optionally-blockable": []
           },
-          "origin": ["cross-origin-http", "same-host-http"],
+          "origin": [
+            "cross-origin-http",
+            "same-host-http"
+          ],
           "expectation": "blocked"
         },
         {
@@ -81,7 +93,10 @@
             "blockable": "websocket-request",
             "optionally-blockable": []
           },
-          "origin": ["cross-origin-ws", "same-host-ws"],
+          "origin": [
+            "cross-origin-ws",
+            "same-host-ws"
+          ],
           "expectation": "blocked"
         }
       ]
@@ -98,12 +113,17 @@
           "source_protocol": "https",
           "delivery_type": "*",
           "delivery_value": "*",
-          "redirection": ["no-redirect", "keep-scheme-redirect"],
+          "redirection": [
+            "no-redirect",
+            "keep-scheme-redirect"
+          ],
           "subresource": {
             "blockable": "*",
             "optionally-blockable": "*"
           },
-          "origin": ["same-host-https"],
+          "origin": [
+            "same-host-https"
+          ],
           "expectation": "allowed"
         },
         {
@@ -112,20 +132,23 @@
           "source_protocol": "https",
           "delivery_type": "*",
           "delivery_value": "*",
-          "redirection": ["no-redirect", "keep-scheme-redirect"],
+          "redirection": [
+            "no-redirect",
+            "keep-scheme-redirect"
+          ],
           "subresource": {
             "blockable": "websocket-request",
             "optionally-blockable": []
           },
-          "origin": ["same-host-wss"],
+          "origin": [
+            "same-host-wss"
+          ],
           "expectation": "allowed"
         }
       ]
     }
   ],
-
   "delivery_key": "mixedContent",
-
   "excluded_tests": [
     {
       "name": "Skip-redundant-no-opt-in",
@@ -184,7 +207,10 @@
       "source_protocol": "*",
       "delivery_type": "meta",
       "delivery_value": "opt-in",
-      "redirection": ["keep-scheme-redirect", "swap-scheme-redirect"],
+      "redirection": [
+        "keep-scheme-redirect",
+        "swap-scheme-redirect"
+      ],
       "subresource": {
         "blockable": "*",
         "optionally-blockable": "*"
@@ -193,7 +219,6 @@
       "expectation": "*"
     }
   ],
-
   "test_expansion_schema": {
     "expansion": [
       "default",

third_party/blink/web_tests/external/wpt/referrer-policy/README.md

@@ -30,6 +30,8 @@ Invoking ```./generic/tools/generate.py``` will parse the spec JSON and determin
 
 The spec can be validated by running ```./generic/tools/spec_validator.py```. This is specially important when you're making changes to  ```spec.src.json```. Make sure it's a valid JSON (no comments or trailing commas). The validator should be informative and very specific on any issues.
 
+The ```spec.src.json``` file can be formatted by running ```../common/security-features/tools/format_spec_src_json.py```.
+
 For details about the spec JSON, see **Overview of the spec JSON** below.
 
 

third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json

@@ -11,7 +11,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": null,
           "redirection": "*",
           "origin": "*",
@@ -23,7 +27,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": null,
           "redirection": "*",
           "origin": "*",
@@ -35,7 +43,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": null,
           "redirection": "*",
           "origin": "*",
@@ -47,7 +59,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": null,
           "redirection": "*",
           "origin": "*",
@@ -67,7 +83,11 @@
           "expansion": "default",
           "source_protocol": "*",
           "target_protocol": "*",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "no-referrer",
           "redirection": "*",
           "origin": "*",
@@ -87,7 +107,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
           "origin": "*",
@@ -99,7 +123,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
           "origin": "*",
@@ -111,7 +139,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
           "origin": "*",
@@ -123,7 +155,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
           "origin": "*",
@@ -143,7 +179,11 @@
           "expansion": "default",
           "source_protocol": "*",
           "target_protocol": "*",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "origin",
           "redirection": "*",
           "origin": "*",
@@ -163,7 +203,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "same-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -175,7 +219,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "same-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -187,7 +235,11 @@
           "expansion": "override",
           "source_protocol": "*",
           "target_protocol": "*",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "same-origin",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
@@ -199,7 +251,11 @@
           "expansion": "default",
           "source_protocol": "*",
           "target_protocol": "*",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "same-origin",
           "redirection": "*",
           "origin": "cross-origin",
@@ -219,7 +275,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -231,7 +291,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -243,7 +307,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -255,7 +323,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -267,7 +339,11 @@
           "expansion": "override",
           "source_protocol": "*",
           "target_protocol": "*",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "origin-when-cross-origin",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
@@ -279,7 +355,11 @@
           "expansion": "default",
           "source_protocol": "*",
           "target_protocol": "*",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
           "origin": "cross-origin",
@@ -299,7 +379,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin",
           "redirection": "*",
           "origin": "*",
@@ -311,7 +395,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin",
           "redirection": "*",
           "origin": "*",
@@ -323,7 +411,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin",
           "redirection": "*",
           "origin": "*",
@@ -335,7 +427,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin",
           "redirection": "*",
           "origin": "*",
@@ -355,7 +451,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -367,7 +467,11 @@
           "expansion": "override",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
@@ -379,7 +483,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
           "origin": "cross-origin",
@@ -391,7 +499,11 @@
           "expansion": "default",
           "source_protocol": "http",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
           "origin": "*",
@@ -403,7 +515,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "http",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
           "origin": "*",
@@ -415,7 +531,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
           "origin": "same-origin",
@@ -427,7 +547,11 @@
           "expansion": "override",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
@@ -439,7 +563,11 @@
           "expansion": "default",
           "source_protocol": "https",
           "target_protocol": "https",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
           "origin": "cross-origin",
@@ -459,7 +587,11 @@
           "expansion": "default",
           "source_protocol": "*",
           "target_protocol": "*",
-          "delivery_type": ["http-rp", "meta-referrer", "attr-referrer"],
+          "delivery_type": [
+            "http-rp",
+            "meta-referrer",
+            "attr-referrer"
+          ],
           "delivery_value": "unsafe-url",
           "redirection": "*",
           "origin": "*",
@@ -469,10 +601,8 @@
       ]
     }
   ],
-
   "delivery_key": "referrerPolicy",
-
-  "excluded_tests":[
+  "excluded_tests": [
     {
       "name": "cross-origin-workers",
       "expansion": "*",
@@ -522,7 +652,9 @@
       "expansion": "*",
       "source_protocol": "*",
       "target_protocol": "*",
-      "delivery_type": ["attr-referrer"],
+      "delivery_type": [
+        "attr-referrer"
+      ],
       "delivery_value": "*",
       "redirection": "*",
       "origin": "*",
@@ -540,7 +672,9 @@
       "expansion": "*",
       "source_protocol": "*",
       "target_protocol": "*",
-      "delivery_type": ["rel-noreferrer"],
+      "delivery_type": [
+        "rel-noreferrer"
+      ],
       "delivery_value": "*",
       "redirection": "*",
       "origin": "*",
@@ -592,9 +726,15 @@
       "target_protocol": "*",
       "delivery_type": "*",
       "delivery_value": "*",
-      "redirection": ["keep-origin-redirect", "swap-origin-redirect"],
+      "redirection": [
+        "keep-origin-redirect",
+        "swap-origin-redirect"
+      ],
       "origin": "*",
-      "subresource": ["a-tag", "area-tag"],
+      "subresource": [
+        "a-tag",
+        "area-tag"
+      ],
       "expectation": "*"
     },
     {
@@ -610,20 +750,17 @@
       "expectation": "*"
     }
   ],
-
   "test_expansion_schema": {
     "expansion": [
       "default",
       "override"
     ],
-
     "delivery_type": [
       "http-rp",
       "meta-referrer",
       "attr-referrer",
       "rel-noreferrer"
     ],
-
     "delivery_value": [
       null,
       "no-referrer",
@@ -635,28 +772,23 @@
       "strict-origin-when-cross-origin",
       "unsafe-url"
     ],
-
     "origin": [
       "same-origin",
       "cross-origin"
     ],
-
     "source_protocol": [
       "http",
       "https"
     ],
-
     "target_protocol": [
       "http",
       "https"
     ],
-
     "redirection": [
       "no-redirect",
       "keep-origin-redirect",
       "swap-origin-redirect"
     ],
-
     "subresource": [
       "iframe-tag",
       "img-tag",
@@ -669,7 +801,6 @@
       "shared-worker",
       "fetch-request"
     ],
-
     "expectation": [
       "omitted",
       "origin",