WIP: URLRequest-based UIR implementation.

net/url_request/url_request.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 437 matching lines @@
   DCHECK(!is_pending_);
   first_party_for_cookies_ = first_party_for_cookies;
 }
 
 void URLRequest::set_first_party_url_policy(
     FirstPartyURLPolicy first_party_url_policy) {
   DCHECK(!is_pending_);
   first_party_url_policy_ = first_party_url_policy;
 }
 
+void URLRequest::set_insecure_request_policy(
+    InsecureRequestPolicy insecure_request_policy) {
+  DCHECK(!is_pending_);
+  insecure_request_policy_ = insecure_request_policy;
+}
+
 void URLRequest::set_initiator(const url::Origin& initiator) {
   DCHECK(!is_pending_);
   initiator_ = initiator;
 }
 
 void URLRequest::set_method(const std::string& method) {
   DCHECK(!is_pending_);
   method_ = method;
 }
 
@@ skipping 546 matching lines @@
 
   priority_ = priority;
   if (job_.get()) {
     net_log_.AddEvent(
         NetLog::TYPE_URL_REQUEST_SET_PRIORITY,
         NetLog::StringCallback("priority", RequestPriorityToString(priority_)));
     job_->SetPriority(priority_);
   }
 }
 
-bool URLRequest::GetHSTSRedirect(GURL* redirect_url) const {
+bool URLRequest::GetSecureRedirect(GURL* redirect_url, std::string* redirect_type) const {
   const GURL& url = this->url();
   bool scheme_is_http = url.SchemeIs("http");
   if (!scheme_is_http && !url.SchemeIs("ws"))
     return false;
-  TransportSecurityState* state = context()->transport_security_state();
-  if (state && state->ShouldUpgradeToSSL(url.host())) {
+
+  // Upgrade-Insecure-Requests applies if the policy upgrades all insecure requests, or
+  // if the policy upgrades requests whose hosts match the initiator's origin's host.
+  bool upgrade_applies = insecure_request_policy_ == UPGRADE_ALL_INSECURE_REQUESTS || (insecure_request_policy_ == UPGRADE_SAME_HOST_INSECURE_REQUESTS && url.host() == initiator_.host());
+  bool hsts_applies = false;
+
+  // Skip the HSTS check if we already know that we're upgrading the request.
+  if (!upgrade_applies) {
+    TransportSecurityState* state = context()->transport_security_state();
+    hsts_applies = state && state->ShouldUpgradeToSSL(url.host());
+  }
+
+  if (hsts_applies || upgrade_applies) {
     GURL::Replacements replacements;
     const char* new_scheme = scheme_is_http ? "https" : "wss";
     replacements.SetSchemeStr(new_scheme);
     *redirect_url = url.ReplaceComponents(replacements);
+    *redirect_type = upgrade_applies ? "Upgrade" : "HSTS";
     return true;
   }
   return false;
 }
 
 void URLRequest::NotifyAuthRequired(AuthChallengeInfo* auth_info) {
   NetworkDelegate::AuthRequiredResponse rv =
       NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;
   auth_info_ = auth_info;
   if (network_delegate_) {
@@ skipping 155 matching lines @@
 }
 
 void URLRequest::GetConnectionAttempts(ConnectionAttempts* out) const {
   if (job_)
     job_->GetConnectionAttempts(out);
   else
     out->clear();
 }
 
 }  // namespace net