Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick fix for 1282354 from chromium (#32784)
Co-authored-by: Electron Bot <electron@github.com>
- Loading branch information
1 parent
8540d7d
commit f47bc6b
Showing
2 changed files
with
32 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Chris Bookholt <bookholt@chromium.org> | ||
Date: Tue, 11 Jan 2022 00:33:53 +0000 | ||
Subject: ServiceWorkerContainerHost::EnsureFileAccess: abort request | ||
processing if the requesting process lacks file access | ||
|
||
Bug: 1282354 | ||
Change-Id: Ia37ef5b97eedb0d2ad25ffe2869844a40e5be862 | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3379268 | ||
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org> | ||
Commit-Queue: Chris Bookholt <bookholt@chromium.org> | ||
Cr-Commit-Position: refs/heads/main@{#957344} | ||
|
||
diff --git a/content/browser/service_worker/service_worker_container_host.cc b/content/browser/service_worker/service_worker_container_host.cc | ||
index 5aca9f432a9efdb9739363e80b52233339529a1c..8b15f204e457904423da33b01bead1b03b59597a 100644 | ||
--- a/content/browser/service_worker/service_worker_container_host.cc | ||
+++ b/content/browser/service_worker/service_worker_container_host.cc | ||
@@ -375,10 +375,12 @@ void ServiceWorkerContainerHost::EnsureFileAccess( | ||
ChildProcessSecurityPolicyImpl* policy = | ||
ChildProcessSecurityPolicyImpl::GetInstance(); | ||
for (const auto& file : file_paths) { | ||
- if (!policy->CanReadFile(process_id_, file)) | ||
+ if (!policy->CanReadFile(process_id_, file)) { | ||
mojo::ReportBadMessage( | ||
"The renderer doesn't have access to the file " | ||
"but it tried to grant access to the controller."); | ||
+ return; | ||
+ } | ||
|
||
if (!policy->CanReadFile(controller_process_id, file)) | ||
policy->GrantReadFile(controller_process_id, file); |