content/browser/service_worker/service_worker_dispatcher_host.cc - Issue 2196633002: [ServiceWorker] Don't check the origin equality when disable-web-security flag is set.

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: content/browser/service_worker/service_worker_dispatcher_host.cc

Issue 2196633002: [ServiceWorker] Don't check the origin equality when disable-web-security flag is set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: incorporated nhiroki's comment Created 4 years, 5 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

« no previous file with comments | « content/browser/service_worker/service_worker_browsertest.cc ('k') | content/common/service_worker/service_worker_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_dispatcher_host.cc

diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc

index 7355acc9a7b1f8ebfca03c71eb8ab67235c443be..81e8a6ddd609b1a9a63039292f43e931d3cf9bb9 100644

--- a/content/browser/service_worker/service_worker_dispatcher_host.cc

+++ b/content/browser/service_worker/service_worker_dispatcher_host.cc

@@ -64,7 +64,8 @@ bool CanUnregisterServiceWorker(const GURL& document_url,

const GURL& pattern) {

DCHECK(document_url.is_valid());

DCHECK(pattern.is_valid());

- return document_url.GetOrigin() == pattern.GetOrigin() &&

+ return ServiceWorkerUtils::PassOriginEqualitySecurityCheck<GURL>(document_url,

+ pattern) &&

OriginCanAccessServiceWorkers(document_url) &&

OriginCanAccessServiceWorkers(pattern);

}

@@ -74,14 +75,16 @@ bool CanUpdateServiceWorker(const GURL& document_url, const GURL& pattern) {

DCHECK(pattern.is_valid());

DCHECK(OriginCanAccessServiceWorkers(document_url));

DCHECK(OriginCanAccessServiceWorkers(pattern));

- return document_url.GetOrigin() == pattern.GetOrigin();

+ return ServiceWorkerUtils::PassOriginEqualitySecurityCheck<GURL>(document_url,

+ pattern);

}

bool CanGetRegistration(const GURL& document_url,

const GURL& given_document_url) {

DCHECK(document_url.is_valid());

DCHECK(given_document_url.is_valid());

- return document_url.GetOrigin() == given_document_url.GetOrigin() &&

+ return ServiceWorkerUtils::PassOriginEqualitySecurityCheck<GURL>(

+ document_url, given_document_url) &&

OriginCanAccessServiceWorkers(document_url) &&

OriginCanAccessServiceWorkers(given_document_url);

}