third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp - Issue 1487343002: Set credentials mode "same-origin" when crossOrigin=anonymous 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: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

Issue 1487343002: Set credentials mode "same-origin" when crossOrigin=anonymous is set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: set credentials mode in DocumentThreadableLoader::makeCrossOriginAccessRequest() Created 5 years 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/img-crossorigin-cookies.html ('K') | « third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp ('k') | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

index d323bb2befc05e3524ee1c60da797f4a97d1aaa4..509185c67303c61953a7abb87d487261d4649157 100644

--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

@@ -256,6 +256,9 @@ void DocumentThreadableLoader::makeCrossOriginAccessRequest(const ResourceReques

ResourceRequest crossOriginRequest(request);

ResourceLoaderOptions crossOriginOptions(m_resourceLoaderOptions);

updateRequestForAccessControl(crossOriginRequest, securityOrigin(), effectiveAllowCredentials());

+ // We update the credentials mode according to effectiveAllowCredentials() here for backward compatibility. But this is not correct.

+ // FIXME: We should set it in the caller of DocumentThreadableLoader.

+ crossOriginRequest.setFetchCredentialsMode(effectiveAllowCredentials() == AllowStoredCredentials ? WebURLRequest::FetchCredentialsModeInclude : WebURLRequest::FetchCredentialsModeOmit);

loadRequest(crossOriginRequest, crossOriginOptions);

} else {

m_crossOriginNonSimpleRequest = true;

@@ -264,6 +267,9 @@ void DocumentThreadableLoader::makeCrossOriginAccessRequest(const ResourceReques

OwnPtr<ResourceLoaderOptions> crossOriginOptions = adoptPtr(new ResourceLoaderOptions(m_resourceLoaderOptions));

// Do not set the Origin header for preflight requests.

updateRequestForAccessControl(*crossOriginRequest, 0, effectiveAllowCredentials());

+ // We update the credentials mode according to effectiveAllowCredentials() here for backward compatibility. But this is not correct.

+ // FIXME: We should set it in the caller of DocumentThreadableLoader.

+ crossOriginRequest->setFetchCredentialsMode(effectiveAllowCredentials() == AllowStoredCredentials ? WebURLRequest::FetchCredentialsModeInclude : WebURLRequest::FetchCredentialsModeOmit);

m_actualRequest = crossOriginRequest.release();

m_actualOptions = crossOriginOptions.release();