Upgrade insecure requests: Pipe navigational hosts down into nested documents.

Source/core/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 868 matching lines @@
         return;
 
     KURL url = fetchRequest.resourceRequest().url();
 
     // Tack a 'Prefer' header to outgoing navigational requests, as described in
     // https://w3c.github.io/webappsec/specs/upgrade/#feature-detect
     if (fetchRequest.resourceRequest().frameType() != WebURLRequest::FrameTypeNone && !SecurityOrigin::isSecure(url))
         fetchRequest.mutableResourceRequest().addHTTPHeaderField("Prefer", "return=secure-representation");
 
     if (document()->insecureRequestsPolicy() == SecurityContext::InsecureRequestsUpgrade && url.protocolIs("http")) {
-        // We always upgrade subresource requests and nested frames, we always upgrade form
-        // submissions, and we always upgrade requests whose host matches the host of the
-        // containing document's security origin.
+        const ResourceRequest& request = fetchRequest.resourceRequest();
+
+        // We always upgrade requests that meet any of the following criteria:
         //
-        // FIXME: We need to check the document that set the policy, not the current document.
-        const ResourceRequest& request = fetchRequest.resourceRequest();
+        // 1. Are for subresources (including nested frames).
+        // 2. Are form submissions.
+        // 3. Whose hosts are contained in the document's InsecureNavigationSet.
         if (request.frameType() == WebURLRequest::FrameTypeNone
             || request.frameType() == WebURLRequest::FrameTypeNested
             || request.requestContext() == WebURLRequest::RequestContextForm
-            || url.host() == document()->securityOrigin()->host())
+            || document()->insecureNavigationsToUpgrade()->contains(url.host().impl()->hash()))
         {
             url.setProtocol("https");
             if (url.port() == 80)
                 url.setPort(443);
             fetchRequest.mutableResourceRequest().setURL(url);
         }
     }
 }
 
 void ResourceFetcher::addClientHintsIfNeccessary(FetchRequest& fetchRequest)
@@ skipping 728 matching lines @@
     ResourceLoaderHost::trace(visitor);
 }
 
 ResourceFetcher* ResourceFetcher::toResourceFetcher(ResourceLoaderHost* host)
 {
     ASSERT(host->objectType() == ResourceLoaderHost::ResourceFetcherType);
     return static_cast<ResourceFetcher*>(host);
 }
 
 }