Chromium Code Reviews| Index: net/url_request/url_request.cc |
| diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc |
| index a2ce07eaf13057c5608b9467e377ed77a9e98240..44728108383618a04341b480fa5c9c67dd117a77 100644 |
| --- a/net/url_request/url_request.cc |
| +++ b/net/url_request/url_request.cc |
| @@ -653,9 +653,24 @@ void URLRequest::StartJob(URLRequestJob* job) { |
| // If the referrer is secure, but the requested URL is not, the referrer |
| // policy should be something non-default. If you hit this, please file a |
| // bug. |
| - if (referrer_policy_ == |
| - CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE && |
| - GURL(referrer_).SchemeIsSecure() && !url().SchemeIsSecure()) { |
| + GURL referrer(referrer_); |
|
jochen (gone - plz use gerrit)
2014/11/19 10:25:13
what about moving this to a helper function?
|
| + bool referrer_policy_requires_secure_referrer_transitions = |
| + referrer_policy_ == |
| + CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE || |
| + referrer_policy_ == |
| + REDUCE_REFERRER_GRANULARITY_ON_TRANSITION_CROSS_ORIGIN; |
| + bool secure_referrer_in_insecure_request = |
| + referrer.SchemeIsSecure() && !url().SchemeIsSecure(); |
| + bool referrer_is_origin_only = referrer.GetOrigin() == referrer; |
| + bool cross_origin_referrer = referrer.GetOrigin() != url().GetOrigin(); |
| + bool referrer_is_invalid = |
| + (referrer_policy_requires_secure_referrer_transitions && |
| + secure_referrer_in_insecure_request) || |
| + (referrer_policy_ == |
| + REDUCE_REFERRER_GRANULARITY_ON_TRANSITION_CROSS_ORIGIN && |
| + cross_origin_referrer && !referrer_is_origin_only); |
| + |
| + if (referrer_is_invalid) { |
| if (!network_delegate_ || |
| !network_delegate_->CancelURLRequestWithPolicyViolatingReferrerHeader( |
| *this, url(), GURL(referrer_))) { |