Bug 1903940 [wpt PR 46853] - Shared Storage: Add non-live dataOption …

…to createWorklet for use counter, a=testonly Automatic update from web-platform-tests Shared Storage: Add non-live dataOption to createWorklet for use counter We proposed a breaking change to sharedStorage.createWorklet() in WICG/shared-storage#158. We add a use counter for how frequently createWorklet is called in a non-forward-compatible way according to the proposal (i.e. with a cross-origin script but without the option dataOrigin: "script- origin"). This will help us determine what the impact of this change would be. Bug: 348445878 Change-Id: I3b882a9ec859beb5265ba31d3169fb5e1239cac4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5645568 Reviewed-by: Yao Xiao <[email protected]> Commit-Queue: Cammie Smith Barnes <[email protected]> Cr-Commit-Position: refs/heads/main@{#1318000} -- wpt-commits: 25b56c5748119452697daf6903523c3523fbb64a wpt-pr: 46853
mozilla · Jun 26, 2024 · 7b658b0 · 7b658b0
1 parent eae7ce0
commit 7b658b0
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 0 deletions.
diff --git a/...ts/shared-storage/cross-origin-create-worklet-data-origin-option.tentative.https.sub.html b/...ts/shared-storage/cross-origin-create-worklet-data-origin-option.tentative.https.sub.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/shared-storage/resources/util.js"></script>
+<script src="/shared-storage/resources/util.sub.js"></script>
+<script src="/fenced-frame/resources/utils.js"></script>
+
+<body>
+<script>
+'use strict';
+
+async_test(t => {
+  testCreateWorkletWithDataOption(
+    t, "context-origin", "key0", "value0", /*is_same_origin_script=*/false,
+    /*expect_success=*/true);
+}, 'For cross-origin createWorklet with dataOrigin option "context-origin", '
+   + 'there is no error.');
+
+async_test(t => {
+  testCreateWorkletWithDataOption(
+    t, "script-origin", "key0", "value0", /*is_same_origin_script=*/false,
+    /*expect_success=*/true);
+}, 'For cross-origin createWorklet with dataOrigin option "script-origin", '
+   + 'there is no error.');
+
+async_test(t => {
+  testCreateWorkletWithDataOption(
+    t, "invalid", "key0", "value0", /*is_same_origin_script=*/false,
+    /*expect_success=*/false);
+}, 'For cross-origin createWorklet with dataOrigin option "invalid", '
+   + 'there is a TypeError thrown.');
+
+</script>
+</body>
diff --git a/testing/web-platform/tests/shared-storage/resources/util.sub.js b/testing/web-platform/tests/shared-storage/resources/util.sub.js
@@ -117,3 +117,45 @@ async function loadNestedSharedStorageFrameInNewFrame(data) {
   await windowPromise;
   return {frame: frame, nestedFrame: nestedFrame, nestedFrameUrl: nestedSrc};
 }
+
+async function testCreateWorkletWithDataOption(
+    test, data_origin, key, value, is_same_origin_script, expect_success) {
+  const sameOrigin = location.origin;
+  const crossOrigin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+  const sameOriginScriptUrl = `/shared-storage/resources/simple-module.js`;
+  const scriptOrigin = is_same_origin_script ? sameOrigin : crossOrigin;
+  const scriptUrl = is_same_origin_script ? sameOriginScriptUrl :
+                                            crossOrigin + sameOriginScriptUrl;
+
+  try {
+    // Currently the `dataOrigin` option is not hooked up.
+    const worklet = await sharedStorage.createWorklet(
+        scriptUrl, {credentials: 'omit', dataOrigin: data_origin});
+
+    const ancestor_key = token();
+    let url0 =
+        generateURL('/shared-storage/resources/frame0.html', [ancestor_key]);
+
+    let select_url_result =
+        await worklet.selectURL('test-url-selection-operation', [{url: url0}], {
+          data: {'mockResult': 0, 'setKey': key, 'setValue': value},
+          resolveToConfig: true,
+          keepAlive: true
+        });
+
+    assert_true(validateSelectURLResult(select_url_result, true));
+    attachFencedFrame(select_url_result, 'opaque-ads');
+    const result0 = await nextValueFromServer(ancestor_key);
+    assert_equals(result0, 'frame0_loaded');
+
+    await verifyKeyValueForOrigin(key, value, scriptOrigin);
+    await deleteKeyForOrigin(key, scriptOrigin);
+    assert_true(expect_success, 'no error caught even though one was expected');
+  } catch (e) {
+    assert_false(
+        expect_success, 'expected success but error thrown: ' + e.toString());
+    assert_equals(e.name, 'TypeError');
+  } finally {
+    test.done();
+  }
+}
diff --git a/...sts/shared-storage/same-origin-create-worklet-data-origin-option.tentative.https.sub.html b/...sts/shared-storage/same-origin-create-worklet-data-origin-option.tentative.https.sub.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/shared-storage/resources/util.js"></script>
+<script src="/shared-storage/resources/util.sub.js"></script>
+<script src="/fenced-frame/resources/utils.js"></script>
+
+<body>
+<script>
+'use strict';
+
+async_test(t => {
+  testCreateWorkletWithDataOption(
+    t, "context-origin", "key0", "value0", /*is_same_origin_script=*/true,
+    /*expect_success=*/true);
+}, 'For same-origin createWorklet with dataOrigin option "context-origin", '
+   + 'there is no error.');
+
+async_test(t => {
+  testCreateWorkletWithDataOption(
+    t, "script-origin", "key0", "value0", /*is_same_origin_script=*/true,
+    /*expect_success=*/true);
+}, 'For same-origin createWorklet with dataOrigin option "script-origin", '
+   + 'there is no error.');
+
+async_test(t => {
+  testCreateWorkletWithDataOption(
+    t, "invalid", "key0", "value0", /*is_same_origin_script=*/true,
+    /*expect_success=*/false);
+}, 'For same-origin createWorklet with dataOrigin option "invalid", '
+   + 'there is a TypeError thrown.');
+
+</script>
+</body>