web-platform-tests · cookiecrook · Mar 22, 2023 · Mar 22, 2023 · Mar 22, 2023 · Mar 21, 2023
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -233,7 +233,7 @@ jobs:
       toxenv: py310
 
 - job: tools_unittest_win_py37
-  displayName: 'tools/ unittests: Windows + Python 3.6'
+  displayName: 'tools/ unittests: Windows + Python 3.7'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.tools_unittest']
   pool:
@@ -243,7 +243,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '3.7'
       addToPath: false
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
@@ -268,22 +268,22 @@ jobs:
       directory: tools/
       toxenv: py310
 
-- job: wptrunner_unittest_win_py36
-  displayName: 'tools/wptrunner/ unittests: Windows + Python 3.6'
+- job: wptrunner_unittest_win_py37
+  displayName: 'tools/wptrunner/ unittests: Windows + Python 3.7'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
   pool:
     vmImage: 'windows-2019'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '3.7'
       addToPath: false
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wptrunner/
-      toxenv: py36
+      toxenv: py37
 
 - job: wptrunner_unittest_win_py310
   displayName: 'tools/wptrunner/ unittests: Windows + Python 3.10'
@@ -302,8 +302,8 @@ jobs:
       directory: tools/wptrunner/
       toxenv: py310
 
-- job: wpt_integration_win_py36
-  displayName: 'tools/wpt/ tests: Windows + Python 3.6'
+- job: wpt_integration_win_py37
+  displayName: 'tools/wpt/ tests: Windows + Python 3.7'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
@@ -312,7 +312,7 @@ jobs:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '3.7'
   # currently just using the outdated Chrome/Firefox on the VM rather than
   # figuring out how to install Chrome Dev channel on Windows
   # - template: tools/ci/azure/install_chrome.yml
@@ -322,7 +322,7 @@ jobs:
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wpt/
-      toxenv: py36
+      toxenv: py37
 
 - job: wpt_integration_win_py310
   displayName: 'tools/wpt/ tests: Windows + Python 3.10'

diff --git a/.well-known/web-identity b/.well-known/web-identity
@@ -26,6 +26,8 @@ def main(request, response):
   if request.headers.get(b"Origin"):
     return (534, [], "Should not have Origin")
 
+  response.headers.set(b"Content-Type", b"application/json")
+
   return """
 {{
   "provider_urls": [

diff --git a/IndexedDB/back-forward-cache-open-connection.window.js b/IndexedDB/back-forward-cache-open-connection.window.js
@@ -4,6 +4,7 @@
 // META: script=resources/support.js
 // META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
 // META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: timeout=long
 
 'use strict';
 

diff --git a/IndexedDB/back-forward-cache-open-transaction.window.js b/IndexedDB/back-forward-cache-open-transaction.window.js
@@ -3,6 +3,7 @@
 // META: script=/common/utils.js
 // META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
 // META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: timeout=long
 
 'use strict';
 

diff --git a/IndexedDB/storage-buckets.https.any.js b/IndexedDB/storage-buckets.https.any.js
@@ -1,14 +1,12 @@
 // META: title=Buckets API: Tests for indexedDB API.
 // META: global=window,worker
 // META: script=resources/support-promises.js
+// META: script=/storage/buckets/resources/util.js
 
 promise_test(async testCase => {
+  await prepareForBucketTest(testCase);
   const inboxBucket = await navigator.storageBuckets.open('inbox_bucket');
   const outboxBucket = await navigator.storageBuckets.open('outbox_bucket');
-  testCase.add_cleanup(async () => {
-    await navigator.storageBuckets.delete('inbox_bucket');
-    await navigator.storageBuckets.delete('outbox_bucket');
-  });
 
   // Set up similar databases in two buckets.
   const inboxDb = await new Promise((resolve, reject) => {
@@ -77,6 +75,7 @@ promise_test(async testCase => {
 }, 'Basic test that buckets create independent databases.');
 
 promise_test(async testCase => {
+  await prepareForBucketTest(testCase);
   const inboxBucket = await navigator.storageBuckets.open('inbox');
   await navigator.storageBuckets.delete('inbox');
 

diff --git a/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js b/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js
@@ -1,4 +1,5 @@
 // META: title=WebCryptoAPI: deriveBits() Using ECDH with CFRG Elliptic Curves
+// META: script=cfrg_curves_bits_fixtures.js
 // META: script=cfrg_curves_bits.js
 
 // Define subtests from a `promise_test` to ensure the harness does not

diff --git a/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js b/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js
@@ -3,25 +3,34 @@ function define_tests() {
   // May want to test prefixed implementations.
   var subtle = self.crypto.subtle;
 
-  var pkcs8 = {
-      "X25519": new Uint8Array([48, 46, 2, 1, 0, 48, 5, 6, 3, 43, 101, 110, 4, 34, 4, 32, 200, 131, 142, 118, 208, 87, 223, 183, 216, 201, 90, 105, 225, 56, 22, 10, 221, 99, 115, 253, 113, 164, 210, 118, 187, 86, 227, 168, 27, 100, 255, 97]),
-      "X448": new Uint8Array([48, 70, 2, 1, 0, 48, 5, 6, 3, 43, 101, 111, 4, 58, 4, 56, 88, 199, 210, 154, 62, 181, 25, 178, 157, 0, 207, 177, 145, 187, 100, 252, 109, 138, 66, 216, 241, 113, 118, 39, 43, 137, 242, 39, 45, 24, 25, 41, 92, 101, 37, 192, 130, 150, 113, 176, 82, 239, 7, 39, 83, 15, 24, 142, 49, 208, 204, 83, 191, 38, 146, 158])
-  };
-
-  var spki = {
-      "X25519": new Uint8Array([48, 42, 48, 5, 6, 3, 43, 101, 110, 3, 33, 0, 28, 242, 177, 230, 2, 46, 197, 55, 55, 30, 215, 245, 62, 84, 250, 17, 84, 216, 62, 152, 235, 100, 234, 81, 250, 229, 179, 48, 124, 254, 151, 6]),
-      "X448": new Uint8Array([48, 66, 48, 5, 6, 3, 43, 101, 111, 3, 57, 0, 182, 4, 161, 209, 165, 205, 29, 148, 38, 213, 97, 239, 99, 10, 158, 177, 108, 190, 105, 213, 185, 202, 97, 94, 220, 83, 99, 62, 251, 82, 234, 49, 230, 230, 160, 161, 219, 172, 198, 231, 108, 188, 230, 72, 45, 126, 75, 163, 213, 93, 158, 128, 39, 101, 206, 111])
-  };
-
-  var sizes = {
-      "X25519": 32,
-      "X448": 56
-  };
-
-  var derivations = {
-      "X25519": new Uint8Array([39, 104, 64, 157, 250, 185, 158, 194, 59, 140, 137, 185, 63, 245, 136, 2, 149, 247, 97, 118, 8, 143, 137, 228, 61, 254, 190, 126, 161, 149, 0, 8]),
-      "X448": new Uint8Array([240, 246, 197, 241, 127, 148, 244, 41, 30, 171, 113, 120, 134, 109, 55, 236, 137, 6, 221, 108, 81, 65, 67, 220, 133, 190, 124, 242, 141, 239, 243, 155, 114, 110, 15, 109, 207, 129, 14, 181, 148, 220, 169, 123, 72, 130, 189, 68, 196, 62, 167, 220, 103, 244, 154, 78])
-  };
+  // Verify the derive functions perform checks against the all-zero value results,
+  // ensuring small-order points are rejected.
+  // https://www.rfc-editor.org/rfc/rfc7748#section-6.1
+  // TODO: The spec states that the check must be done on use, but there is discussion about doing it on import.
+  // https://github.com/WICG/webcrypto-secure-curves/pull/13
+  Object.keys(kSmallOrderPoint).forEach(function(algorithmName) {
+      kSmallOrderPoint[algorithmName].forEach(function(test) {
+          promise_test(async() => {
+              let derived;
+              let privateKey;
+              let publicKey;
+              try {
+                  privateKey = await subtle.importKey("pkcs8", pkcs8[algorithmName],
+                                                  {name: algorithmName},
+                                                  false, ["deriveBits", "deriveKey"]);
+                  publicKey = await subtle.importKey("spki", test.vector,
+                                                 {name: algorithmName},
+                                                 false, [])
+                  derived = await subtle.deriveBits({name: algorithmName, public: publicKey}, privateKey, 8 * sizes[algorithmName]);
+              } catch (err) {
+                  assert_false(privateKey === undefined, "Private key should be valid.");
+                  assert_false(publicKey === undefined, "Public key should be valid.");
+                  assert_equals(err.name, "OperationError", "Should throw correct error, not " + err.name + ": " + err.message + ".");
+              }
+              assert_equals(derived, undefined, "Operation succeeded, but should not have.");
+          }, algorithmName + " key derivation checks for all-zero value result with a key of order " + test.order);
+      });
+  });
 
   return importKeys(pkcs8, spki, sizes)
   .then(function(results) {

diff --git a/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js b/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js
diff --git a/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js b/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js
@@ -1,4 +1,5 @@
 // META: title=WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves
+// META: script=cfrg_curves_bits_fixtures.js
 // META: script=cfrg_curves_keys.js
 
 // Define subtests from a `promise_test` to ensure the harness does not

diff --git a/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js b/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js
@@ -3,25 +3,50 @@ function define_tests() {
   // May want to test prefixed implementations.
   var subtle = self.crypto.subtle;
 
-  var pkcs8 = {
-    "X25519": new Uint8Array([48, 46, 2, 1, 0, 48, 5, 6, 3, 43, 101, 110, 4, 34, 4, 32, 200, 131, 142, 118, 208, 87, 223, 183, 216, 201, 90, 105, 225, 56, 22, 10, 221, 99, 115, 253, 113, 164, 210, 118, 187, 86, 227, 168, 27, 100, 255, 97]),
-    "X448": new Uint8Array([48, 70, 2, 1, 0, 48, 5, 6, 3, 43, 101, 111, 4, 58, 4, 56, 88, 199, 210, 154, 62, 181, 25, 178, 157, 0, 207, 177, 145, 187, 100, 252, 109, 138, 66, 216, 241, 113, 118, 39, 43, 137, 242, 39, 45, 24, 25, 41, 92, 101, 37, 192, 130, 150, 113, 176, 82, 239, 7, 39, 83, 15, 24, 142, 49, 208, 204, 83, 191, 38, 146, 158])
-  };
-
-  var spki = {
-      "X25519": new Uint8Array([48, 42, 48, 5, 6, 3, 43, 101, 110, 3, 33, 0, 28, 242, 177, 230, 2, 46, 197, 55, 55, 30, 215, 245, 62, 84, 250, 17, 84, 216, 62, 152, 235, 100, 234, 81, 250, 229, 179, 48, 124, 254, 151, 6]),
-      "X448": new Uint8Array([48, 66, 48, 5, 6, 3, 43, 101, 111, 3, 57, 0, 182, 4, 161, 209, 165, 205, 29, 148, 38, 213, 97, 239, 99, 10, 158, 177, 108, 190, 105, 213, 185, 202, 97, 94, 220, 83, 99, 62, 251, 82, 234, 49, 230, 230, 160, 161, 219, 172, 198, 231, 108, 188, 230, 72, 45, 126, 75, 163, 213, 93, 158, 128, 39, 101, 206, 111])
-  };
-
-  var sizes = {
-      "X25519": 32,
-      "X448": 56
-  };
-
-  var derivations = {
-      "X25519": new Uint8Array([39, 104, 64, 157, 250, 185, 158, 194, 59, 140, 137, 185, 63, 245, 136, 2, 149, 247, 97, 118, 8, 143, 137, 228, 61, 254, 190, 126, 161, 149, 0, 8]),
-      "X448": new Uint8Array([240, 246, 197, 241, 127, 148, 244, 41, 30, 171, 113, 120, 134, 109, 55, 236, 137, 6, 221, 108, 81, 65, 67, 220, 133, 190, 124, 242, 141, 239, 243, 155, 114, 110, 15, 109, 207, 129, 14, 181, 148, 220, 169, 123, 72, 130, 189, 68, 196, 62, 167, 220, 103, 244, 154, 78])
-  };
+  // Verify the derive functions perform checks against the all-zero value results,
+  // ensuring small-order points are rejected.
+  // https://www.rfc-editor.org/rfc/rfc7748#section-6.1
+  // TODO: The spec states that the check must be done on use, but there is discussion about doing it on import.
+  // https://github.com/WICG/webcrypto-secure-curves/pull/13
+  Object.keys(kSmallOrderPoint).forEach(function(algorithmName) {
+      kSmallOrderPoint[algorithmName].forEach(function(test) {
+          promise_test(async() => {
+              let derived;
+              let privateKey;
+              let publicKey;
+              try {
+                  privateKey = await subtle.importKey("pkcs8", pkcs8[algorithmName],
+                                                  {name: algorithmName},
+                                                  false, ["deriveBits", "deriveKey"]);
+                  publicKey = await subtle.importKey("spki", test.vector,
+                                                 {name: algorithmName},
+                                                 false, [])
+                  derived = await subtle.deriveKey({name: algorithmName, public: publicKey}, privateKey,
+                                                   {name: "HMAC", hash: "SHA-256", length: 256}, true,
+                                                   ["sign", "verify"]);
+              } catch (err) {
+                  assert_false(privateKey === undefined, "Private key should be valid.");
+                  assert_false(publicKey === undefined, "Public key should be valid.");
+                  assert_equals(err.name, "OperationError", "Should throw correct error, not " + err.name + ": " + err.message + ".");
+              }
+              assert_equals(derived, undefined, "Operation succeeded, but should not have.");
+          }, algorithmName + " deriveBits checks for all-zero value result with a key of order " + test.order);
+      });
+  });
+
+  // Ensure the keys generated by each algorithm are valid for key derivation.
+  Object.keys(sizes).forEach(function(algorithmName) {
+      promise_test(async() => {
+          let derived;
+          try {
+              let key = await subtle.generateKey({name: algorithmName}, true, ["deriveKey", "deriveBits"]);
+              derived = await subtle.deriveKey({name: algorithmName, public: key.publicKey}, key.privateKey, {name: "HMAC", hash: "SHA-256", length: 256}, true, ["sign", "verify"]);
+          } catch (err) {
+              assert_unreached("Threw an unexpected error: " + err.toString() + " -");
+          }
+          assert_false (derived === undefined, "Key derivation failed.");
+      }, "Key derivation using a " + algorithmName + " generated keys.");
+  });
 
   return importKeys(pkcs8, spki, sizes)
   .then(function(results) {

diff --git a/WebCryptoAPI/encrypt_decrypt/aes_gcm.https.any.js b/WebCryptoAPI/encrypt_decrypt/aes_gcm.https.any.js
@@ -1,4 +1,5 @@
-// META: title=WebCryptoAPI: encrypt() Using AES-GCM
+// META: title=WebCryptoAPI: encrypt() Using AES-GCM w/ 96-bit iv
+// META: script=aes_gcm_96_iv_fixtures.js
 // META: script=aes_gcm_vectors.js
 // META: script=aes.js
 // META: timeout=long

diff --git a/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv.https.any.js b/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv.https.any.js
@@ -0,0 +1,7 @@
+// META: title=WebCryptoAPI: encrypt() Using AES-GCM w/ 256-bit iv
+// META: script=aes_gcm_256_iv_fixtures.js
+// META: script=aes_gcm_vectors.js
+// META: script=aes.js
+// META: timeout=long
+
+run_test();