Changeset 240031 in webkit

Timestamp:

Jan 15, 2019 9:03:07 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Reduce use of NetworkStorageSession::defaultStorageSession in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=193368

Reviewed by Geoff Garen.

Source/WebCore:

The NetworkStorageSession ownership needs to move to the WebKit/WebKitLegacy layer instead of being a process-global static map.

• loader/EmptyClients.cpp:
• platform/network/CredentialStorage.cpp:

(WebCore::CredentialStorage::defaultCredentialStorage): Deleted.

• platform/network/CredentialStorage.h:
• platform/network/NetworkStorageSession.h:
• platform/network/cf/NetworkStorageSessionCFNet.cpp:

(WebCore::NetworkStorageSession::switchToNewTestingSession):
(WebCore::NetworkStorageSession::ensureSession):

• platform/network/cf/NetworkStorageSessionCFNetWin.cpp:

(WebCore::createPrivateStorageSession):

• platform/network/curl/ResourceHandleCurl.cpp:

(WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
(WebCore::ResourceHandle::receivedCredential):
(WebCore::ResourceHandle::getCredential):

Source/WebKit:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::getAuthenticationInfo):

Source/WebKitLegacy/mac:

• Misc/WebCache.mm:

(+[WebCache clearCachedCredentials]):

• Misc/WebDownload.mm:

(-[WebDownloadInternal download:didReceiveAuthenticationChallenge:]):

• Plugins/WebBaseNetscapePluginView.mm:

(WebKit::getAuthenticationInfo):

Source/WebKitLegacy/win:

• WebDownloadCFNet.cpp:

(WebDownload::didReceiveAuthenticationChallenge):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/EmptyClients.cpp (modified) (1 diff)
• WebCore/platform/network/CredentialStorage.cpp (modified) (1 diff)
• WebCore/platform/network/CredentialStorage.h (modified) (1 diff)
• WebCore/platform/network/NetworkStorageSession.h (modified) (1 diff)
• WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (modified) (2 diffs)
• WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp (modified) (3 diffs)
• WebCore/platform/network/curl/ResourceHandleCurl.cpp (modified) (6 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/Plugins/PluginView.cpp (modified) (2 diffs)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/Misc/WebCache.mm (modified) (2 diffs)
• WebKitLegacy/mac/Misc/WebDownload.mm (modified) (2 diffs)
• WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm (modified) (2 diffs)
• WebKitLegacy/win/ChangeLog (modified) (1 diff)
• WebKitLegacy/win/WebDownloadCFNet.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-15  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce use of NetworkStorageSession::defaultStorageSession in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=193368
+
+        Reviewed by Geoff Garen.
+
+        The NetworkStorageSession ownership needs to move to the WebKit/WebKitLegacy layer instead of being a process-global static map.
+
+        * loader/EmptyClients.cpp:
+        * platform/network/CredentialStorage.cpp:
+        (WebCore::CredentialStorage::defaultCredentialStorage): Deleted.
+        * platform/network/CredentialStorage.h:
+        * platform/network/NetworkStorageSession.h:
+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+        (WebCore::NetworkStorageSession::switchToNewTestingSession):
+        (WebCore::NetworkStorageSession::ensureSession):
+        * platform/network/cf/NetworkStorageSessionCFNetWin.cpp:
+        (WebCore::createPrivateStorageSession):
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+        (WebCore::ResourceHandle::receivedCredential):
+        (WebCore::ResourceHandle::getCredential):
+
 2019-01-15  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/loader/EmptyClients.cpp

@@ -289 +289 @@
 
     bool shouldClearReferrerOnHTTPSToHTTPRedirect() const { return true; }
-    NetworkStorageSession* storageSession() const final { return &NetworkStorageSession::defaultStorageSession(); }
+    NetworkStorageSession* storageSession() const final { return nullptr; }
 
 #if PLATFORM(COCOA)

trunk/Source/WebCore/platform/network/CredentialStorage.cpp

@@ -35 +35 @@
 
 namespace WebCore {
-
-CredentialStorage& CredentialStorage::defaultCredentialStorage()
-{
-    return NetworkStorageSession::defaultStorageSession().credentialStorage();
-}
 
 static String originStringFromURL(const URL& url)

trunk/Source/WebCore/platform/network/CredentialStorage.h

@@ -39 +39 @@
 class CredentialStorage {
 public:
-    WEBCORE_EXPORT static CredentialStorage& defaultCredentialStorage();
-
     // WebCore session credential storage.
     WEBCORE_EXPORT void set(const String&, const Credential&, const ProtectionSpace&, const URL&);

trunk/Source/WebCore/platform/network/NetworkStorageSession.h

@@ -209 +209 @@
 };
 
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) || USE(CFURLCONNECTION)
 WEBCORE_EXPORT CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier);
-#elif USE(CFURLCONNECTION)
-CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession);
 #endif
 

trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp

@@ -99 +99 @@
     String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID()));
 
-    RetainPtr<CFURLStorageSessionRef> session;
-#if PLATFORM(COCOA)
-    session = adoptCF(createPrivateStorageSession(sessionName.createCFString().get()));
-#else
-    session = adoptCF(createPrivateStorageSession(sessionName.createCFString().get(), defaultStorageSession().platformSession()));
-#endif
+    auto session = adoptCF(createPrivateStorageSession(sessionName.createCFString().get()));
 
     RetainPtr<CFHTTPCookieStorageRef> cookieStorage;
@@ -132 +127 @@
 
     RetainPtr<CFURLStorageSessionRef> storageSession;
-    if (sessionID.isEphemeral()) {
-#if PLATFORM(COCOA)
+    if (sessionID.isEphemeral())
         storageSession = adoptCF(createPrivateStorageSession(cfIdentifier.get()));
-#else
-        storageSession = adoptCF(createPrivateStorageSession(cfIdentifier.get(), defaultNetworkStorageSession()->platformSession()));
-#endif
-    } else
+    else
         storageSession = createCFStorageSessionForIdentifier(cfIdentifier.get());
 

trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp

@@ -62 +62 @@
 namespace WebCore {
 
-CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession)
+CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier)
 {
     const void* sessionPropertyKeys[] = { _kCFURLStorageSessionIsPrivate };
@@ -73 +73 @@
     CFURLCacheRef cache = _CFURLStorageSessionCopyCache(kCFAllocatorDefault, storageSession);
     CFURLCacheSetDiskCapacity(cache, 0);
-    CFURLCacheRef defaultCache;
-    if (defaultStorageSession)
-        defaultCache = _CFURLStorageSessionCopyCache(kCFAllocatorDefault, defaultStorageSession);
-    else
-        defaultCache = CFURLCacheCopySharedURLCache();
+    CFURLCacheRef defaultCache = CFURLCacheCopySharedURLCache();
     CFURLCacheSetMemoryCapacity(cache, CFURLCacheMemoryCapacity(defaultCache));
     CFRelease(defaultCache);
@@ -83 +79 @@
     
     CFHTTPCookieStorageRef cookieStorage = _CFURLStorageSessionCopyCookieStorage(kCFAllocatorDefault, storageSession);
-    CFHTTPCookieStorageRef defaultCookieStorage;
-    if (defaultStorageSession)
-        defaultCookieStorage = _CFURLStorageSessionCopyCookieStorage(kCFAllocatorDefault, defaultStorageSession);
-    else
-        defaultCookieStorage = _CFHTTPCookieStorageGetDefault(kCFAllocatorDefault);
+    CFHTTPCookieStorageRef defaultCookieStorage = _CFHTTPCookieStorageGetDefault(kCFAllocatorDefault);
     CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage, CFHTTPCookieStorageGetCookieAcceptPolicy(defaultCookieStorage));
-    if (defaultStorageSession)
-        CFRelease(defaultCookieStorage);
     CFRelease(cookieStorage);
     

trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp

@@ -146 +146 @@
         addCacheValidationHeaders(request);
 
-        auto& storageSession = NetworkStorageSession::defaultStorageSession();
+        auto& storageSession = *context()->storageSession(PAL::SessionID::defaultSessionID());
         auto& cookieJar = storageSession.cookieStorage();
         auto includeSecureCookies = request.url().protocolIs("https") ? IncludeSecureCookies::Yes : IncludeSecureCookies::No;
@@ -232 +232 @@
         if (challenge.failureResponse().httpStatusCode() == 401)
             urlToStore = challenge.failureResponse().url();
-        CredentialStorage::defaultCredentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore);
+        context()->storageSession(PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore);
 
         restartRequestWithCredential(challenge.protectionSpace(), credential);
@@ -247 +247 @@
             // There is a race condition here, since a different credential might have already been stored by another ResourceHandle,
             // but the observable effect should be very minor, if any.
-            CredentialStorage::defaultCredentialStorage().remove(partition, challenge.protectionSpace());
+            context()->storageSession(PAL::SessionID::defaultSessionID())->credentialStorage().remove(partition, challenge.protectionSpace());
         }
 
         if (!challenge.previousFailureCount()) {
-            Credential credential = CredentialStorage::defaultCredentialStorage().get(partition, challenge.protectionSpace());
+            Credential credential = context()->storageSession(PAL::SessionID::defaultSessionID())->credentialStorage().get(partition, challenge.protectionSpace());
             if (!credential.isEmpty() && credential != d->m_initialCredential) {
                 ASSERT(credential.persistence() == CredentialPersistenceNone);
                 if (challenge.failureResponse().httpStatusCode() == 401) {
                     // Store the credential back, possibly adding it as a default for this directory.
-                    CredentialStorage::defaultCredentialStorage().set(partition, credential, challenge.protectionSpace(), challenge.failureResponse().url());
+                    context()->storageSession(PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, challenge.protectionSpace(), challenge.failureResponse().url());
                 }
 
@@ -290 +290 @@
         if (challenge.failureResponse().httpStatusCode() == 401) {
             URL urlToStore = challenge.failureResponse().url();
-            CredentialStorage::defaultCredentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore);
+            context()->storageSession(PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore);
         }
     }
@@ -347 +347 @@
             // <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication, 
             // try and reuse the credential preemptively, as allowed by RFC 2617.
-            d->m_initialCredential = CredentialStorage::defaultCredentialStorage().get(partition, request.url());
+            d->m_initialCredential = context()->storageSession(PAL::SessionID::defaultSessionID())->credentialStorage().get(partition, request.url());
         } else if (!redirect) {
             // If there is already a protection space known for the URL, update stored credentials
@@ -353 +353 @@
             // XMLHttpRequest with known incorrect credentials, and aborting it immediately (so that
             // an authentication dialog doesn't pop up).
-            CredentialStorage::defaultCredentialStorage().set(partition, credential, request.url());
+            context()->storageSession(PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, request.url());
         }
     }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-15  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce use of NetworkStorageSession::defaultStorageSession in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=193368
+
+        Reviewed by Geoff Garen.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::getAuthenticationInfo):
+
 2019-01-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp

@@ -58 +58 @@
 #include <WebCore/MouseEvent.h>
 #include <WebCore/NetscapePlugInStreamLoader.h>
+#include <WebCore/NetworkStorageSession.h>
 #include <WebCore/Page.h>
 #include <WebCore/PlatformMouseEvent.h>
@@ -1603 +1604 @@
 
     String partitionName = contentDocument->topDocument().domainForCachePartition();
-    Credential credential = CredentialStorage::defaultCredentialStorage().get(partitionName, protectionSpace);
+    Credential credential = NetworkStorageSession::defaultStorageSession().credentialStorage().get(partitionName, protectionSpace);
     if (credential.isEmpty())
-        credential = CredentialStorage::defaultCredentialStorage().getFromPersistentStorage(protectionSpace);
+        credential = NetworkStorageSession::defaultStorageSession().credentialStorage().getFromPersistentStorage(protectionSpace);
 
     if (!credential.hasPassword())

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-01-15  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce use of NetworkStorageSession::defaultStorageSession in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=193368
+
+        Reviewed by Geoff Garen.
+
+        * Misc/WebCache.mm:
+        (+[WebCache clearCachedCredentials]):
+        * Misc/WebDownload.mm:
+        (-[WebDownloadInternal download:didReceiveAuthenticationChallenge:]):
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (WebKit::getAuthenticationInfo):
+
 2019-01-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKitLegacy/mac/Misc/WebCache.mm

@@ -38 +38 @@
 #import <WebCore/Document.h>
 #import <WebCore/MemoryCache.h>
+#import <WebCore/NetworkStorageSession.h>
 #import <wtf/MainThread.h>
 #import <wtf/RunLoop.h>
@@ -214 +215 @@
 {
     [WebView _makeAllWebViewsPerformSelector:@selector(_clearCredentials)];
-    WebCore::CredentialStorage::defaultCredentialStorage().clearCredentials();
+    WebCore::NetworkStorageSession::defaultStorageSession().credentialStorage().clearCredentials();
 }
 

trunk/Source/WebKitLegacy/mac/Misc/WebDownload.mm

@@ -33 +33 @@
 #import <WebCore/Credential.h>
 #import <WebCore/CredentialStorage.h>
+#import <WebCore/NetworkStorageSession.h>
 #import <WebCore/ProtectionSpace.h>
 #import <WebKitLegacy/WebPanelAuthenticationHandler.h>
@@ -95 +96 @@
     // Try previously stored credential first.
     if (![challenge previousFailureCount]) {
-        NSURLCredential *credential = CredentialStorage::defaultCredentialStorage().get(emptyString(), ProtectionSpace([challenge protectionSpace])).nsCredential();
+        NSURLCredential *credential = NetworkStorageSession::defaultStorageSession().credentialStorage().get(emptyString(), ProtectionSpace([challenge protectionSpace])).nsCredential();
         if (credential) {
             [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge];

trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -48 +48 @@
 #import <WebCore/FrameLoader.h>
 #import <WebCore/HTMLPlugInElement.h>
+#import <WebCore/NetworkStorageSession.h>
 #import <WebCore/Page.h>
 #import <WebCore/ProtectionSpace.h>
@@ -872 +873 @@
     RetainPtr<NSURLProtectionSpace> protectionSpace = adoptNS([[NSURLProtectionSpace alloc] initWithHost:host port:port protocol:protocol realm:realm authenticationMethod:authenticationMethod]);
     
-    NSURLCredential *credential = CredentialStorage::defaultCredentialStorage().get(emptyString(), ProtectionSpace(protectionSpace.get())).nsCredential();
+    NSURLCredential *credential = WebCore::NetworkStorageSession::defaultStorageSession().credentialStorage().get(emptyString(), ProtectionSpace(protectionSpace.get())).nsCredential();
     if (!credential)
         credential = [[NSURLCredentialStorage sharedCredentialStorage] defaultCredentialForProtectionSpace:protectionSpace.get()];

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2019-01-15  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce use of NetworkStorageSession::defaultStorageSession in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=193368
+
+        Reviewed by Geoff Garen.
+
+        * WebDownloadCFNet.cpp:
+        (WebDownload::didReceiveAuthenticationChallenge):
+
 2019-01-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKitLegacy/win/WebDownloadCFNet.cpp

@@ -48 +48 @@
 #include <WebCore/DownloadBundle.h>
 #include <WebCore/LoaderRunLoopCF.h>
+#include <WebCore/NetworkStorageSession.h>
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceHandle.h>
@@ -376 +377 @@
     // Try previously stored credential first.
     if (!CFURLAuthChallengeGetPreviousFailureCount(challenge)) {
-        Credential credential = CredentialStorage::defaultCredentialStorage().get(emptyString(), core(CFURLAuthChallengeGetProtectionSpace(challenge)));
+        Credential credential = WebCore::NetworkStorageSession::defaultStorageSession().credentialStorage().get(emptyString(), core(CFURLAuthChallengeGetProtectionSpace(challenge)));
         if (!credential.isEmpty()) {
             RetainPtr<CFURLCredentialRef> cfCredential = adoptCF(createCF(credential));