Changeset 252796 in webkit

Timestamp:

Nov 22, 2019, 1:25:04 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Revert r250422
​https://bugs.webkit.org/show_bug.cgi?id=202285

This is needed for rdar://problem/56760896

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::setCanHandleHTTPSServerTrustEvaluation):

• NetworkProcess/NetworkProcess.h:

(WebKit::NetworkProcess::canHandleHTTPSServerTrustEvaluation const):

• NetworkProcess/NetworkProcess.messages.in:
• NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

• NetworkProcess/NetworkProcessCreationParameters.h:
• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):

• UIProcess/API/C/WKContext.cpp:

(WKContextSetCanHandleHTTPSServerTrustEvaluation):

• UIProcess/API/Cocoa/WKProcessPool.mm:

(-[WKProcessPool _setCanHandleHTTPSServerTrustEvaluation:]):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::setCanHandleHTTPSServerTrustEvaluation):

• UIProcess/WebProcessPool.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcess.h (modified) (3 diffs)
• NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• NetworkProcess/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcessCreationParameters.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog ¶

@@ +1 @@
+2019-11-22  Alex Christensen  <achristensen@webkit.org>
+
+        Revert r250422
+        https://bugs.webkit.org/show_bug.cgi?id=202285
+
+        This is needed for rdar://problem/56760896
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::initializeNetworkProcess):
+        (WebKit::NetworkProcess::setCanHandleHTTPSServerTrustEvaluation):
+        * NetworkProcess/NetworkProcess.h:
+        (WebKit::NetworkProcess::canHandleHTTPSServerTrustEvaluation const):
+        * NetworkProcess/NetworkProcess.messages.in:
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode const):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextSetCanHandleHTTPSServerTrustEvaluation):
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _setCanHandleHTTPSServerTrustEvaluation:]):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        (WebKit::WebProcessPool::setCanHandleHTTPSServerTrustEvaluation):
+        * UIProcess/WebProcessPool.h:
+
 2019-11-22  Conrad Shultz  <conrad_shultz@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp ¶

@@ -306 +306 @@
     setCacheModel(parameters.cacheModel, parameters.defaultDataStoreParameters.networkSessionParameters.networkCacheDirectory);
 
+    setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
+
 #if ENABLE(RESOURCE_LOAD_STATISTICS)
     m_isITPDatabaseEnabled = parameters.shouldEnableITPDatabase;
@@ -2204 +2206 @@
 }
 
+void NetworkProcess::setCanHandleHTTPSServerTrustEvaluation(bool value)
+{
+    m_canHandleHTTPSServerTrustEvaluation = value;
+}
+
 void NetworkProcess::didSyncAllCookies()
 {

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h ¶

@@ -174 +174 @@
     void ensureSession(const PAL::SessionID&, bool shouldUseTestingNetworkSession, const String& identifier);
 #endif
+
+    bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
 
     void processWillSuspendImminentlyForTestingSync(CompletionHandler<void()>&&);
@@ -410 +412 @@
     void setCacheModelSynchronouslyForTesting(CacheModel, CompletionHandler<void()>&&);
     void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
+    void setCanHandleHTTPSServerTrustEvaluation(bool);
     void clearCacheForAllOrigins(uint32_t cachesToClear);
     void setAllowsAnySSLCertificateForWebSocket(bool, CompletionHandler<void()>&&);
@@ -471 +474 @@
     CacheModel m_cacheModel { CacheModel::DocumentViewer };
     bool m_suppressMemoryPressureHandler { false };
+    bool m_canHandleHTTPSServerTrustEvaluation { true };
     String m_uiProcessBundleIdentifier;
     DownloadManager m_downloadManager;

trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in ¶

@@ -68 +68 @@
 
     AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
+    SetCanHandleHTTPSServerTrustEvaluation(bool value)
     
     ClearCacheForAllOrigins(uint32_t cachesToClear)

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp ¶

@@ -41 +41 @@
 {
     encoder.encodeEnum(cacheModel);
+    encoder << canHandleHTTPSServerTrustEvaluation;
 #if PLATFORM(MAC)
     encoder << uiProcessCookieStorageIdentifier;
@@ -89 +90 @@
         return false;
 
+    if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
+        return false;
+
 #if PLATFORM(MAC)
     if (!decoder.decode(result.uiProcessCookieStorageIdentifier))

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h ¶

@@ -53 +53 @@
 
     CacheModel cacheModel { CacheModel::DocumentViewer };
+    bool canHandleHTTPSServerTrustEvaluation { true };
 
 #if PLATFORM(MAC)

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm ¶

@@ -643 +643 @@
 
         // Handle server trust evaluation at platform-level if requested, for performance reasons and to use ATS defaults.
-        if (sessionCocoa->fastServerTrustEvaluationEnabled()) {
+        if (!_session->networkProcess().canHandleHTTPSServerTrustEvaluation() || sessionCocoa->fastServerTrustEvaluationEnabled()) {
 #if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
             auto* networkDataTask = [self existingTask:task];

trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp ¶

@@ -382 +382 @@
 void WKContextSetCanHandleHTTPSServerTrustEvaluation(WKContextRef contextRef, bool value)
 {
+    WebKit::toImpl(contextRef)->setCanHandleHTTPSServerTrustEvaluation(value);
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm ¶

@@ -199 +199 @@
 - (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value
 {
+    _processPool->setCanHandleHTTPSServerTrustEvaluation(value);
 }
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp ¶

@@ -494 +494 @@
 
     parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
+    parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
 
     for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
@@ -1486 +1487 @@
 }
 
+void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
+{
+    m_canHandleHTTPSServerTrustEvaluation = value;
+    if (m_networkProcess) {
+        m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
+        return;
+    }
+}
+
 void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
 {

trunk/Source/WebKit/UIProcess/WebProcessPool.h ¶

@@ -270 +270 @@
     void setShouldUseFontSmoothing(bool);
     
+    void setCanHandleHTTPSServerTrustEvaluation(bool);
     void registerURLSchemeAsEmptyDocument(const String&);
     void registerURLSchemeAsSecure(const String&);
@@ -792 +793 @@
 #endif
     bool m_useSeparateServiceWorkerProcess { false };
+    bool m_canHandleHTTPSServerTrustEvaluation { true };
 };