[WIP] Upgrade-insecure-request: upgrade insecurely-redirected requests.

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 1614 matching lines @@
       type,
       frameLoadRequest.resourceRequest().httpBody() || frameLoadRequest.form(),
       frameLoadRequest.triggeringEvent());
   frameLoadRequest.resourceRequest().setRequestContext(
       determineRequestContextFromNavigationType(navigationType));
   frameLoadRequest.resourceRequest().setFrameType(
       m_frame->isMainFrame() ? WebURLRequest::FrameTypeTopLevel
                              : WebURLRequest::FrameTypeNested);
   ResourceRequest& request = frameLoadRequest.resourceRequest();
 
-  // Record the latest requiredCSP value that will be used when sending this
-  // request.
-  recordLatestRequiredCSP();
-  modifyRequestForCSP(request, nullptr);
   if (!shouldContinueForNavigationPolicy(
           request, frameLoadRequest.substituteData(), nullptr,
           frameLoadRequest.shouldCheckMainWorldContentSecurityPolicy(),
           navigationType, navigationPolicy,
           type == FrameLoadTypeReplaceCurrentItem,
           frameLoadRequest.clientRedirect() ==
               ClientRedirectPolicy::ClientRedirect,
           frameLoadRequest.form()))
     return;
 
+  // Record the latest requiredCSP value that will be used when sending this
+  // request.
+  recordLatestRequiredCSP();
+  modifyRequestForCSP(request, nullptr);
+
   m_frame->document()->cancelParsing();
   detachDocumentLoader(m_provisionalDocumentLoader);
 
   // beforeunload fired above, and detaching a DocumentLoader can fire events,
   // which can detach this frame.
   if (!m_frame->host())
     return;
 
   m_provisionalDocumentLoader = client()->createDocumentLoader(
       m_frame, request, frameLoadRequest.substituteData().isValid()
@@ skipping 218 matching lines @@
 
   // If we don't yet have an |m_document| (because we're loading an iframe, for
   // instance), check the FrameLoader's policy.
   WebInsecureRequestPolicy relevantPolicy =
       document ? document->getInsecureRequestPolicy()
                : getInsecureRequestPolicy();
   SecurityContext::InsecureNavigationsSet* relevantNavigationSet =
       document ? document->insecureNavigationsToUpgrade()
                : insecureNavigationsToUpgrade();
 
+  resourceRequest.setInsecurePolicy(relevantPolicy);
+
   if (url.protocolIs("http") && relevantPolicy & kUpgradeInsecureRequests) {
     // We always upgrade requests that meet any of the following criteria:
     //
     // 1. Are for subresources (including nested frames).
     // 2. Are form submissions.
     // 3. Whose hosts are contained in the document's InsecureNavigationSet.
     if (resourceRequest.frameType() == WebURLRequest::FrameTypeNone ||
         resourceRequest.frameType() == WebURLRequest::FrameTypeNested ||
         resourceRequest.requestContext() == WebURLRequest::RequestContextForm ||
         (!url.host().isNull() &&
@@ skipping 31 matching lines @@
                          m_documentLoader ? m_documentLoader->url() : String());
   return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const {
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 }  // namespace blink