Attachment 359055 Details for Bug 193368 – Patch

[patch] Patch

bug-193368-20190114111520.patch (text/plain), 7.45 KB, created by Alex Christensen on 2019-01-14 11:15:21 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-01-14 11:15:21 PST

Size: 7.45 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 239927)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2019-01-14  Alex Christensen  <achristensen@webkit.org>
>+
>+        Reduce use of NetworkStorageSession::defaultStorageSession in WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=193368
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        NetworkStorageSession ownership needs to be handled by the WebKitLegacy/WebKit layer.
>+
>+        * loader/EmptyClients.cpp:
>+        * platform/network/NetworkStorageSession.h:
>+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
>+        (WebCore::NetworkStorageSession::switchToNewTestingSession):
>+        * platform/network/cf/NetworkStorageSessionCFNetWin.cpp:
>+        (WebCore::createPrivateStorageSession):
>+
> 2019-01-14  Zan Dobersek  <zdobersek@igalia.com>
> 
>         DOMCacheStorage: use-after-move in doSequentialMatch()
>Index: Source/WebCore/loader/EmptyClients.cpp
>===================================================================
>--- Source/WebCore/loader/EmptyClients.cpp	(revision 239927)
>+++ Source/WebCore/loader/EmptyClients.cpp	(working copy)
>@@ -287,7 +287,7 @@ private:
>     EmptyFrameNetworkingContext();
> 
>     bool shouldClearReferrerOnHTTPSToHTTPRedirect() const { return true; }
>-    NetworkStorageSession* storageSession() const final { return &NetworkStorageSession::defaultStorageSession(); }
>+    NetworkStorageSession* storageSession() const final { return nullptr; }
> 
> #if PLATFORM(COCOA)
>     bool localFileContentSniffingEnabled() const { return false; }
>Index: Source/WebCore/platform/network/CacheValidation.cpp
>===================================================================
>--- Source/WebCore/platform/network/CacheValidation.cpp	(revision 239927)
>+++ Source/WebCore/platform/network/CacheValidation.cpp	(working copy)
>@@ -336,8 +336,8 @@ static String headerValueForVary(const R
>         auto includeSecureCookies = request.url().protocolIs("https") ? IncludeSecureCookies::Yes : IncludeSecureCookies::No;
>         auto* cookieStrategy = platformStrategies() ? platformStrategies()->cookiesStrategy() : nullptr;
>         if (!cookieStrategy) {
>-            ASSERT(sessionID == PAL::SessionID::defaultSessionID());
>-            return NetworkStorageSession::defaultStorageSession().cookieRequestHeaderFieldValue(request.firstPartyForCookies(), SameSiteInfo::create(request), request.url(), WTF::nullopt, WTF::nullopt, includeSecureCookies).first;
>+            ASSERT_NOT_REACHED();
>+            return { };
>         }
>         return cookieStrategy->cookieRequestHeaderFieldValue(sessionID, request.firstPartyForCookies(), SameSiteInfo::create(request), request.url(), WTF::nullopt, WTF::nullopt, includeSecureCookies).first;
>     }
>Index: Source/WebCore/platform/network/NetworkStorageSession.h
>===================================================================
>--- Source/WebCore/platform/network/NetworkStorageSession.h	(revision 239927)
>+++ Source/WebCore/platform/network/NetworkStorageSession.h	(working copy)
>@@ -208,10 +208,8 @@ private:
>     static bool m_processMayUseCookieAPI;
> };
> 
>-#if PLATFORM(COCOA)
>+#if PLATFORM(COCOA) || USE(CFURLCONNECTION)
> WEBCORE_EXPORT CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier);
>-#elif USE(CFURLCONNECTION)
>-CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession);
> #endif
> 
> }
>Index: Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
>===================================================================
>--- Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp	(revision 239927)
>+++ Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp	(working copy)
>@@ -98,12 +98,7 @@ void NetworkStorageSession::switchToNewT
>     // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>).
>     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;
>     if (NetworkStorageSession::processMayUseCookieAPI()) {
>@@ -131,13 +126,9 @@ void NetworkStorageSession::ensureSessio
>     RetainPtr<CFStringRef> cfIdentifier = String(identifierBase + ".PrivateBrowsing").createCFString();
> 
>     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());
> 
>     if (NetworkStorageSession::processMayUseCookieAPI()) {
>Index: Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp
>===================================================================
>--- Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp	(revision 239927)
>+++ Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp	(working copy)
>@@ -62,7 +62,7 @@ DECLARE_CF_TYPE_TRAIT(CFHTTPCookie);
> 
> namespace WebCore {
> 
>-CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier, CFURLStorageSessionRef defaultStorageSession)
>+CFURLStorageSessionRef createPrivateStorageSession(CFStringRef identifier)
> {
>     const void* sessionPropertyKeys[] = { _kCFURLStorageSessionIsPrivate };
>     const void* sessionPropertyValues[] = { kCFBooleanTrue };
>@@ -73,24 +73,14 @@ CFURLStorageSessionRef createPrivateStor
>     // with the exception that it should be in-memory only storage.
>     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);
>     CFRelease(cache);
>     
>     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);
>     
>     return storageSession;

Actions: View | Formatted Diff | Diff

Attachments on bug 193368: 358949 | 358951 | 358963 | 358964 | 359055 | 359066 | 359072 | 359221