PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
Files
create-pull-request/patch-cdf415c
cromite/build/patches/Revert-removal-of-execution-context-address-space.patch
T

850 lines
50 KiB
Diff
Raw Permalink Blame History

From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Fri, 24 Jun 2022 22:24:22 +0200
Subject: Revert removal of execution context address space
Revert "[Private Network Access] Remove ExecutionContext::SetAddressSpace()."
This reverts commit dfa3a4a6c0d023e5126dad31f6c479dc8d20e416.
Revert "[Private Network Access] Remove ExecutionContext::AddressSpace()."
This reverts commit a5c64b9f5f985cfebab3375b53062321a62e3e31.
Revert "[Private Network Access] Remove GlobalScopeCreationParams address space."
This reverts commit c32df617780283942d49ca5574fcd6b7f691e9c1.
Revert "[Private Network Access] Remove WorkerClassicScriptLoader address space."
This reverts commit 11f6a3e29bee9a6590a4fd56b28e8048200c18d0.
Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../core/execution_context/execution_context.cc | 9 +++++++++
.../core/execution_context/execution_context.h | 4 ++++
.../core/exported/web_shared_worker_impl.cc | 1 +
.../renderer/core/frame/policy_container.cc | 10 ++++++++++
.../blink/renderer/core/frame/policy_container.h | 11 +++++++++++
.../custom/layout_worklet_global_scope_proxy.cc | 1 +
...alled_service_worker_module_script_fetcher.cc | 1 +
.../modulescript/module_script_loader_test.cc | 1 +
.../modulescript/worker_module_script_fetcher.cc | 3 ++-
.../renderer/core/workers/dedicated_worker.cc | 10 +++++++++-
.../renderer/core/workers/dedicated_worker.h | 3 +++
.../workers/dedicated_worker_global_scope.cc | 9 ++++++++-
.../core/workers/dedicated_worker_global_scope.h | 1 +
.../core/workers/global_scope_creation_params.cc | 2 ++
.../core/workers/global_scope_creation_params.h | 7 +++++++
.../core/workers/installed_scripts_manager.cc | 16 ++++++++++++++++
.../core/workers/installed_scripts_manager.h | 5 +++++
.../core/workers/main_thread_worklet_test.cc | 1 +
.../core/workers/shared_worker_global_scope.cc | 7 +++++++
.../core/workers/shared_worker_global_scope.h | 1 +
.../workers/threaded_worklet_messaging_proxy.cc | 5 ++++-
.../core/workers/threaded_worklet_test.cc | 1 +
.../core/workers/worker_classic_script_loader.cc | 6 +++++-
.../core/workers/worker_classic_script_loader.h | 6 ++++++
.../renderer/core/workers/worker_global_scope.h | 2 ++
.../renderer/core/workers/worker_thread_test.cc | 2 ++
.../core/workers/worker_thread_test_helper.h | 6 ++++++
.../csspaint/paint_worklet_global_scope_proxy.cc | 2 +-
.../modules/exported/web_embedded_worker_impl.cc | 1 +
.../service_worker_global_scope.cc | 13 +++++++++++--
.../service_worker/service_worker_global_scope.h | 2 ++
.../webaudio/audio_worklet_global_scope_test.cc | 1 +
.../webaudio/audio_worklet_thread_test.cc | 1 +
.../worklet/worklet_thread_test_common.cc | 2 +-
34 files changed, 144 insertions(+), 9 deletions(-)
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -515,6 +515,15 @@ void ExecutionContext::SetReferrerPolicy(
policy_container_->UpdateReferrerPolicy(referrer_policy);
}
+network::mojom::IPAddressSpace ExecutionContext::AddressSpace() const {
+ return policy_container_->GetIPAddressSpace();
+}
+
+void ExecutionContext::SetAddressSpace(
+ network::mojom::blink::IPAddressSpace ip_address_space) {
+ GetPolicyContainer()->SetIPAddressSpace(ip_address_space);
+}
+
void ExecutionContext::SetPolicyContainer(
std::unique_ptr<PolicyContainer> container) {
policy_container_ = std::move(container);
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -34,6 +34,7 @@
#include "net/storage_access_api/status.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom-blink-forward.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h"
#include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h"
#include "third_party/blink/public/common/fingerprinting_protection/noise_token.h"
#include "third_party/blink/public/common/tokens/tokens.h"
@@ -383,6 +384,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
const String& message = g_empty_string,
const String& source_file = g_empty_string) const {}
+ network::mojom::IPAddressSpace AddressSpace() const;
+ void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
+
HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
unsigned ContextLifecycleStateObserverCountForTesting() const;
diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
--- a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
@@ -285,6 +285,7 @@ void WebSharedWorkerImpl::StartWorkerContext(
MakeGarbageCollected<WorkerClients>(),
std::make_unique<SharedWorkerContentSettingsProxy>(
std::move(content_settings)),
+ std::nullopt /* response_address_space */,
nullptr /* inherited_trial_features */, devtools_worker_token,
std::move(worker_settings), mojom::blink::V8CacheOptions::kDefault,
nullptr /* worklet_module_response_map */,
diff --git a/third_party/blink/renderer/core/frame/policy_container.cc b/third_party/blink/renderer/core/frame/policy_container.cc
--- a/third_party/blink/renderer/core/frame/policy_container.cc
+++ b/third_party/blink/renderer/core/frame/policy_container.cc
@@ -45,12 +45,22 @@ network::mojom::blink::ReferrerPolicy PolicyContainer::GetReferrerPolicy()
return policies_->referrer_policy;
}
+network::mojom::blink::IPAddressSpace PolicyContainer::GetIPAddressSpace()
+ const {
+ return policies_->ip_address_space;
+}
+
void PolicyContainer::UpdateReferrerPolicy(
network::mojom::blink::ReferrerPolicy policy) {
policies_->referrer_policy = policy;
policy_container_host_remote_->SetReferrerPolicy(policy);
}
+void PolicyContainer::SetIPAddressSpace(
+ network::mojom::IPAddressSpace ip_address_space) {
+ policies_->ip_address_space = ip_address_space;
+}
+
const mojom::blink::PolicyContainerPolicies& PolicyContainer::GetPolicies()
const {
return *policies_;
diff --git a/third_party/blink/renderer/core/frame/policy_container.h b/third_party/blink/renderer/core/frame/policy_container.h
--- a/third_party/blink/renderer/core/frame/policy_container.h
+++ b/third_party/blink/renderer/core/frame/policy_container.h
@@ -7,6 +7,7 @@
#include "mojo/public/cpp/bindings/associated_remote.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink-forward.h"
+#include "services/network/public/mojom/ip_address_space.mojom-shared.h"
#include "services/network/public/mojom/referrer_policy.mojom-shared.h"
#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/mojom/frame/policy_container.mojom-blink.h"
@@ -43,6 +44,16 @@ class CORE_EXPORT PolicyContainer {
void UpdateReferrerPolicy(network::mojom::blink::ReferrerPolicy policy);
network::mojom::blink::ReferrerPolicy GetReferrerPolicy() const;
+ // This setter is used only by worklets and workers, which do not sync the
+ // PolicyContainer with the browser.
+ //
+ // TODO(https://crbug.com/1177199): Remove this when we implement policy
+ // inheritance for workers/worklets using the PolicyContainer.
+ void SetIPAddressSpace(
+ network::mojom::IPAddressSpace ip_address_space);
+
+ network::mojom::blink::IPAddressSpace GetIPAddressSpace() const;
+
// Append |policies| to the list of Content Security Policy and sync them with
// the PolicyContainerHost.
void AddContentSecurityPolicies(
diff --git a/third_party/blink/renderer/core/layout/custom/layout_worklet_global_scope_proxy.cc b/third_party/blink/renderer/core/layout/custom/layout_worklet_global_scope_proxy.cc
--- a/third_party/blink/renderer/core/layout/custom/layout_worklet_global_scope_proxy.cc
+++ b/third_party/blink/renderer/core/layout/custom/layout_worklet_global_scope_proxy.cc
@@ -49,6 +49,7 @@ LayoutWorkletGlobalScopeProxy::LayoutWorkletGlobalScopeProxy(
window->GetSecurityOrigin(), window->IsSecureContext(),
window->GetHttpsState(), nullptr /* worker_clients */,
frame_client->CreateWorkerContentSettingsClient(),
+ window->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(window).get(),
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault, module_responses_map,
diff --git a/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc b/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc
--- a/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc
+++ b/third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc
@@ -70,6 +70,7 @@ void InstalledServiceWorkerModuleScriptFetcher::Fetch(
global_scope_->Initialize(
response_url, response_referrer_policy,
+ script_data->GetResponseAddressSpace(),
ParseContentSecurityPolicyHeaders(
script_data->GetContentSecurityPolicyResponseHeaders()),
// TODO(crbug.com/488089240): Plumb Document Policy in Service Workers.
diff --git a/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc b/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
--- a/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
+++ b/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
@@ -227,6 +227,7 @@ void ModuleScriptLoaderTest::InitializeForWorklet() {
DocumentPolicy::DocumentPolicyBundle{}, security_origin_.get(),
true /* is_secure_context */, HttpsState::kModern,
nullptr /* worker_clients */, nullptr /* content_settings_client */,
+ network::mojom::IPAddressSpace::kLocal,
nullptr /* inherited_trial_features */, base::UnguessableToken::Create(),
nullptr /* worker_settings */, mojom::blink::V8CacheOptions::kDefault,
MakeGarbageCollected<WorkletModuleResponsesMap>(),
diff --git a/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc b/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc
--- a/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc
+++ b/third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc
@@ -6,6 +6,7 @@
#include <memory>
+#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
#include "services/network/public/mojom/referrer_policy.mojom-blink.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/loader/network_utils.h"
@@ -192,7 +193,7 @@ void WorkerModuleScriptFetcher::NotifyClient(
// Step 12.3-12.6 are implemented in Initialize().
global_scope_->Initialize(
- response_url, response_referrer_policy,
+ response_url, response_referrer_policy, response.AddressSpace(),
ParseContentSecurityPolicyHeaders(
ContentSecurityPolicyResponseHeaders(response)),
// TODO(crbug.com/488090079): Plumb Document Policy in Module Workers.
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third_party/blink/renderer/core/workers/dedicated_worker.cc
--- a/third_party/blink/renderer/core/workers/dedicated_worker.cc
+++ b/third_party/blink/renderer/core/workers/dedicated_worker.cc
@@ -370,6 +370,7 @@ void DedicatedWorker::OnScriptLoadStarted(
network::mojom::ReferrerPolicy::kDefault,
Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
DocumentPolicy::DocumentPolicyBundle{},
+ std::nullopt /* response_address_space */,
std::move(back_forward_cache_controller_host),
std::move(coep_reporting_observer),
std::move(dip_reporting_observer));
@@ -438,6 +439,7 @@ void DedicatedWorker::OnFinished(
->GetParsedPolicies())
: Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
classic_script_loader_->GetDocumentPolicy(),
+ classic_script_loader_->ResponseAddressSpace(),
std::move(back_forward_cache_controller_host),
/*coep_reporting_observer=*/mojo::NullReceiver(),
/*dip_reporting_observer=*/mojo::NullReceiver());
@@ -456,6 +458,7 @@ void DedicatedWorker::ContinueStart(
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
back_forward_cache_controller_host,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
@@ -481,6 +484,7 @@ void DedicatedWorker::ContinueStart(
std::move(referrer_policy),
std::move(response_content_security_policies),
std::move(response_document_policy),
+ response_address_space,
std::move(back_forward_cache_controller_host),
std::move(coep_reporting_observer),
std::move(dip_reporting_observer)),
@@ -491,6 +495,7 @@ void DedicatedWorker::ContinueStart(
script_url, std::move(worker_main_script_load_params),
std::move(referrer_policy), std::move(response_content_security_policies),
std::move(response_document_policy),
+ response_address_space,
std::move(back_forward_cache_controller_host),
std::move(coep_reporting_observer), std::move(dip_reporting_observer));
}
@@ -503,6 +508,7 @@ void DedicatedWorker::ContinueStartInternal(
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
DocumentPolicy::DocumentPolicyBundle document_policy,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
back_forward_cache_controller_host,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
@@ -517,7 +523,7 @@ void DedicatedWorker::ContinueStartInternal(
CreateGlobalScopeCreationParams(
script_url, referrer_policy,
std::move(response_content_security_policies),
- std::move(document_policy), std::move(coep_reporting_observer),
+ std::move(document_policy), response_address_space, std::move(coep_reporting_observer),
std::move(dip_reporting_observer)),
std::move(worker_main_script_load_params), options_, script_url,
*outside_fetch_client_settings_object_, v8_stack_trace_id_, token_,
@@ -556,6 +562,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
DocumentPolicy::DocumentPolicyBundle document_policy,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
coep_reporting_observer,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
@@ -608,6 +615,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
std::move(document_policy), execution_context->GetSecurityOrigin(),
execution_context->IsSecureContext(), execution_context->GetHttpsState(),
MakeGarbageCollected<WorkerClients>(), CreateWebContentSettingsClient(),
+ response_address_space,
OriginTrialContext::GetInheritedTrialFeatures(execution_context).get(),
parent_devtools_token, std::move(settings),
mojom::blink::V8CacheOptions::kDefault,
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.h b/third_party/blink/renderer/core/workers/dedicated_worker.h
--- a/third_party/blink/renderer/core/workers/dedicated_worker.h
+++ b/third_party/blink/renderer/core/workers/dedicated_worker.h
@@ -160,6 +160,7 @@ class CORE_EXPORT DedicatedWorker final
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
back_forward_cache_controller_host,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
@@ -174,6 +175,7 @@ class CORE_EXPORT DedicatedWorker final
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
back_forward_cache_controller_host,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
@@ -186,6 +188,7 @@ class CORE_EXPORT DedicatedWorker final
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
response_content_security_policies,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
coep_reporting_observer,
mojo::PendingReceiver<mojom::blink::ReportingObserver>
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc
--- a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc
@@ -118,8 +118,10 @@ DedicatedWorkerGlobalScope* DedicatedWorkerGlobalScope::Create(
// Legacy on-the-main-thread worker script fetch (to be removed):
// Pass dummy origin trial tokens here as it is already set to outside's
// origin trial tokens in DedicatedWorkerGlobalScope's constructor.
+ std::optional<network::mojom::IPAddressSpace> response_address_space =
+ creation_params->response_address_space;
global_scope->Initialize(response_script_url, response_referrer_policy,
- std::move(response_csp),
+ *response_address_space, std::move(response_csp),
std::move(response_document_policy),
nullptr /* response_origin_trial_tokens */);
return global_scope;
@@ -241,6 +243,7 @@ const AtomicString& DedicatedWorkerGlobalScope::InterfaceName() const {
void DedicatedWorkerGlobalScope::Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* /* response_origin_trial_tokens */) {
@@ -257,6 +260,9 @@ void DedicatedWorkerGlobalScope::Initialize(
// parsing the `Referrer-Policy` header of response."
SetReferrerPolicy(response_referrer_policy);
+ // https://wicg.github.io/cors-rfc1918/#integration-html
+ SetAddressSpace(response_address_space);
+
// The following is the Content-Security-Policy part of "Initialize worker
// global scope's policy container"
// https://html.spec.whatwg.org/#initialize-worker-policy-container
@@ -510,6 +516,7 @@ void DedicatedWorkerGlobalScope::DidFetchClassicScript(
// Pass dummy origin trial tokens here as it is already set to outside's
// origin trial tokens in DedicatedWorkerGlobalScope's constructor.
Initialize(classic_script_loader->ResponseURL(), response_referrer_policy,
+ classic_script_loader->ResponseAddressSpace(),
classic_script_loader->GetContentSecurityPolicy()
? mojo::Clone(classic_script_loader->GetContentSecurityPolicy()
->GetParsedPolicies())
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.h b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.h
--- a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.h
+++ b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.h
@@ -111,6 +111,7 @@ class CORE_EXPORT DedicatedWorkerGlobalScope final : public WorkerGlobalScope {
void Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens) override;
diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_params.cc b/third_party/blink/renderer/core/workers/global_scope_creation_params.cc
--- a/third_party/blink/renderer/core/workers/global_scope_creation_params.cc
+++ b/third_party/blink/renderer/core/workers/global_scope_creation_params.cc
@@ -34,6 +34,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams(
HttpsState starter_https_state,
WorkerClients* worker_clients,
std::unique_ptr<WebContentSettingsClient> content_settings_client,
+ std::optional<network::mojom::IPAddressSpace> response_address_space,
const Vector<mojom::blink::OriginTrialFeature>* inherited_trial_features,
const base::UnguessableToken& parent_devtools_token,
std::unique_ptr<WorkerSettings> worker_settings,
@@ -80,6 +81,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams(
starter_https_state(starter_https_state),
worker_clients(worker_clients),
content_settings_client(std::move(content_settings_client)),
+ response_address_space(response_address_space),
parent_devtools_token(parent_devtools_token),
worker_settings(std::move(worker_settings)),
v8_cache_options(v8_cache_options),
diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_params.h b/third_party/blink/renderer/core/workers/global_scope_creation_params.h
--- a/third_party/blink/renderer/core/workers/global_scope_creation_params.h
+++ b/third_party/blink/renderer/core/workers/global_scope_creation_params.h
@@ -14,6 +14,7 @@
#include "net/storage_access_api/status.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "services/network/public/cpp/permissions_policy/permissions_policy.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h"
#include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h"
#include "third_party/blink/public/common/permissions_policy/document_policy.h"
#include "third_party/blink/public/common/tokens/tokens.h"
@@ -65,6 +66,7 @@ struct CORE_EXPORT GlobalScopeCreationParams final {
HttpsState starter_https_state,
WorkerClients*,
std::unique_ptr<WebContentSettingsClient>,
+ std::optional<network::mojom::IPAddressSpace>,
const Vector<mojom::blink::OriginTrialFeature>* inherited_trial_features,
const base::UnguessableToken& parent_devtools_token,
std::unique_ptr<WorkerSettings>,
@@ -190,6 +192,11 @@ struct CORE_EXPORT GlobalScopeCreationParams final {
std::unique_ptr<WebContentSettingsClient> content_settings_client;
+ // Worker script response's address space. This is valid only when the worker
+ // script is fetched on the main thread (i.e., when
+ // |off_main_thread_fetch_option| is kDisabled).
+ std::optional<network::mojom::IPAddressSpace> response_address_space;
+
base::UnguessableToken parent_devtools_token;
std::unique_ptr<WorkerSettings> worker_settings;
diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.cc b/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
--- a/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
+++ b/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/core/workers/installed_scripts_manager.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
#include "third_party/blink/renderer/core/frame/csp/content_security_policy.h"
#include "third_party/blink/renderer/core/origin_trials/origin_trial_context.h"
#include "third_party/blink/renderer/platform/network/http_names.h"
@@ -20,6 +21,21 @@ InstalledScriptsManager::ScriptData::ScriptData(
source_text_(std::move(source_text)),
meta_data_(std::move(meta_data)) {
headers_.Adopt(std::move(header_data));
+
+ // Calculate an address space from worker script's response url according to
+ // the "CORS and RFC1918" spec:
+ // https://wicg.github.io/cors-rfc1918/#integration-html
+ //
+ // Currently this implementation is not fully consistent with the spec for
+ // historical reasons.
+ // TODO(https://crbug.com/955213): Make this consistent with the spec.
+ // TODO(https://crbug.com/955213): Move this function to a more appropriate
+ // place so that this is shareable out of worker code.
+ response_address_space_ = network::mojom::IPAddressSpace::kPublic;
+ if (network_utils::IsReservedIPAddress(script_url_.Host()))
+ response_address_space_ = network::mojom::IPAddressSpace::kLocal;
+ if (SecurityOrigin::Create(script_url_)->IsLocalhost())
+ response_address_space_ = network::mojom::IPAddressSpace::kLoopback;
}
ContentSecurityPolicyResponseHeaders
diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.h b/third_party/blink/renderer/core/workers/installed_scripts_manager.h
--- a/third_party/blink/renderer/core/workers/installed_scripts_manager.h
+++ b/third_party/blink/renderer/core/workers/installed_scripts_manager.h
@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_WORKERS_INSTALLED_SCRIPTS_MANAGER_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_WORKERS_INSTALLED_SCRIPTS_MANAGER_H_
+#include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/platform/network/content_security_policy_response_headers.h"
#include "third_party/blink/renderer/platform/network/http_header_map.h"
@@ -45,6 +46,9 @@ class InstalledScriptsManager {
GetContentSecurityPolicyResponseHeaders();
String GetReferrerPolicy();
String GetHttpContentType();
+ network::mojom::IPAddressSpace GetResponseAddressSpace() const {
+ return response_address_space_;
+ }
std::unique_ptr<Vector<String>> CreateOriginTrialTokens();
private:
@@ -52,6 +56,7 @@ class InstalledScriptsManager {
String source_text_;
std::unique_ptr<Vector<uint8_t>> meta_data_;
HTTPHeaderMap headers_;
+ network::mojom::IPAddressSpace response_address_space_;
};
// Used on the main or worker thread. Returns true if the script has been
diff --git a/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc b/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc
--- a/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc
+++ b/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc
@@ -73,6 +73,7 @@ class MainThreadWorkletTest : public PageTestBase {
window->GetSecurityOrigin(), window->IsSecureContext(),
window->GetHttpsState(), nullptr /* worker_clients */,
nullptr /* content_settings_client */,
+ window->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(window).get(),
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault,
diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc b/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc
--- a/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc
@@ -82,6 +82,7 @@ const AtomicString& SharedWorkerGlobalScope::InterfaceName() const {
void SharedWorkerGlobalScope::Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens) {
@@ -96,6 +97,9 @@ void SharedWorkerGlobalScope::Initialize(
// parsing the `Referrer-Policy` header of response."
SetReferrerPolicy(response_referrer_policy);
+ // https://wicg.github.io/cors-rfc1918/#integration-html
+ SetAddressSpace(response_address_space);
+
// Step 12.6. "Execute the Initialize a global object's CSP list algorithm
// on worker global scope and response. [CSP]"
// SharedWorkerGlobalScope inherits the outside's CSP instead of the response
@@ -105,6 +109,8 @@ void SharedWorkerGlobalScope::Initialize(
// https://fetch.spec.whatwg.org/#local-scheme
//
// https://w3c.github.io/webappsec-csp/#initialize-global-object-csp
+ // These should be called after SetAddressSpace() to correctly override the
+ // address space by the "treat-as-public-address" CSP directive.
Vector<network::mojom::blink::ContentSecurityPolicyPtr> csp_headers =
response_url.ProtocolIsAbout() || response_url.ProtocolIsData() ||
response_url.ProtocolIs("blob")
@@ -251,6 +257,7 @@ void SharedWorkerGlobalScope::DidFetchClassicScript(
// Step 12.3-12.6 are implemented in Initialize().
Initialize(classic_script_loader->ResponseURL(), response_referrer_policy,
+ classic_script_loader->ResponseAddressSpace(),
classic_script_loader->GetContentSecurityPolicy()
? mojo::Clone(classic_script_loader->GetContentSecurityPolicy()
->GetParsedPolicies())
diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope.h b/third_party/blink/renderer/core/workers/shared_worker_global_scope.h
--- a/third_party/blink/renderer/core/workers/shared_worker_global_scope.h
+++ b/third_party/blink/renderer/core/workers/shared_worker_global_scope.h
@@ -65,6 +65,7 @@ class CORE_EXPORT SharedWorkerGlobalScope final : public WorkerGlobalScope {
void Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens) override;
diff --git a/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc b/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc
--- a/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc
+++ b/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc
@@ -94,7 +94,9 @@ void ThreadedWorkletMessagingProxy::Initialize(
starter_secure_context,
/*starter_https_state=*/HttpsState::kNone,
/*worker_clients=*/nullptr,
- /*content_settings_client=*/nullptr, &inherited_trial_features,
+ /*content_settings_client=*/nullptr,
+ /*response_address_space*/network::mojom::IPAddressSpace::kUnknown,
+ &inherited_trial_features,
/*parent_devtools_token=*/
client_provided_global_scope_creation_params->devtools_token,
/*worker_settings=*/nullptr,
@@ -146,6 +148,7 @@ void ThreadedWorkletMessagingProxy::Initialize(
window->GetSecurityOrigin(), window->IsSecureContext(),
window->GetHttpsState(), worker_clients,
frame_client->CreateWorkerContentSettingsClient(),
+ window->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(window).get(),
base::UnguessableToken::Create(),
std::make_unique<WorkerSettings>(window->GetFrame()->GetSettings()),
diff --git a/third_party/blink/renderer/core/workers/threaded_worklet_test.cc b/third_party/blink/renderer/core/workers/threaded_worklet_test.cc
--- a/third_party/blink/renderer/core/workers/threaded_worklet_test.cc
+++ b/third_party/blink/renderer/core/workers/threaded_worklet_test.cc
@@ -220,6 +220,7 @@ class ThreadedWorkletMessagingProxyForTest
GetExecutionContext()->IsSecureContext(),
GetExecutionContext()->GetHttpsState(), worker_clients,
nullptr /* content_settings_client */,
+ GetExecutionContext()->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(GetExecutionContext())
.get(),
base::UnguessableToken::Create(), std::move(worker_settings),
diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
@@ -30,6 +30,8 @@
#include <memory>
#include "base/memory/scoped_refptr.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
+#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include "third_party/blink/renderer/core/execution_context/execution_context.h"
#include "third_party/blink/renderer/core/frame/csp/content_security_policy.h"
@@ -101,7 +103,8 @@ String CheckSameOriginEnforcement(const KURL& request_url,
} // namespace
-WorkerClassicScriptLoader::WorkerClassicScriptLoader() {}
+WorkerClassicScriptLoader::WorkerClassicScriptLoader()
+ : response_address_space_(network::mojom::IPAddressSpace::kPublic) {}
void WorkerClassicScriptLoader::LoadSynchronously(
ExecutionContext& execution_context,
@@ -235,6 +238,7 @@ void WorkerClassicScriptLoader::DidReceiveResponse(
identifier_ = identifier;
response_url_ = response.ResponseUrl();
response_encoding_ = response.TextEncodingName();
+ response_address_space_ = response.AddressSpace();
referrer_policy_ = response.HttpHeaderField(http_names::kReferrerPolicy);
ProcessContentSecurityPolicy(response);
diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.h b/third_party/blink/renderer/core/workers/worker_classic_script_loader.h
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.h
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.h
@@ -32,6 +32,7 @@
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h"
#include "services/network/public/mojom/url_loader_factory.mojom-blink.h"
#include "third_party/blink/public/common/permissions_policy/document_policy.h"
#include "third_party/blink/public/mojom/loader/resource_load_info_notifier.mojom-shared.h"
@@ -124,6 +125,10 @@ class CORE_EXPORT WorkerClassicScriptLoader final
return document_policy_;
}
+ network::mojom::IPAddressSpace ResponseAddressSpace() const {
+ return response_address_space_;
+ }
+
const Vector<String>* OriginTrialTokens() const {
return origin_trial_tokens_.get();
}
@@ -179,6 +184,7 @@ class CORE_EXPORT WorkerClassicScriptLoader final
uint64_t identifier_ = 0;
std::unique_ptr<Vector<uint8_t>> cached_metadata_;
Member<ContentSecurityPolicy> content_security_policy_;
+ network::mojom::IPAddressSpace response_address_space_;
std::unique_ptr<Vector<String>> origin_trial_tokens_;
String referrer_policy_;
DocumentPolicy::DocumentPolicyBundle document_policy_;
diff --git a/third_party/blink/renderer/core/workers/worker_global_scope.h b/third_party/blink/renderer/core/workers/worker_global_scope.h
--- a/third_party/blink/renderer/core/workers/worker_global_scope.h
+++ b/third_party/blink/renderer/core/workers/worker_global_scope.h
@@ -33,6 +33,7 @@
#include "base/time/time.h"
#include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
#include "third_party/blink/public/common/permissions_policy/document_policy.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h"
#include "third_party/blink/public/common/tokens/tokens.h"
#include "third_party/blink/public/mojom/loader/code_cache.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/script/script_type.mojom-blink-forward.h"
@@ -175,6 +176,7 @@ class CORE_EXPORT WorkerGlobalScope
virtual void Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens) = 0;
diff --git a/third_party/blink/renderer/core/workers/worker_thread_test.cc b/third_party/blink/renderer/core/workers/worker_thread_test.cc
--- a/third_party/blink/renderer/core/workers/worker_thread_test.cc
+++ b/third_party/blink/renderer/core/workers/worker_thread_test.cc
@@ -10,6 +10,7 @@
#include "base/run_loop.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
@@ -387,6 +388,7 @@ TEST_F(WorkerThreadTest, Terminate_WhileDebuggerTaskIsRunningOnInitialization) {
CalculateHttpsState(security_origin_.get()),
MakeGarbageCollected<WorkerClients>(),
nullptr /* content_settings_client */,
+ network::mojom::IPAddressSpace::kLocal,
nullptr /* inherited_trial_features */,
base::UnguessableToken::Create(),
std::make_unique<WorkerSettings>(std::make_unique<Settings>().get()),
diff --git a/third_party/blink/renderer/core/workers/worker_thread_test_helper.h b/third_party/blink/renderer/core/workers/worker_thread_test_helper.h
--- a/third_party/blink/renderer/core/workers/worker_thread_test_helper.h
+++ b/third_party/blink/renderer/core/workers/worker_thread_test_helper.h
@@ -10,6 +10,7 @@
#include "base/synchronization/waitable_event.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
+#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/blink/public/common/loader/worker_main_script_load_parameters.h"
#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
@@ -79,12 +80,16 @@ class FakeWorkerGlobalScope : public WorkerGlobalScope {
void Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens) override {
InitializeURL(response_url);
SetReferrerPolicy(response_referrer_policy);
+ SetAddressSpace(response_address_space);
+ // These should be called after SetAddressSpace() to correctly override the
+ // address space by the "treat-as-public-address" CSP directive.
InitContentSecurityPolicyFromVector(std::move(response_csp));
BindContentSecurityPolicyToExecutionContext();
@@ -167,6 +172,7 @@ class WorkerThreadForTest : public WorkerThread {
false /* starter_secure_context */,
CalculateHttpsState(security_origin), worker_clients,
nullptr /* content_settings_client */,
+ network::mojom::IPAddressSpace::kLocal,
nullptr /* inherited_trial_features */,
base::UnguessableToken::Create(),
std::make_unique<WorkerSettings>(std::make_unique<Settings>().get()),
diff --git a/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc b/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc
--- a/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc
+++ b/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc
@@ -47,7 +47,7 @@ PaintWorkletGlobalScopeProxy::PaintWorkletGlobalScopeProxy(
window->GetReferrerPolicy(), DocumentPolicy::DocumentPolicyBundle{},
window->GetSecurityOrigin(), window->IsSecureContext(),
window->GetHttpsState(), nullptr /* worker_clients */,
- frame_client->CreateWorkerContentSettingsClient(),
+ frame_client->CreateWorkerContentSettingsClient(), window->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(window).get(),
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault, module_responses_map,
diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
--- a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
+++ b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
@@ -222,6 +222,7 @@ void WebEmbeddedWorkerImpl::StartWorkerThread(
DocumentPolicy::DocumentPolicyBundle{}, starter_origin.get(),
starter_secure_context, starter_https_state,
/*worker_clients=*/nullptr, std::move(content_settings_proxy),
+ std::nullopt /* response_address_space */,
/*inherited_trial_features=*/nullptr,
worker_start_data->devtools_worker_token, std::move(worker_settings),
// Generate the full code cache in the first execution of the script.
diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
--- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
+++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
@@ -472,6 +472,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript(
// is set, and with the following callback steps given evaluationStatus:"
RunClassicScript(
classic_script_loader->ResponseURL(), referrer_policy,
+ classic_script_loader->ResponseAddressSpace(),
classic_script_loader->GetContentSecurityPolicy()
? mojo::Clone(classic_script_loader->GetContentSecurityPolicy()
->GetParsedPolicies())
@@ -486,6 +487,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript(
void ServiceWorkerGlobalScope::Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens) {
@@ -500,6 +502,9 @@ void ServiceWorkerGlobalScope::Initialize(
// script resource's referrer policy."
SetReferrerPolicy(response_referrer_policy);
+ // https://wicg.github.io/cors-rfc1918/#integration-html
+ SetAddressSpace(response_address_space);
+
// This is quoted from the "Content Security Policy" algorithm in the service
// workers spec:
// "Whenever a user agent invokes Run Service Worker algorithm with a service
@@ -510,6 +515,9 @@ void ServiceWorkerGlobalScope::Initialize(
// - If serviceWorker's script resource was delivered with a
// Content-Security-Policy-Report-Only HTTP header containing the value
// policy, the user agent must monitor policy for serviceWorker."
+ //
+ // These should be called after SetAddressSpace() to correctly override the
+ // address space by the "treat-as-public-address" CSP directive.
InitContentSecurityPolicyFromVector(std::move(response_csp));
BindContentSecurityPolicyToExecutionContext();
@@ -555,7 +563,7 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript(
}
RunClassicScript(
- script_url, referrer_policy,
+ script_url, referrer_policy, script_data->GetResponseAddressSpace(),
ParseContentSecurityPolicyHeaders(
script_data->GetContentSecurityPolicyResponseHeaders()),
// TODO(crbug.com/488089240): Plumb Document Policy in Service Workers.
@@ -568,6 +576,7 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript(
void ServiceWorkerGlobalScope::RunClassicScript(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens,
@@ -575,7 +584,7 @@ void ServiceWorkerGlobalScope::RunClassicScript(
std::unique_ptr<Vector<uint8_t>> cached_meta_data,
const v8_inspector::V8StackTraceId& stack_id) {
// Step 4.5-4.11 are implemented in Initialize().
- Initialize(response_url, response_referrer_policy, std::move(response_csp),
+ Initialize(response_url, response_referrer_policy, response_address_space, std::move(response_csp),
std::move(response_document_policy), response_origin_trial_tokens);
// Step 4.12. "Let evaluationStatus be the result of running the classic
diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
--- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
+++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
@@ -128,6 +128,7 @@ class MODULES_EXPORT ServiceWorkerGlobalScope final
void Initialize(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens) override;
@@ -410,6 +411,7 @@ class MODULES_EXPORT ServiceWorkerGlobalScope final
void RunClassicScript(
const KURL& response_url,
network::mojom::ReferrerPolicy response_referrer_policy,
+ network::mojom::IPAddressSpace response_address_space,
Vector<network::mojom::blink::ContentSecurityPolicyPtr> response_csp,
DocumentPolicy::DocumentPolicyBundle response_document_policy,
const Vector<String>* response_origin_trial_tokens,
diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc
--- a/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc
@@ -89,6 +89,7 @@ class AudioWorkletGlobalScopeTest : public PageTestBase, public ModuleTestBase {
window->GetSecurityOrigin(), window->IsSecureContext(),
window->GetHttpsState(), nullptr /* worker_clients */,
nullptr /* content_settings_client */,
+ window->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(window).get(),
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault,
diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
--- a/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
@@ -109,6 +109,7 @@ class AudioWorkletThreadTest : public PageTestBase, public ModuleTestBase {
window->GetSecurityOrigin(), window->IsSecureContext(),
window->GetHttpsState(), nullptr /* worker_clients */,
nullptr /* content_settings_client */,
+ window->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(window).get(),
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault,
diff --git a/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc b/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc
--- a/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc
+++ b/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc
@@ -39,7 +39,7 @@ CreateAnimationAndPaintWorkletThread(
window->GetReferrerPolicy(), DocumentPolicy::DocumentPolicyBundle{},
window->GetSecurityOrigin(), window->IsSecureContext(),
window->GetHttpsState(), clients,
- nullptr /* content_settings_client */,
+ nullptr /* content_settings_client */, window->AddressSpace(),
OriginTrialContext::GetInheritedTrialFeatures(window).get(),
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault,
--
Reference in New Issue View Git Blame Copy Permalink