Attachment 357886 Details for Bug 192937 – Patch

[patch] Patch

bug-192937-20181220155601.patch (text/plain), 20.36 KB, created by Chris Dumez on 2018-12-20 15:56:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-12-20 15:56:01 PST

Size: 20.36 KB

patch

obsolete

>Subversion Revision: 239441
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2ab911fdf7cb3446e56afa8f49fdbccd53859356..39ec512a7b0756f43b159c07de402f83540fab7a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-12-20  Chris Dumez  <cdumez@apple.com>
>+
>+        Move HTTPS_UPGRADE code behind a runtime flag, off by default
>+        https://bugs.webkit.org/show_bug.cgi?id=192937
>+
>+        Reviewed by Youenn Fablet.
>+
>+        Move HTTPS_UPGRADE code behind a runtime flag, off by default and drop the build time flag.
>+
>+        * page/Settings.yaml:
>+
> 2018-12-19  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Unreviewed, fix GTK build after r239410
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 59e23fb6db9a17b73d82e80760cda77c6b615add..9706d4bd03a3dcce5d0ae26b086a5ea7c25de9b3 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,35 @@
>+2018-12-20  Chris Dumez  <cdumez@apple.com>
>+
>+        Move HTTPS_UPGRADE code behind a runtime flag, off by default
>+        https://bugs.webkit.org/show_bug.cgi?id=192937
>+
>+        Reviewed by Youenn Fablet.
>+
>+        Move HTTPS_UPGRADE code behind a runtime flag, off by default and drop the build time flag.
>+
>+        * Configurations/WebKit.xcconfig:
>+        * DerivedSources.make:
>+        * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
>+        * NetworkProcess/NetworkHTTPSUpgradeChecker.h:
>+        * NetworkProcess/NetworkLoadChecker.cpp:
>+        (WebKit::NetworkLoadChecker::NetworkLoadChecker):
>+        (WebKit::NetworkLoadChecker::applyHTTPSUpgradeIfNeeded const):
>+        (WebKit::NetworkLoadChecker::checkRequest):
>+        * NetworkProcess/NetworkLoadChecker.h:
>+        * NetworkProcess/NetworkProcess.h:
>+        (WebKit::NetworkProcess::networkHTTPSUpgradeChecker):
>+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
>+        (WebKit::NetworkResourceLoadParameters::encode const):
>+        (WebKit::NetworkResourceLoadParameters::decode):
>+        * NetworkProcess/NetworkResourceLoadParameters.h:
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        * NetworkProcess/PingLoad.cpp:
>+        (WebKit::PingLoad::PingLoad):
>+        * Shared/WebPreferences.yaml:
>+        * WebProcess/Network/WebLoaderStrategy.cpp:
>+        (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
>+        * config.h:
>+
> 2018-12-20  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Focusing an editable element should scroll to reveal the selection
>diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
>index a79719386b3c2cf9345f5806bdac03bf5743a19a..cb29eac3effd4b90acce28e5845902dcaf8d7c5a 100644
>--- a/Source/WebCore/page/Settings.yaml
>+++ b/Source/WebCore/page/Settings.yaml
>@@ -329,6 +329,9 @@ wantsBalancedSetDefersLoadingBehavior:
> requestAnimationFrameEnabled:
>   initial: true
> 
>+HTTPSUpgradeEnabled:
>+  initial: false
>+
> cookieEnabled:
>   initial: true
> mediaEnabled:
>diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
>index 2453684eb2f15b22f90b012f45296ecb9078c137..f2318ec4e9aff6fd8bb9dcf47420c1ee68ceff2b 100644
>--- a/Source/WebKit/Configurations/WebKit.xcconfig
>+++ b/Source/WebKit/Configurations/WebKit.xcconfig
>@@ -151,11 +151,8 @@ SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
> SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
> SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
> 
>-WK_EXCLUDED_HTTPS_UPGRADE_FILE = $(WK_EXCLUDED_HTTPS_UPGRADE_FILE_$(ENABLE_HTTPS_UPGRADE));
>-WK_EXCLUDED_HTTPS_UPGRADE_FILE_ = HTTPSUpgradeList.db;
>-
>-EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/* $(WK_EXCLUDED_HTTPS_UPGRADE_FILE);
>-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb $(WK_EXCLUDED_HTTPS_UPGRADE_FILE);
>+EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/*;
>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
> 
> INSTALLHDRS_SCRIPT_PHASE = YES;
> 
>diff --git a/Source/WebKit/DerivedSources.make b/Source/WebKit/DerivedSources.make
>index 2fde5550cf4d70adc09def357a98782273e55472..1533f06240ef6960b6d4b05ca04c8e083a2e4393 100644
>--- a/Source/WebKit/DerivedSources.make
>+++ b/Source/WebKit/DerivedSources.make
>@@ -316,8 +316,7 @@ $(WEB_PREFERENCES_COMBINED_INPUT_FILE) : $(WEB_PREFERENCES_INPUT_FILES)
> $(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
> 	$(RUBY) $< --input $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
> 
>-ifeq ($(ENABLE_HTTPS_UPGRADE),ENABLE_HTTPS_UPGRADE)
>+VPATH += $(WebKit2)/Shared/HTTPSUpgrade/
> all : HTTPSUpgradeList.db
> HTTPSUpgradeList.db : HTTPSUpgradeList.txt $(WebKit2)/Scripts/generate-https-upgrade-database.sh
> 	sh $(WebKit2)/Scripts/generate-https-upgrade-database.sh $< $@
>-endif # ENABLE_HTTPS_UPGRADE
>diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>index 73b46c09f6bfdb5786f685ae46d54a3359c089ca..89cfa8248f2c153a8a09e1872aa7318c62099ee4 100644
>--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>@@ -26,8 +26,6 @@
> #include "config.h"
> #include "NetworkHTTPSUpgradeChecker.h"
> 
>-#if ENABLE(HTTPS_UPGRADE)
>-
> #include "Logging.h"
> #include <WebCore/SQLiteDatabase.h>
> #include <WebCore/SQLiteStatement.h>
>@@ -95,13 +93,13 @@ void NetworkHTTPSUpgradeChecker::query(String&& host, PAL::SessionID sessionID,
>         ASSERT(m_didSetupCompleteSuccessfully);
> 
>         int bindTextResult = m_statement->bindText(1, WTFMove(host));
>-        ASSERT(bindTextResult == SQLITE_OK);
>+        ASSERT_UNUSED(bindTextResult, bindTextResult == SQLITE_OK);
> 
>         int stepResult = m_statement->step();
>         ASSERT(stepResult == SQLITE_ROW || stepResult == SQLITE_DONE);
> 
>         int resetResult = m_statement->reset();
>-        ASSERT(resetResult == SQLITE_OK);
>+        ASSERT_UNUSED(resetResult, resetResult == SQLITE_OK);
> 
>         bool foundHost = (stepResult == SQLITE_ROW);
>         RELEASE_LOG_IF_ALLOWED(sessionID, "query - Ran successfully. Result = %s", (foundHost ? "true" : "false"));
>@@ -113,4 +111,3 @@ void NetworkHTTPSUpgradeChecker::query(String&& host, PAL::SessionID sessionID,
> 
> } // namespace WebKit
> 
>-#endif // ENABLE(HTTPS_UPGRADE)
>diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>index c6303a76140b608dc54a8da2fda097e4e4b9adf1..3837e677b7305e65e0d5dc5d29438d9a1594c49e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>@@ -25,8 +25,6 @@
> 
> #pragma once
> 
>-#if ENABLE(HTTPS_UPGRADE)
>-
> #include <wtf/UniqueRef.h>
> 
> namespace WTF {
>@@ -64,4 +62,3 @@ private:
> 
> } // namespace WebKit
> 
>-#endif // ENABLE(HTTPS_UPGRADE)
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>index 0f302dc6815e2e98b0d032e32b6c171b54f5306d..dab152e9f3fd25c056fef466330065a666858da5 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>@@ -46,7 +46,7 @@ static inline bool isSameOrigin(const URL& url, const SecurityOrigin* origin)
>     return url.protocolIsData() || url.protocolIsBlob() || !origin || origin->canRequest(url);
> }
> 
>-NetworkLoadChecker::NetworkLoadChecker(FetchOptions&& options, PAL::SessionID sessionID, uint64_t pageID, uint64_t frameID, HTTPHeaderMap&& originalRequestHeaders, URL&& url, RefPtr<SecurityOrigin>&& sourceOrigin, PreflightPolicy preflightPolicy, String&& referrer, bool shouldCaptureExtraNetworkLoadMetrics, LoadType requestLoadType)
>+NetworkLoadChecker::NetworkLoadChecker(FetchOptions&& options, PAL::SessionID sessionID, uint64_t pageID, uint64_t frameID, HTTPHeaderMap&& originalRequestHeaders, URL&& url, RefPtr<SecurityOrigin>&& sourceOrigin, PreflightPolicy preflightPolicy, String&& referrer, bool isHTTPSUpgradeEnabled, bool shouldCaptureExtraNetworkLoadMetrics, LoadType requestLoadType)
>     : m_options(WTFMove(options))
>     , m_sessionID(sessionID)
>     , m_pageID(pageID)
>@@ -57,6 +57,7 @@ NetworkLoadChecker::NetworkLoadChecker(FetchOptions&& options, PAL::SessionID se
>     , m_preflightPolicy(preflightPolicy)
>     , m_referrer(WTFMove(referrer))
>     , m_shouldCaptureExtraNetworkLoadMetrics(shouldCaptureExtraNetworkLoadMetrics)
>+    , m_isHTTPSUpgradeEnabled(isHTTPSUpgradeEnabled)
>     , m_requestLoadType(requestLoadType)
> {
>     m_isSameOriginRequest = isSameOrigin(m_url, m_origin.get());
>@@ -191,10 +192,10 @@ auto NetworkLoadChecker::accessControlErrorForValidationHandler(String&& message
>     return ResourceError { String { }, 0, m_url, WTFMove(message), ResourceError::Type::AccessControl };
> }
> 
>-#if ENABLE(HTTPS_UPGRADE)
> void NetworkLoadChecker::applyHTTPSUpgradeIfNeeded(ResourceRequest&& request, CompletionHandler<void(ResourceRequest&&)>&& handler) const
> {
>-    if (m_requestLoadType != LoadType::MainFrame) {
>+#if PLATFORM(COCOA)
>+    if (!m_isHTTPSUpgradeEnabled || m_requestLoadType != LoadType::MainFrame) {
>         handler(WTFMove(request));
>         return;
>     }
>@@ -224,24 +225,24 @@ void NetworkLoadChecker::applyHTTPSUpgradeIfNeeded(ResourceRequest&& request, Co
> 
>         handler(WTFMove(request));
>     });
>+#else
>+    handler(WTFMove(request));
>+#endif
> }
>-#endif // ENABLE(HTTPS_UPGRADE)
> 
> void NetworkLoadChecker::checkRequest(ResourceRequest&& request, ContentSecurityPolicyClient* client, ValidationHandler&& handler)
> {
>     ResourceRequest originalRequest = request;
> 
>-#if ENABLE(HTTPS_UPGRADE)
>     applyHTTPSUpgradeIfNeeded(WTFMove(request), [this, client, handler = WTFMove(handler), originalRequest = WTFMove(originalRequest)](auto request) mutable {
>-#endif // ENABLE(HTTPS_UPGRADE)
> 
>         if (auto* contentSecurityPolicy = this->contentSecurityPolicy()) {
>-            if (isRedirected()) {
>+            if (this->isRedirected()) {
>                 auto type = m_options.mode == FetchOptions::Mode::Navigate ? ContentSecurityPolicy::InsecureRequestType::Navigation : ContentSecurityPolicy::InsecureRequestType::Load;
>                 contentSecurityPolicy->upgradeInsecureRequestIfNeeded(request, type);
>             }
>-            if (!isAllowedByContentSecurityPolicy(request, client)) {
>-                handler(accessControlErrorForValidationHandler("Blocked by Content Security Policy."_s));
>+            if (!this->isAllowedByContentSecurityPolicy(request, client)) {
>+                handler(this->accessControlErrorForValidationHandler("Blocked by Content Security Policy."_s));
>                 return;
>             }
>         }
>@@ -261,13 +262,9 @@ void NetworkLoadChecker::checkRequest(ResourceRequest&& request, ContentSecurity
>             continueCheckingRequestOrDoSyntheticRedirect(WTFMove(originalRequest), WTFMove(result.value().request), WTFMove(handler));
>         });
> #else
>-        continueCheckingRequestOrDoSyntheticRedirect(WTFMove(originalRequest), WTFMove(request), WTFMove(handler));
>+        this->continueCheckingRequestOrDoSyntheticRedirect(WTFMove(originalRequest), WTFMove(request), WTFMove(handler));
> #endif
>-
>-#if ENABLE(HTTPS_UPGRADE)
>     });
>-#endif // ENABLE(HTTPS_UPGRADE)
>-
> }
> 
> void NetworkLoadChecker::continueCheckingRequestOrDoSyntheticRedirect(ResourceRequest&& originalRequest, ResourceRequest&& currentRequest, ValidationHandler&& handler)
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
>index 283f262288db145ee657345b8cdc6a52a35d3758..5fcd8d0952297c2974477550d6019842b1459c9e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
>@@ -52,7 +52,7 @@ class NetworkLoadChecker : public CanMakeWeakPtr<NetworkLoadChecker> {
> public:
>     enum class LoadType : bool { MainFrame, Other };
> 
>-    NetworkLoadChecker(WebCore::FetchOptions&&, PAL::SessionID, uint64_t pageID, uint64_t frameID, WebCore::HTTPHeaderMap&&, URL&&, RefPtr<WebCore::SecurityOrigin>&&, WebCore::PreflightPolicy, String&& referrer, bool shouldCaptureExtraNetworkLoadMetrics = false, LoadType requestLoadType = LoadType::Other);
>+    NetworkLoadChecker(WebCore::FetchOptions&&, PAL::SessionID, uint64_t pageID, uint64_t frameID, WebCore::HTTPHeaderMap&&, URL&&, RefPtr<WebCore::SecurityOrigin>&&, WebCore::PreflightPolicy, String&& referrer, bool isHTTPSUpgradeEnabled = false, bool shouldCaptureExtraNetworkLoadMetrics = false, LoadType requestLoadType = LoadType::Other);
>     ~NetworkLoadChecker();
> 
>     struct RedirectionTriplet {
>@@ -119,9 +119,7 @@ private:
>     void processContentExtensionRulesForLoad(WebCore::ResourceRequest&&, ContentExtensionCallback&&);
> #endif
> 
>-#if ENABLE(HTTPS_UPGRADE)
>     void applyHTTPSUpgradeIfNeeded(WebCore::ResourceRequest&&, CompletionHandler<void(WebCore::ResourceRequest&&)>&&) const;
>-#endif // ENABLE(HTTPS_UPGRADE)
> 
>     WebCore::FetchOptions m_options;
>     WebCore::StoredCredentialsPolicy m_storedCredentialsPolicy;
>@@ -149,6 +147,7 @@ private:
>     String m_referrer;
>     bool m_checkContentExtensions { false };
>     bool m_shouldCaptureExtraNetworkLoadMetrics { false };
>+    bool m_isHTTPSUpgradeEnabled { false };
>     WebCore::NetworkLoadInformation m_loadInformation;
> 
>     LoadType m_requestLoadType;
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index e948710287ed69d11c222ee4ec3588dfec9a2f7c..84b2acf13ddc55eab512de0fa4928313827d358f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -205,9 +205,9 @@ public:
>     bool parentProcessHasServiceWorkerEntitlement() const { return true; }
> #endif
> 
>-#if ENABLE(HTTPS_UPGRADE)
>-    NetworkHTTPSUpgradeChecker& networkHTTPSUpgradeChecker() { return m_networkHTTPSUpgradeChecker; };
>-#endif // ENABLE(HTTPS_UPGRADE)
>+#if PLATFORM(COCOA)
>+    NetworkHTTPSUpgradeChecker& networkHTTPSUpgradeChecker() { return m_networkHTTPSUpgradeChecker; }
>+#endif
> 
> private:
>     NetworkProcess();
>@@ -398,9 +398,9 @@ private:
>     HashMap<WebCore::SWServerConnectionIdentifier, WebSWServerConnection*> m_swServerConnections;
> #endif
> 
>-#if ENABLE(HTTPS_UPGRADE)
>+#if PLATFORM(COCOA)
>     NetworkHTTPSUpgradeChecker m_networkHTTPSUpgradeChecker;
>-#endif // ENABLE(HTTPS_UPGRADE)
>+#endif
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>index 0cfeea5ccd063fca7f610ab6c9d5b1d2c2bd9efc..80b70aaab2279107ce0bda67a6eca21075a2beda 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>@@ -94,6 +94,7 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
>     encoder << shouldEnableCrossOriginResourcePolicy;
> 
>     encoder << frameAncestorOrigins;
>+    encoder << isHTTPSUpgradeEnabled;
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>     encoder << mainDocumentURL;
>@@ -204,6 +205,12 @@ bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourc
> 
>     if (!decoder.decode(result.frameAncestorOrigins))
>         return false;
>+
>+    Optional<bool> isHTTPSUpgradeEnabled;
>+    decoder >> isHTTPSUpgradeEnabled;
>+    if (!isHTTPSUpgradeEnabled)
>+        return false;
>+    result.isHTTPSUpgradeEnabled = *isHTTPSUpgradeEnabled;
>     
> #if ENABLE(CONTENT_EXTENSIONS)
>     if (!decoder.decode(result.mainDocumentURL))
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
>index 132710fce0a5cbd9a80e62ddb98ff4435ae1a3c5..b05ff803f17190ade319cda063da031406e4f376 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
>@@ -59,6 +59,7 @@ public:
>     WebCore::PreflightPolicy preflightPolicy { WebCore::PreflightPolicy::Consider };
>     bool shouldEnableCrossOriginResourcePolicy { false };
>     Vector<RefPtr<WebCore::SecurityOrigin>> frameAncestorOrigins;
>+    bool isHTTPSUpgradeEnabled { false };
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>     URL mainDocumentURL;
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index 77fa8ea29d65ba16dae0cd8e35c22e6f994b9d7f..33ecaaf1fef429f4e0555c35a7755b8e7c302be7 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -112,7 +112,7 @@ NetworkResourceLoader::NetworkResourceLoader(NetworkResourceLoadParameters&& par
> 
>     if (synchronousReply || parameters.shouldRestrictHTTPResponseAccess) {
>         NetworkLoadChecker::LoadType requestLoadType = isMainFrameLoad() ? NetworkLoadChecker::LoadType::MainFrame : NetworkLoadChecker::LoadType::Other;
>-        m_networkLoadChecker = std::make_unique<NetworkLoadChecker>(FetchOptions { m_parameters.options }, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, HTTPHeaderMap { m_parameters.originalRequestHeaders }, URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, originalRequest().httpReferrer(), shouldCaptureExtraNetworkLoadMetrics(), requestLoadType);
>+        m_networkLoadChecker = std::make_unique<NetworkLoadChecker>(FetchOptions { m_parameters.options }, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, HTTPHeaderMap { m_parameters.originalRequestHeaders }, URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, originalRequest().httpReferrer(), m_parameters.isHTTPSUpgradeEnabled, shouldCaptureExtraNetworkLoadMetrics(), requestLoadType);
>         if (m_parameters.cspResponseHeaders)
>             m_networkLoadChecker->setCSPResponseHeaders(ContentSecurityPolicyResponseHeaders { m_parameters.cspResponseHeaders.value() });
> #if ENABLE(CONTENT_EXTENSIONS)
>diff --git a/Source/WebKit/Shared/HTTPSUpgrade/HTTPSUpgradeList.txt b/Source/WebKit/Shared/HTTPSUpgrade/HTTPSUpgradeList.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..08a1aefcfe85044a769a826aa6df9c3e93503eb8
>--- /dev/null
>+++ b/Source/WebKit/Shared/HTTPSUpgrade/HTTPSUpgradeList.txt
>@@ -0,0 +1,3 @@
>+www.bbc.com
>+www.speedtest.net
>+www.bea.gov
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 077bde35ea562ec343ece0cb5205ca9e1db1000e..f856568a064721f852b330f44e11dd9f9766b54a 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -35,6 +35,13 @@ PluginsEnabled:
>   type: bool
>   defaultValue: false
> 
>+HTTPSUpgradeEnabled:
>+   type: bool
>+   defaultValue: false
>+   humanReadableName: "Automatic HTTPS upgrade"
>+   humanReadableDescription: "Automatic HTTPS upgrade for sites that support it"
>+   category: experimental
>+
> JavaEnabled:
>   type: bool
>   defaultValue: false
>diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>index 1623b200908be20a26d90f2102a0a85e667a3379..84c12a04a68215b41189f36d5f0173b3265c2c5b 100644
>--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>@@ -275,6 +275,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
>     loadParameters.maximumBufferingTime = maximumBufferingTime;
>     loadParameters.options = resourceLoader.options();
>     loadParameters.preflightPolicy = resourceLoader.options().preflightPolicy;
>+    loadParameters.isHTTPSUpgradeEnabled = resourceLoader.frame() ? resourceLoader.frame()->settings().HTTPSUpgradeEnabled() : false;
> 
>     auto* document = resourceLoader.frame() ? resourceLoader.frame()->document() : nullptr;
>     if (resourceLoader.options().cspResponseHeaders)
>diff --git a/Source/WebKit/config.h b/Source/WebKit/config.h
>index 07d0d8a9e317969020f26c6919edc8f5066ec825..d9e8d69951aa3e71a60d6851e655d700e71e8d71 100644
>--- a/Source/WebKit/config.h
>+++ b/Source/WebKit/config.h
>@@ -79,6 +79,3 @@
> #endif
> #endif
> 
>-#ifndef ENABLE_HTTPS_UPGRADE
>-#define ENABLE_HTTPS_UPGRADE 0
>-#endif

Actions: View | Formatted Diff | Diff

Attachments on bug 192937: 357821 | 357823 | 357826 | 357827 | 357830 | 357833 | 357841 | 357886 | 357888