CSP: Adding the 'upgrade-insecure-requests' directive.

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 48 matching lines @@
 #include "core/loader/PingLoader.h"
 #include "core/loader/SubstituteData.h"
 #include "core/loader/UniqueIdentifier.h"
 #include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/timing/Performance.h"
 #include "core/timing/ResourceTimingInfo.h"
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
+#include "platform/weborigin/KnownPorts.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 #define PRELOAD_DEBUG 0
@@ skipping 629 matching lines @@
     }
     m_validatedURLs.add(request.resourceRequest().url());
 }
 
 ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, FetchRequest& request)
 {
     ASSERT(request.options().synchronousPolicy == RequestAsynchronously || type == Resource::Raw);
 
     TRACE_EVENT0("blink", "ResourceFetcher::requestResource");
 
+    maybeUpgradeInsecureRequestURL(request);
+
     KURL url = request.resourceRequest().url();
 
     WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), request.charset().latin1().data(), request.priority(), request.forPreload(), ResourceTypeName(type));
 
     // If only the fragment identifiers differ, it is the same resource.
     url = MemoryCache::removeFragmentIdentifierIfNeeded(url);
 
     if (!url.isValid())
         return nullptr;
 
@@ skipping 160 matching lines @@
     if (request.requestContext() == WebURLRequest::RequestContextUnspecified)
         determineRequestContext(request, type);
     if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource)
         request.setHTTPHeaderField("Purpose", "prefetch");
     if (frame()->document())
         request.setOriginatesFromReservedIPRange(frame()->document()->isHostedInReservedIPRange());
 
     context().addAdditionalRequestHeaders(document(), request, (type == Resource::MainResource) ? FetchMainResource : FetchSubresource);
 }
 
+void ResourceFetcher::maybeUpgradeInsecureRequestURL(FetchRequest& request)
+{
+    if (!m_document)
+        return;
+
+    KURL url = request.resourceRequest().url();
+    if (m_document->insecureContentPolicy() == SecurityContext::InsecureContentUpgrade && url.protocol() == "http") {

[Ryan Sleevi, 2015/02/05 20:03:04]

*cough* ws:// -> wss://

[Mike West, 2015/02/05 20:19:08]

That's going to happen in a followup (somewhere around
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...),
as WebSockets doesn't go through ResourceFetcher.

+        url.setProtocol("https");
+        // FIXME: HACKY HACKY HACKY HACKY.
+        if (url.port() == 8000 || url.port() == 8080)
+            url.setPort(8443);

[Ryan Sleevi, 2015/02/05 20:03:03]

wat?

No no no

[Mike West, 2015/02/05 20:19:08]

Totally. I did this to make the test work as a PoC, I don't intend to land it
this way. As I noted in patchset #2, "And, as much as I'd like to, I really
can't land it with this comparison. I need a better option to distinguish
between the way it should work in the real world, and the way it should work for
crazy layout tests. :/"

+        else if (url.port() == 80)
+            url.setPort(443);

[Ryan Sleevi, 2015/02/05 20:03:03]

yes yes yes

+        request.mutableResourceRequest().setURL(url);
+    }
+}
+
 ResourcePtr<Resource> ResourceFetcher::createResourceForRevalidation(const FetchRequest& request, Resource* resource)
 {
     ASSERT(resource);
     ASSERT(memoryCache()->contains(resource));
     ASSERT(resource->isLoaded());
     ASSERT(resource->canUseCacheValidator());
     ASSERT(!resource->resourceToRevalidate());
     ASSERT(!isControlledByServiceWorker());
 
     ResourceRequest revalidatingRequest(resource->resourceRequest());
@@ skipping 671 matching lines @@
 
 void ResourceFetcher::trace(Visitor* visitor)
 {
     visitor->trace(m_document);
     visitor->trace(m_loaders);
     visitor->trace(m_nonBlockingLoaders);
     ResourceLoaderHost::trace(visitor);
 }
 
 }