Changeset 252796 in webkit


Ignore:
Timestamp:
Nov 22, 2019 1:25:04 PM (4 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:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r252782 r252796  
     12019-11-22  Alex Christensen  <achristensen@webkit.org>
     2
     3        Revert r250422
     4        https://bugs.webkit.org/show_bug.cgi?id=202285
     5
     6        This is needed for rdar://problem/56760896
     7
     8        * NetworkProcess/NetworkProcess.cpp:
     9        (WebKit::NetworkProcess::initializeNetworkProcess):
     10        (WebKit::NetworkProcess::setCanHandleHTTPSServerTrustEvaluation):
     11        * NetworkProcess/NetworkProcess.h:
     12        (WebKit::NetworkProcess::canHandleHTTPSServerTrustEvaluation const):
     13        * NetworkProcess/NetworkProcess.messages.in:
     14        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     15        (WebKit::NetworkProcessCreationParameters::encode const):
     16        (WebKit::NetworkProcessCreationParameters::decode):
     17        * NetworkProcess/NetworkProcessCreationParameters.h:
     18        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
     19        (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
     20        * UIProcess/API/C/WKContext.cpp:
     21        (WKContextSetCanHandleHTTPSServerTrustEvaluation):
     22        * UIProcess/API/Cocoa/WKProcessPool.mm:
     23        (-[WKProcessPool _setCanHandleHTTPSServerTrustEvaluation:]):
     24        * UIProcess/WebProcessPool.cpp:
     25        (WebKit::WebProcessPool::ensureNetworkProcess):
     26        (WebKit::WebProcessPool::setCanHandleHTTPSServerTrustEvaluation):
     27        * UIProcess/WebProcessPool.h:
     28
    1292019-11-22  Conrad Shultz  <conrad_shultz@apple.com>
    230
  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r252274 r252796  
    306306    setCacheModel(parameters.cacheModel, parameters.defaultDataStoreParameters.networkSessionParameters.networkCacheDirectory);
    307307
     308    setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
     309
    308310#if ENABLE(RESOURCE_LOAD_STATISTICS)
    309311    m_isITPDatabaseEnabled = parameters.shouldEnableITPDatabase;
     
    22042206}
    22052207
     2208void NetworkProcess::setCanHandleHTTPSServerTrustEvaluation(bool value)
     2209{
     2210    m_canHandleHTTPSServerTrustEvaluation = value;
     2211}
     2212
    22062213void NetworkProcess::didSyncAllCookies()
    22072214{
  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r252364 r252796  
    174174    void ensureSession(const PAL::SessionID&, bool shouldUseTestingNetworkSession, const String& identifier);
    175175#endif
     176
     177    bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
    176178
    177179    void processWillSuspendImminentlyForTestingSync(CompletionHandler<void()>&&);
     
    410412    void setCacheModelSynchronouslyForTesting(CacheModel, CompletionHandler<void()>&&);
    411413    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
     414    void setCanHandleHTTPSServerTrustEvaluation(bool);
    412415    void clearCacheForAllOrigins(uint32_t cachesToClear);
    413416    void setAllowsAnySSLCertificateForWebSocket(bool, CompletionHandler<void()>&&);
     
    471474    CacheModel m_cacheModel { CacheModel::DocumentViewer };
    472475    bool m_suppressMemoryPressureHandler { false };
     476    bool m_canHandleHTTPSServerTrustEvaluation { true };
    473477    String m_uiProcessBundleIdentifier;
    474478    DownloadManager m_downloadManager;
  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

    r252259 r252796  
    6868
    6969    AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
     70    SetCanHandleHTTPSServerTrustEvaluation(bool value)
    7071   
    7172    ClearCacheForAllOrigins(uint32_t cachesToClear)
  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

    r252368 r252796  
    4141{
    4242    encoder.encodeEnum(cacheModel);
     43    encoder << canHandleHTTPSServerTrustEvaluation;
    4344#if PLATFORM(MAC)
    4445    encoder << uiProcessCookieStorageIdentifier;
     
    8990        return false;
    9091
     92    if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
     93        return false;
     94
    9195#if PLATFORM(MAC)
    9296    if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

    r252368 r252796  
    5353
    5454    CacheModel cacheModel { CacheModel::DocumentViewer };
     55    bool canHandleHTTPSServerTrustEvaluation { true };
    5556
    5657#if PLATFORM(MAC)
  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

    r252368 r252796  
    643643
    644644        // Handle server trust evaluation at platform-level if requested, for performance reasons and to use ATS defaults.
    645         if (sessionCocoa->fastServerTrustEvaluationEnabled()) {
     645        if (!_session->networkProcess().canHandleHTTPSServerTrustEvaluation() || sessionCocoa->fastServerTrustEvaluationEnabled()) {
    646646#if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
    647647            auto* networkDataTask = [self existingTask:task];
  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r251067 r252796  
    382382void WKContextSetCanHandleHTTPSServerTrustEvaluation(WKContextRef contextRef, bool value)
    383383{
     384    WebKit::toImpl(contextRef)->setCanHandleHTTPSServerTrustEvaluation(value);
    384385}
    385386
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm

    r252500 r252796  
    199199- (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value
    200200{
     201    _processPool->setCanHandleHTTPSServerTrustEvaluation(value);
    201202}
    202203
  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r252428 r252796  
    494494
    495495    parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
     496    parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
    496497
    497498    for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
     
    14861487}
    14871488
     1489void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
     1490{
     1491    m_canHandleHTTPSServerTrustEvaluation = value;
     1492    if (m_networkProcess) {
     1493        m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
     1494        return;
     1495    }
     1496}
     1497
    14881498void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
    14891499{
  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r252428 r252796  
    270270    void setShouldUseFontSmoothing(bool);
    271271   
     272    void setCanHandleHTTPSServerTrustEvaluation(bool);
    272273    void registerURLSchemeAsEmptyDocument(const String&);
    273274    void registerURLSchemeAsSecure(const String&);
     
    792793#endif
    793794    bool m_useSeparateServiceWorkerProcess { false };
     795    bool m_canHandleHTTPSServerTrustEvaluation { true };
    794796};
    795797
Note: See TracChangeset for help on using the changeset viewer.