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

Unified Diff: net/url_request/url_request.cc

Issue 1017583002: Set Origin header to "null" for cross origin redirects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Address more of David's comments Created 5 years, 9 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
Index: net/url_request/url_request.cc
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 455bdf255c01001b487498d62e24c170d472cfb8..82a2ec3fb550b4c009dc32c26e7c87ce6472e547 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -37,6 +37,8 @@
#include "net/url_request/url_request_job_manager.h"
#include "net/url_request/url_request_netlog_params.h"
#include "net/url_request/url_request_redirect_job.h"
+#include "url/gurl.h"
+#include "url/origin.h"
using base::Time;
using std::string;
@@ -940,6 +942,26 @@ int URLRequest::Redirect(const RedirectInfo& redirect_info) {
method_ = redirect_info.new_method;
}
+ // Cross-origin redirects should not result in an Origin header value that is
+ // equal to the original request's Origin header. This is necessary to prevent
+ // a reflection of POST requests to bypass CSRF protections. If the header was
+ // not set to "null", a POST request from origin A to a malicious origin M
+ // could be redirected by M back to A.
+ //
+ // In the Section 4.2, Step 4.10 of the Fetch spec
+ // (https://fetch.spec.whatwg.org/#concept-http-fetch), it states that on
+ // cross-origin 301, 302, 303, 307, and 308 redirects, the user agent should
+ // set the Origin header to an "opaque identifier," in this case "null." This
davidben 2015/03/27 22:46:51 Nit: 'Origin header' -> 'request's origin' 'i
jww 2015/03/30 18:50:37 Done.
+ // matches Firefox and IE behavior, although it supercedes the suggested
+ // behavior in RFC 6454, "The Web Origin Concept."
+ //
+ // See also https://crbug.com/465517.
+ if (redirect_info.new_url.GetOrigin() != url().GetOrigin() &&
+ extra_request_headers_.HasHeader(HttpRequestHeaders::kOrigin)) {
+ extra_request_headers_.SetHeader(HttpRequestHeaders::kOrigin,
+ url::Origin().string());
davidben 2015/03/27 22:46:52 Could you add a TODO to this block and the Origin
jww 2015/03/30 18:50:37 Done.
+ }
+
referrer_ = redirect_info.new_referrer;
first_party_for_cookies_ = redirect_info.new_first_party_for_cookies;

Powered by Google App Engine
This is Rietveld 408576698