Changeset 238659 in webkit

Timestamp:

Nov 28, 2018 8:14:02 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Consult dummy storage for HTTPS Upgrade, Apply If Appropriate
​https://bugs.webkit.org/show_bug.cgi?id=192094
<rdar://problem/45851103> HTTPS Upgrade: Consult dummy storage for HTTPS Upgrade, Apply If Appropriate

Patch by Vivek Seth <​v_seth@apple.com> on 2018-11-28
Reviewed by Chris Dumez.

For main page loads upgrade HTTP requests to HTTPS if the hostname belongs to a set of upgradable hostnames.

• NetworkProcess/NetworkLoadChecker.cpp:

(WebKit::NetworkLoadChecker::applyHTTPSUpgradeIfNeeded):
(WebKit::NetworkLoadChecker::checkRequest):

• NetworkProcess/NetworkLoadChecker.h:
• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::start):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkLoadChecker.cpp (modified) (1 diff)
• NetworkProcess/NetworkLoadChecker.h (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-28  Vivek Seth  <v_seth@apple.com>
+
+        Consult dummy storage for HTTPS Upgrade, Apply If Appropriate
+        https://bugs.webkit.org/show_bug.cgi?id=192094
+        <rdar://problem/45851103> HTTPS Upgrade: Consult dummy storage for HTTPS Upgrade, Apply If Appropriate
+
+        Reviewed by Chris Dumez.
+
+        For main page loads upgrade HTTP requests to HTTPS if the hostname belongs to a set of upgradable hostnames.
+
+        * NetworkProcess/NetworkLoadChecker.cpp:
+        (WebKit::NetworkLoadChecker::applyHTTPSUpgradeIfNeeded):
+        (WebKit::NetworkLoadChecker::checkRequest):
+        * NetworkProcess/NetworkLoadChecker.h:
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::start):
+
 2018-11-28  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp

@@ -191 +191 @@
 }
 
+#if ENABLE(HTTPS_UPGRADE)
+bool NetworkLoadChecker::applyHTTPSUpgradeIfNeeded(ResourceRequest& request)
+{
+    // Use dummy list for now.
+    static NeverDestroyed<HashSet<String>> upgradableHosts = std::initializer_list<String> {
+        "www.bbc.com"_s, // (source: https://whynohttps.com)
+        "www.speedtest.net"_s, // (source: https://whynohttps.com)
+        "www.bea.gov"_s // (source: https://pulse.cio.gov/data/domains/https.csv)
+    };
+
+    auto& url = request.url();
+
+    // Only upgrade http urls.
+    if (!url.protocolIs("http"))
+        return false;
+
+    if (!upgradableHosts.get().contains(url.host().toString()))
+        return false;
+
+    auto newURL = url;
+    newURL.setProtocol("https"_s);
+    request.setURL(newURL);
+    return true;
+
+    return false;
+}
+#endif // ENABLE(HTTPS_UPGRADE)
+
 void NetworkLoadChecker::checkRequest(ResourceRequest&& request, ContentSecurityPolicyClient* client, ValidationHandler&& handler)
 {
+
+#if ENABLE(HTTPS_UPGRADE)
+    if (request.requester() == ResourceRequest::Requester::Main) {
+        if (applyHTTPSUpgradeIfNeeded(request))
+            ASSERT(request.url().protocolIs("https"));
+    }
+
+#endif // ENABLE(HTTPS_UPGRADE)
+
     if (auto* contentSecurityPolicy = this->contentSecurityPolicy()) {
         if (isRedirected()) {

trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h

@@ -139 +139 @@
     bool m_shouldCaptureExtraNetworkLoadMetrics { false };
     WebCore::NetworkLoadInformation m_loadInformation;
+
+#if ENABLE(HTTPS_UPGRADE)
+    static bool applyHTTPSUpgradeIfNeeded(WebCore::ResourceRequest&);
+#endif // ENABLE(HTTPS_UPGRADE)
+
 };
 

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

@@ -193 +193 @@
                 return;
             }
-            if (this->canUseCache(this->originalRequest())) {
+
+            auto currentRequest = result.value();
+            if (this->canUseCache(currentRequest)) {
                 RELEASE_LOG_IF_ALLOWED("start: Checking cache for resource (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, this->isMainResource(), this->isSynchronous());
-                this->retrieveCacheEntry(this->originalRequest());
+                this->retrieveCacheEntry(currentRequest);
                 return;
             }