third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp - Issue 2790693002: Split CSP into pre- and post-upgrade checks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

Issue 2790693002: Split CSP into pre- and post-upgrade checks (Closed)

Patch Set: add unit tests Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/report-original-url.php ('K') | « third_party/WebKit/Source/core/workers/AbstractWorker.cpp ('k') | third_party/WebKit/Source/platform/loader/fetch/FetchContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

index 87ceca0eaae9fe283357b4c7552698af58cc8fb1..83630936aa5289b6138d6583689b378636dd9260 100644

--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

@@ -246,10 +246,14 @@ void ServiceWorkerContainer::RegisterServiceWorkerImpl(

ContentSecurityPolicy* csp = execution_context->GetContentSecurityPolicy();

if (csp) {

if (!(csp->AllowRequestWithoutIntegrity(

- WebURLRequest::kRequestContextServiceWorker, script_url) &&

+ WebURLRequest::kRequestContextServiceWorker, script_url,

+ ResourceRequest::RedirectStatus::kNoRedirect,

+ SecurityViolationReportingPolicy::kReport,

+ kContentSecurityPolicyHeaderTypeEnforce) &&

csp->AllowWorkerContextFromSource(

script_url, ResourceRequest::RedirectStatus::kNoRedirect,

- SecurityViolationReportingPolicy::kReport))) {

+ SecurityViolationReportingPolicy::kReport,

+ kContentSecurityPolicyHeaderTypeEnforce))) {

callbacks->OnError(WebServiceWorkerError(

WebServiceWorkerError::kErrorTypeSecurity,

String(