Worker: Add upgrade-insecure-requests tests for top-level classic shared worker script loading

nhiroki · Hexcles · commit 4fd7cb25c3eb · 2019-08-07T12:05:05.000-07:00
This CL changes the code generator of upgrade-insecure-requests tests to add tests for top-level classic shared worker script loading. The test files (shared-worker-(redirect-)upgrade.https.html) are generated by external/wpt/upgrade-insecure-requests/support/generate.py. Bug: 917532, 989399 Change-Id: If4a3f27c6c8fe08e55dc8d86a8cbf925596490fa Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728570 Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org> Reviewed-by: Hiroshige Hayashizaki <hiroshige@chromium.org> Cr-Commit-Position: refs/heads/master@{#683445}
diff --git a/upgrade-insecure-requests/shared-worker-redirect-upgrade.https.html b/upgrade-insecure-requests/shared-worker-redirect-upgrade.https.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- Generated by wpt/upgrade-insecure-requests/support/generate.py -->
+<title>Upgrade Insecure Requests: shared-worker.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/testharness-helper.sub.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+</head>
+<body>
+<script>
+const tests = generateRedirectTests(ResourceType.SHARED_WORKER, true);
+tests.forEach(test => testMap['shared-worker'](test));
+</script>
+</body>
+</html>
diff --git a/upgrade-insecure-requests/shared-worker-upgrade.https.html b/upgrade-insecure-requests/shared-worker-upgrade.https.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- Generated by wpt/upgrade-insecure-requests/support/generate.py -->
+<title>Upgrade Insecure Requests: shared-worker.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/testharness-helper.sub.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+</head>
+<body>
+<script>
+const tests = generateTests(ResourceType.SHARED_WORKER, true);
+tests.forEach(test => testMap['shared-worker'](test));
+</script>
+</body>
+</html>
diff --git a/upgrade-insecure-requests/support/generate.py b/upgrade-insecure-requests/support/generate.py
@@ -40,11 +40,19 @@ def getLong(file):
   ('worker', 'WORKER'),
   ('module-worker', 'WORKER'),
   ('worker-subresource-xhr', 'FETCH'),
-  ('worker-subresource-fetch', 'FETCH')]:
-  sameOriginOnly = 'true' if resourceType == 'WORKER' else 'false'
+  ('worker-subresource-fetch', 'FETCH'),
+  ('shared-worker', 'SHARED_WORKER')]:
+  # TODO(https://crbug.com/989399): Add tests for subresource requests on shared
+  # workers, and main/subresource requests on service workers.
+
+  sameOriginOnly = 'false'
+  if resourceType == 'WORKER' or resourceType == 'SHARED_WORKER':
+    sameOriginOnly = 'true'
+
   types = [('', 'generateTests'), ('-redirect', 'generateRedirectTests')]
   if name == 'module-worker' or resourceType == 'WORKLET':
     types.append(('-import', 'generateModuleImportTests'))
+
   for typeName, generatorName in types:
     filename = '%s%s-upgrade.https.html' % (name, typeName)
     with open(filename, 'w') as html_file:
diff --git a/upgrade-insecure-requests/support/testharness-helper.sub.js b/upgrade-insecure-requests/support/testharness-helper.sub.js
@@ -12,6 +12,7 @@ const ResourceType = {
   IMAGE: "image",
   FRAME: "frame",
   WORKER: "worker",
+  SHARED_WORKER: "shared-worker",
   WORKLET: "worklet",
   WEBSOCKET: "websocket",
   FETCH: "fetch",
@@ -36,6 +37,8 @@ function generateURL(host, protocol, resourceType) {
     url.pathname = "echo";
   } else if (resourceType == ResourceType.WORKER) {
     url.pathname += "worker.py";
+  } else if (resourceType == ResourceType.SHARED_WORKER) {
+    url.pathname += "shared-worker.py";
   } else if (resourceType == ResourceType.WORKLET) {
     url.pathname += "worker.py";
   } else if (resourceType == ResourceType.FETCH) {
@@ -184,6 +187,10 @@ const testMap = {
                                         {}),
         test.name),
 
+  "shared-worker":
+    test => promise_test(
+        () => requestViaSharedWorker(test.url), test.name),
+
   "audio-worklet":
     test => promise_test(
         () => requestViaWorklet('audio', test.url), test.name),
