Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: Source/modules/fetch/FetchManager.cpp

Issue 1279163005: Initial Fetch integration for Subresource Integrity (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add integration with FetchFormDataConsumerHandle Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/fetch/FetchManager.h" 6 #include "modules/fetch/FetchManager.h"
7 7
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
11 #include "bindings/core/v8/V8ThrowException.h" 11 #include "bindings/core/v8/V8ThrowException.h"
12 #include "core/dom/DOMArrayBuffer.h" 12 #include "core/dom/DOMArrayBuffer.h"
13 #include "core/dom/Document.h" 13 #include "core/dom/Document.h"
14 #include "core/dom/ExceptionCode.h" 14 #include "core/dom/ExceptionCode.h"
15 #include "core/fetch/FetchUtils.h" 15 #include "core/fetch/FetchUtils.h"
16 #include "core/fileapi/Blob.h" 16 #include "core/fileapi/Blob.h"
17 #include "core/frame/Frame.h" 17 #include "core/frame/Frame.h"
18 #include "core/frame/SubresourceIntegrity.h"
18 #include "core/frame/csp/ContentSecurityPolicy.h" 19 #include "core/frame/csp/ContentSecurityPolicy.h"
19 #include "core/inspector/ConsoleMessage.h" 20 #include "core/inspector/ConsoleMessage.h"
20 #include "core/inspector/InspectorInstrumentation.h" 21 #include "core/inspector/InspectorInstrumentation.h"
21 #include "core/loader/ThreadableLoader.h" 22 #include "core/loader/ThreadableLoader.h"
22 #include "core/loader/ThreadableLoaderClient.h" 23 #include "core/loader/ThreadableLoaderClient.h"
23 #include "core/page/ChromeClient.h" 24 #include "core/page/ChromeClient.h"
24 #include "core/page/Page.h" 25 #include "core/page/Page.h"
25 #include "modules/fetch/Body.h" 26 #include "modules/fetch/Body.h"
26 #include "modules/fetch/BodyStreamBuffer.h" 27 #include "modules/fetch/BodyStreamBuffer.h"
28 #include "modules/fetch/CompositeDataConsumerHandle.h"
27 #include "modules/fetch/DataConsumerHandleUtil.h" 29 #include "modules/fetch/DataConsumerHandleUtil.h"
30 #include "modules/fetch/FetchFormDataConsumerHandle.h"
28 #include "modules/fetch/FetchRequestData.h" 31 #include "modules/fetch/FetchRequestData.h"
29 #include "modules/fetch/Response.h" 32 #include "modules/fetch/Response.h"
30 #include "modules/fetch/ResponseInit.h" 33 #include "modules/fetch/ResponseInit.h"
31 #include "platform/network/ResourceError.h" 34 #include "platform/network/ResourceError.h"
32 #include "platform/network/ResourceRequest.h" 35 #include "platform/network/ResourceRequest.h"
33 #include "platform/network/ResourceResponse.h" 36 #include "platform/network/ResourceResponse.h"
34 #include "platform/weborigin/SecurityOrigin.h" 37 #include "platform/weborigin/SecurityOrigin.h"
35 #include "public/platform/WebURLRequest.h" 38 #include "public/platform/WebURLRequest.h"
36 #include "wtf/HashSet.h" 39 #include "wtf/HashSet.h"
40 #include "wtf/Vector.h"
41 #include "wtf/text/WTFString.h"
37 42
38 namespace blink { 43 namespace blink {
39 44
40 namespace { 45 namespace {
41 46
42 bool IsRedirectStatusCode(int statusCode) 47 bool IsRedirectStatusCode(int statusCode)
43 { 48 {
44 return (statusCode == 301 || statusCode == 302 || statusCode == 303 || statu sCode == 307 || statusCode == 308); 49 return (statusCode == 301 || statusCode == 302 || statusCode == 303 || statu sCode == 307 || statusCode == 308);
45 } 50 }
46 51
(...skipping 12 matching lines...) Expand all
59 64
60 void didReceiveResponse(unsigned long, const ResourceResponse&, PassOwnPtr<W ebDataConsumerHandle>) override; 65 void didReceiveResponse(unsigned long, const ResourceResponse&, PassOwnPtr<W ebDataConsumerHandle>) override;
61 void didFinishLoading(unsigned long, double) override; 66 void didFinishLoading(unsigned long, double) override;
62 void didFail(const ResourceError&) override; 67 void didFail(const ResourceError&) override;
63 void didFailAccessControlCheck(const ResourceError&) override; 68 void didFailAccessControlCheck(const ResourceError&) override;
64 void didFailRedirectCheck() override; 69 void didFailRedirectCheck() override;
65 70
66 void start(); 71 void start();
67 void dispose(); 72 void dispose();
68 73
74 class SRIVerifier final : public GarbageCollectedFinalized<SRIVerifier>, pub lic WebDataConsumerHandle::Client {
75 public:
76 // SRIVerifier takes ownership of |handle| and |response|.
77 // |updater| must be garbage collected. The other arguments
78 // all must have the lifetime of the give loader.
79 SRIVerifier(PassOwnPtr<WebDataConsumerHandle> handle, CompositeDataConsu merHandle::Updater* updater, Response* response, FetchManager::Loader* loader, S tring integrityMetadata, const KURL& url)
80 : m_handle(handle)
81 , m_updater(updater)
82 , m_response(response)
83 , m_loader(loader)
84 , m_integrityMetadata(integrityMetadata)
85 , m_url(url)
86 , m_finished(false)
87 {
88 m_reader = m_handle->obtainReader(this);
89 }
90
91 void didGetReadable() override
92 {
93 ASSERT(m_reader);
94 ASSERT(m_loader);
95 ASSERT(m_response);
96
97 WebDataConsumerHandle::Result r = WebDataConsumerHandle::Ok;
98 while (r == WebDataConsumerHandle::Ok) {
99 const void* buffer;
100 size_t size;
101 r = m_reader->beginRead(&buffer, WebDataConsumerHandle::FlagNone , &size);
102 if (r == WebDataConsumerHandle::Ok) {
103 m_buffer.append(static_cast<const char*>(buffer), size);
104 m_reader->endRead(size);
105 }
106 }
107 if (r == WebDataConsumerHandle::ShouldWait)
108 return;
109 String errorMessage = "Unknown error occurred while trying to verify integrity.";
110 m_finished = true;
111 if (r == WebDataConsumerHandle::Done) {
112 if (SubresourceIntegrity::CheckSubresourceIntegrity(m_integrityM etadata, String(m_buffer.data(), m_buffer.size()), m_url, *m_loader->document(), errorMessage)) {
113 m_updater->update(FetchFormDataConsumerHandle::create(m_buff er.data(), m_buffer.size()));
114 m_loader->m_resolver->resolve(m_response);
115 m_loader->m_resolver.clear();
116 // FetchManager::Loader::didFinishLoading() can
117 // be called before didGetReadable() is called
118 // when the data is ready. In that case,
119 // didFinishLoading() doesn't clean up and call
120 // notifyFinished(), so it is necessary to
121 // explicitly finish the loader here.
122 if (m_loader->m_didFinishLoading)
123 m_loader->loadSucceeded();
124 return;
125 }
126 }
127 m_updater->update(createUnexpectedErrorDataConsumerHandle());
128 m_loader->performNetworkError(errorMessage);
129 }
130
131 bool isFinished() const { return m_finished; }
132
133 DEFINE_INLINE_TRACE()
134 {
135 visitor->trace(m_updater);
136 visitor->trace(m_response);
137 visitor->trace(m_loader);
138 }
139 private:
140 OwnPtr<WebDataConsumerHandle> m_handle;
141 Member<CompositeDataConsumerHandle::Updater> m_updater;
142 Member<Response> m_response;
143 RawPtrWillBeMember<FetchManager::Loader> m_loader;
144 String m_integrityMetadata;
145 KURL m_url;
146 OwnPtr<WebDataConsumerHandle::Reader> m_reader;
147 Vector<char> m_buffer;
148 bool m_finished;
149 };
150
69 private: 151 private:
70 Loader(ExecutionContext*, FetchManager*, ScriptPromiseResolver*, FetchReques tData*); 152 Loader(ExecutionContext*, FetchManager*, ScriptPromiseResolver*, FetchReques tData*);
71 153
72 void performBasicFetch(); 154 void performBasicFetch();
73 void performNetworkError(const String& message); 155 void performNetworkError(const String& message);
74 void performHTTPFetch(bool corsFlag, bool corsPreflightFlag); 156 void performHTTPFetch(bool corsFlag, bool corsPreflightFlag);
75 void failed(const String& message); 157 void failed(const String& message);
76 void notifyFinished(); 158 void notifyFinished();
77 Document* document() const; 159 Document* document() const;
160 void loadSucceeded();
78 161
79 RawPtrWillBeMember<FetchManager> m_fetchManager; 162 RawPtrWillBeMember<FetchManager> m_fetchManager;
80 PersistentWillBeMember<ScriptPromiseResolver> m_resolver; 163 PersistentWillBeMember<ScriptPromiseResolver> m_resolver;
81 PersistentWillBeMember<FetchRequestData> m_request; 164 PersistentWillBeMember<FetchRequestData> m_request;
82 RefPtr<ThreadableLoader> m_loader; 165 RefPtr<ThreadableLoader> m_loader;
83 bool m_failed; 166 bool m_failed;
84 bool m_finished; 167 bool m_finished;
85 int m_responseHttpStatusCode; 168 int m_responseHttpStatusCode;
169 Member<SRIVerifier> m_integrityVerifier;
yhirano 2015/08/19 10:42:36 PersistentWillBeMember
jww 2015/08/19 16:43:40 Done.
170 bool m_didFinishLoading;
86 }; 171 };
87 172
88 FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* f etchManager, ScriptPromiseResolver* resolver, FetchRequestData* request) 173 FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* f etchManager, ScriptPromiseResolver* resolver, FetchRequestData* request)
89 : ContextLifecycleObserver(executionContext) 174 : ContextLifecycleObserver(executionContext)
90 , m_fetchManager(fetchManager) 175 , m_fetchManager(fetchManager)
91 , m_resolver(resolver) 176 , m_resolver(resolver)
92 , m_request(request) 177 , m_request(request)
93 , m_failed(false) 178 , m_failed(false)
94 , m_finished(false) 179 , m_finished(false)
95 , m_responseHttpStatusCode(0) 180 , m_responseHttpStatusCode(0)
181 , m_integrityVerifier(nullptr)
182 , m_didFinishLoading(false)
96 { 183 {
97 } 184 }
98 185
99 FetchManager::Loader::~Loader() 186 FetchManager::Loader::~Loader()
100 { 187 {
101 ASSERT(!m_loader); 188 ASSERT(!m_loader);
102 } 189 }
103 190
104 DEFINE_TRACE(FetchManager::Loader) 191 DEFINE_TRACE(FetchManager::Loader)
105 { 192 {
106 visitor->trace(m_fetchManager); 193 visitor->trace(m_fetchManager);
107 visitor->trace(m_resolver); 194 visitor->trace(m_resolver);
108 visitor->trace(m_request); 195 visitor->trace(m_request);
yhirano 2015/08/19 10:42:36 + visitor->trace(m_integrityVerifier);
jww 2015/08/19 16:43:40 Done.
109 ContextLifecycleObserver::trace(visitor); 196 ContextLifecycleObserver::trace(visitor);
110 } 197 }
111 198
112 void FetchManager::Loader::didReceiveResponse(unsigned long, const ResourceRespo nse& response, PassOwnPtr<WebDataConsumerHandle> handle) 199 void FetchManager::Loader::didReceiveResponse(unsigned long, const ResourceRespo nse& response, PassOwnPtr<WebDataConsumerHandle> handle)
113 { 200 {
114 ASSERT(handle); 201 ASSERT(handle);
115 202
116 m_responseHttpStatusCode = response.httpStatusCode(); 203 m_responseHttpStatusCode = response.httpStatusCode();
117 204
118 // Recompute the tainting if the request was redirected to a different 205 // Recompute the tainting if the request was redirected to a different
119 // origin. 206 // origin.
120 if (!SecurityOrigin::create(response.url())->isSameSchemeHostPort(m_request- >origin().get())) { 207 if (!SecurityOrigin::create(response.url())->isSameSchemeHostPort(m_request- >origin().get())) {
121 switch (m_request->mode()) { 208 switch (m_request->mode()) {
122 case WebURLRequest::FetchRequestModeSameOrigin: 209 case WebURLRequest::FetchRequestModeSameOrigin:
123 ASSERT_NOT_REACHED(); 210 ASSERT_NOT_REACHED();
124 break; 211 break;
125 case WebURLRequest::FetchRequestModeNoCORS: 212 case WebURLRequest::FetchRequestModeNoCORS:
126 m_request->setResponseTainting(FetchRequestData::OpaqueTainting); 213 m_request->setResponseTainting(FetchRequestData::OpaqueTainting);
127 break; 214 break;
128 case WebURLRequest::FetchRequestModeCORS: 215 case WebURLRequest::FetchRequestModeCORS:
129 case WebURLRequest::FetchRequestModeCORSWithForcedPreflight: 216 case WebURLRequest::FetchRequestModeCORSWithForcedPreflight:
130 m_request->setResponseTainting(FetchRequestData::CORSTainting); 217 m_request->setResponseTainting(FetchRequestData::CORSTainting);
131 break; 218 break;
132 } 219 }
133 } 220 }
134 FetchResponseData* responseData = FetchResponseData::createWithBuffer(new Bo dyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle))); 221
222 FetchResponseData* responseData = nullptr;
223 CompositeDataConsumerHandle::Updater* updater = nullptr;
224 if (m_request->integrity().isEmpty())
225 responseData = FetchResponseData::createWithBuffer(new BodyStreamBuffer( createFetchDataConsumerHandleFromWebHandle(handle)));
226 else
227 responseData = FetchResponseData::createWithBuffer(new BodyStreamBuffer( createFetchDataConsumerHandleFromWebHandle(CompositeDataConsumerHandle::create(c reateWaitingDataConsumerHandle(), &updater))));
135 responseData->setStatus(response.httpStatusCode()); 228 responseData->setStatus(response.httpStatusCode());
136 responseData->setStatusMessage(response.httpStatusText()); 229 responseData->setStatusMessage(response.httpStatusText());
137 for (auto& it : response.httpHeaderFields()) 230 for (auto& it : response.httpHeaderFields())
138 responseData->headerList()->append(it.key, it.value); 231 responseData->headerList()->append(it.key, it.value);
139 responseData->setURL(response.url()); 232 responseData->setURL(response.url());
140 responseData->setMIMEType(response.mimeType()); 233 responseData->setMIMEType(response.mimeType());
141 234
142 FetchResponseData* taintedResponse = nullptr; 235 FetchResponseData* taintedResponse = nullptr;
143 236
144 if (IsRedirectStatusCode(m_responseHttpStatusCode)) { 237 if (IsRedirectStatusCode(m_responseHttpStatusCode)) {
(...skipping 21 matching lines...) Expand all
166 taintedResponse = responseData->createBasicFilteredResponse(); 259 taintedResponse = responseData->createBasicFilteredResponse();
167 break; 260 break;
168 case FetchRequestData::CORSTainting: 261 case FetchRequestData::CORSTainting:
169 taintedResponse = responseData->createCORSFilteredResponse(); 262 taintedResponse = responseData->createCORSFilteredResponse();
170 break; 263 break;
171 case FetchRequestData::OpaqueTainting: 264 case FetchRequestData::OpaqueTainting:
172 taintedResponse = responseData->createOpaqueFilteredResponse(); 265 taintedResponse = responseData->createOpaqueFilteredResponse();
173 break; 266 break;
174 } 267 }
175 } 268 }
269
176 Response* r = Response::create(m_resolver->executionContext(), taintedRespon se); 270 Response* r = Response::create(m_resolver->executionContext(), taintedRespon se);
177 r->headers()->setGuard(Headers::ImmutableGuard); 271 r->headers()->setGuard(Headers::ImmutableGuard);
178 m_resolver->resolve(r); 272
179 m_resolver.clear(); 273 if (m_request->integrity().isEmpty()) {
274 m_resolver->resolve(r);
275 m_resolver.clear();
276 } else {
277 ASSERT(!m_integrityVerifier);
278 m_integrityVerifier = new SRIVerifier(handle, updater, r, this, m_reques t->integrity(), response.url());
279 }
180 } 280 }
181 281
182 void FetchManager::Loader::didFinishLoading(unsigned long, double) 282 void FetchManager::Loader::didFinishLoading(unsigned long, double)
183 { 283 {
184 ASSERT(!m_failed); 284 m_didFinishLoading = true;
185 m_finished = true; 285 // If there is an integrity verifier, and it has not already finished, it
286 // will take care of finishing the load or performing a network error when
287 // verification is complete.
288 if (m_integrityVerifier && !m_integrityVerifier->isFinished())
289 return;
186 290
187 if (document() && document()->frame() && document()->frame()->page() 291 loadSucceeded();
188 && m_responseHttpStatusCode >= 200 && m_responseHttpStatusCode < 300) {
189 document()->frame()->page()->chromeClient().ajaxSucceeded(document()->fr ame());
190 }
191 InspectorInstrumentation::didFinishFetch(executionContext(), this, m_request ->method(), m_request->url().string());
192 notifyFinished();
193 } 292 }
194 293
195 void FetchManager::Loader::didFail(const ResourceError& error) 294 void FetchManager::Loader::didFail(const ResourceError& error)
196 { 295 {
197 if (error.isCancellation() || error.isTimeout() || error.domain() != errorDo mainBlinkInternal) 296 if (error.isCancellation() || error.isTimeout() || error.domain() != errorDo mainBlinkInternal)
198 failed(String()); 297 failed(String());
199 else 298 else
200 failed("Fetch API cannot load " + error.failingURL() + ". " + error.loca lizedDescription()); 299 failed("Fetch API cannot load " + error.failingURL() + ". " + error.loca lizedDescription());
201 } 300 }
202 301
(...skipping 11 matching lines...) Expand all
214 } 313 }
215 314
216 Document* FetchManager::Loader::document() const 315 Document* FetchManager::Loader::document() const
217 { 316 {
218 if (executionContext()->isDocument()) { 317 if (executionContext()->isDocument()) {
219 return toDocument(executionContext()); 318 return toDocument(executionContext());
220 } 319 }
221 return nullptr; 320 return nullptr;
222 } 321 }
223 322
323 void FetchManager::Loader::loadSucceeded()
324 {
325 ASSERT(!m_failed);
326
327 m_finished = true;
328
329 if (document() && document()->frame() && document()->frame()->page()
330 && m_responseHttpStatusCode >= 200 && m_responseHttpStatusCode < 300) {
331 document()->frame()->page()->chromeClient().ajaxSucceeded(document()->fr ame());
332 }
333 InspectorInstrumentation::didFinishFetch(executionContext(), this, m_request ->method(), m_request->url().string());
334 notifyFinished();
335 }
336
224 void FetchManager::Loader::start() 337 void FetchManager::Loader::start()
225 { 338 {
226 // "1. If |request|'s url contains a Known HSTS Host, modify it per the 339 // "1. If |request|'s url contains a Known HSTS Host, modify it per the
227 // requirements of the 'URI [sic] Loading and Port Mapping' chapter of HTTP 340 // requirements of the 'URI [sic] Loading and Port Mapping' chapter of HTTP
228 // Strict Transport Security." 341 // Strict Transport Security."
229 // FIXME: Implement this. 342 // FIXME: Implement this.
230 343
231 // "2. If |request|'s referrer is not none, set |request|'s referrer to the 344 // "2. If |request|'s referrer is not none, set |request|'s referrer to the
232 // result of invoking determine |request|'s referrer." 345 // result of invoking determine |request|'s referrer."
233 // We set the referrer using workerGlobalScope's URL in 346 // We set the referrer using workerGlobalScope's URL in
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 597
485 DEFINE_TRACE(FetchManager) 598 DEFINE_TRACE(FetchManager)
486 { 599 {
487 #if ENABLE(OILPAN) 600 #if ENABLE(OILPAN)
488 visitor->trace(m_executionContext); 601 visitor->trace(m_executionContext);
489 visitor->trace(m_loaders); 602 visitor->trace(m_loaders);
490 #endif 603 #endif
491 } 604 }
492 605
493 } // namespace blink 606 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698