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

Side by Side Diff: Source/core/fetch/ResourceLoader.cpp

Issue 608733002: Mixed Content: Don't override a request's context during redirects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: --no-find-copies Created 6 years, 2 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 releaseResources(); 291 releaseResources();
292 } 292 }
293 293
294 void ResourceLoader::willSendRequest(blink::WebURLLoader*, blink::WebURLRequest& passedRequest, const blink::WebURLResponse& passedRedirectResponse) 294 void ResourceLoader::willSendRequest(blink::WebURLLoader*, blink::WebURLRequest& passedRequest, const blink::WebURLResponse& passedRedirectResponse)
295 { 295 {
296 ASSERT(m_state != Terminated); 296 ASSERT(m_state != Terminated);
297 RefPtrWillBeRawPtr<ResourceLoader> protect(this); 297 RefPtrWillBeRawPtr<ResourceLoader> protect(this);
298 298
299 ResourceRequest& request(applyOptions(passedRequest.toMutableResourceRequest ())); 299 ResourceRequest& request(applyOptions(passedRequest.toMutableResourceRequest ()));
300 300
301 // FIXME: We should have a real context for redirect requests. Currently, we don't: see WebURLLoaderImpl::Context::OnReceivedRedirect in content/.
302 request.setRequestContext(blink::WebURLRequest::RequestContextInternal);
303
304 ASSERT(!request.isNull()); 301 ASSERT(!request.isNull());
305 const ResourceResponse& redirectResponse(passedRedirectResponse.toResourceRe sponse()); 302 const ResourceResponse& redirectResponse(passedRedirectResponse.toResourceRe sponse());
306 ASSERT(!redirectResponse.isNull()); 303 ASSERT(!redirectResponse.isNull());
307 if (!m_host->canAccessRedirect(m_resource, request, redirectResponse, m_opti ons)) { 304 if (!m_host->canAccessRedirect(m_resource, request, redirectResponse, m_opti ons)) {
308 cancel(); 305 cancel();
309 return; 306 return;
310 } 307 }
311 ASSERT(m_state != Terminated); 308 ASSERT(m_state != Terminated);
312 309
313 applyOptions(request); // canAccessRedirect() can modify m_options so we sho uld re-apply it. 310 applyOptions(request); // canAccessRedirect() can modify m_options so we sho uld re-apply it.
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength); 528 didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength);
532 } 529 }
533 530
534 ResourceRequest& ResourceLoader::applyOptions(ResourceRequest& request) const 531 ResourceRequest& ResourceLoader::applyOptions(ResourceRequest& request) const
535 { 532 {
536 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC redentials); 533 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC redentials);
537 return request; 534 return request;
538 } 535 }
539 536
540 } 537 }
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-script-through-redirection.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698