Changeset 239403 in webkit

Timestamp:

Dec 19, 2018, 4:07:32 PM (8 years ago)

Author:

Alan Coon

Message:

Apply patch. rdar://problem/46848447

Location:

branches/safari-606-branch

Files:

• LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-expected.txt (added)
• LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/NetworkStorageSession.cpp (modified) (1 diff)
• Source/WebCore/platform/network/NetworkStorageSession.h (modified) (2 diffs)
• Source/WebCore/platform/network/mac/CookieJarMac.mm (modified) (3 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkProcess.h (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (modified) (2 diffs)
• Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in (modified) (1 diff)
• Source/WebKit/UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp (modified) (2 diffs)
• Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h (modified) (2 diffs)
• Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (4 diffs)
• Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (modified) (5 diffs)

branches/safari-606-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-19  Alan Coon  <alancoon@apple.com>
+
+        Apply patch. rdar://problem/46848447
+
+    2018-12-19  Brent Fulgham  <bfulgham@apple.com>
+
+            Only cap lifetime of persistent cookies created client-side through document.cookie when resource load statistics is enabled
+            https://bugs.webkit.org/show_bug.cgi?id=190687
+            <rdar://problem/45349024>
+
+            Reviewed by Alex Christensen.
+
+            Test: http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js.html
+
+            * platform/network/NetworkStorageSession.cpp:
+            (WebCore::NetworkStorageSession::setShouldCapLifetimeForClientSideCookies):
+            (WebCore::NetworkStorageSession::shouldCapLifetimeForClientSideCookies const):
+            * platform/network/NetworkStorageSession.h:
+            * platform/network/mac/CookieJarMac.mm:
+            (WebCore::filterCookies):
+            (WebCore::setCookiesFromDOM): Now consults the new NetworkStorageSession's
+            m_shouldCapLifetimeForClientSideCookies member variable before capping the
+            lifetime of cookies.
+
 2018-12-19  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-606-branch/Source/WebCore/platform/network/NetworkStorageSession.cpp

@@ -75 +75 @@
 }
 
+void NetworkStorageSession::setShouldCapLifetimeForClientSideCookies(bool value)
+{
+    m_shouldCapLifetimeForClientSideCookies = value;
 }
+
+bool NetworkStorageSession::shouldCapLifetimeForClientSideCookies() const
+{
+    return m_shouldCapLifetimeForClientSideCookies;
+}
+
+}

branches/safari-606-branch/Source/WebCore/platform/network/NetworkStorageSession.h

@@ -102 +102 @@
     WEBCORE_EXPORT String cookieStoragePartition(const URL& firstPartyForCookies, const URL& resource, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID) const;
     WEBCORE_EXPORT void setPrevalentDomainsToPartitionOrBlockCookies(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, bool clearFirst);
+    WEBCORE_EXPORT void setShouldCapLifetimeForClientSideCookies(bool);
+    WEBCORE_EXPORT bool shouldCapLifetimeForClientSideCookies() const;
     WEBCORE_EXPORT void removePrevalentDomains(const Vector<String>& domains);
     WEBCORE_EXPORT bool hasStorageAccess(const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID) const;
@@ -176 +178 @@
     HashMap<uint64_t, HashMap<uint64_t, String, DefaultHash<uint64_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>>, DefaultHash<uint64_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> m_framesGrantedStorageAccess;
     HashMap<uint64_t, HashMap<String, String>, DefaultHash<uint64_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> m_pagesGrantedStorageAccess;
+    bool m_shouldCapLifetimeForClientSideCookies { false };
 #endif
 

branches/safari-606-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm

@@ -146 +146 @@
 }
 
-static RetainPtr<NSArray> filterCookies(NSArray *unfilteredCookies)
+static RetainPtr<NSArray> filterCookies(NSArray *unfilteredCookies, bool shouldCapLifetime)
 {
     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
@@ -167 +167 @@
 
         // Cap lifetime of persistent, client-side cookies to a week.
-        if (![cookie isSessionOnly]) {
+        if (shouldCapLifetime && ![cookie isSessionOnly]) {
             if (!cookie.expiresDate || cookie.expiresDate.timeIntervalSinceNow > secondsPerWeek) {
                 RetainPtr<NSMutableDictionary<NSHTTPCookiePropertyKey, id>> properties = adoptNS([[cookie properties] mutableCopy]);
@@ -336 +336 @@
 #endif
 
-    RetainPtr<NSArray> filteredCookies = filterCookies(unfilteredCookies);
+#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+    RetainPtr<NSArray> filteredCookies = filterCookies(unfilteredCookies, session.shouldCapLifetimeForClientSideCookies());
+#else
+    RetainPtr<NSArray> filteredCookies = filterCookies(unfilteredCookies, false);
+#endif
     ASSERT([filteredCookies.get() count] <= 1);
 

branches/safari-606-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-19  Alan Coon  <alancoon@apple.com>
+
+        Apply patch. rdar://problem/46848447
+
+    2018-12-19  Brent Fulgham  <bfulgham@apple.com>
+
+            Only cap lifetime of persistent cookies created client-side through document.cookie when resource load statistics is enabled
+            https://bugs.webkit.org/show_bug.cgi?id=190687
+            <rdar://problem/45349024>
+
+            This patch adds the following:=
+            * The WebProcessPool now tells the WebsiteDataStore when a network process has
+            been created.
+            * The WebsiteDataStore in turn tells the WebResourceLoadStatisticsStore when
+            a network process has been created.
+            * The WebResourceLoadStatisticsStore makes sure to update the network processes
+            with its cookie policy when it's notified that a network process has been
+            created.
+
+            In addition, this patch changes the following:
+
+            * Removes WebsiteDataStore::networkProcessDidCrash() and
+            WebResourceLoadStatisticsStore::scheduleCookieBlockingStateReset() since
+            the call site---WebProcessPool::ensureNetworkProcess()---now calls
+            WebsiteDataStore::didCreateNetworkProcess() after a network process
+            crash and the state sync for cookie blocking is triggered.
+
+            * NetworkProcess/NetworkProcess.cpp:
+            (WebKit::NetworkProcess::setShouldCapLifetimeForClientSideCookies):
+            * NetworkProcess/NetworkProcess.h:
+            * NetworkProcess/NetworkProcess.messages.in:
+            * UIProcess/Network/NetworkProcessProxy.cpp:
+            (WebKit::NetworkProcessProxy::setShouldCapLifetimeForClientSideCookies):
+            (WebKit::NetworkProcessProxy::didSetShouldCapLifetimeForClientSideCookies):
+            * UIProcess/Network/NetworkProcessProxy.h:
+            * UIProcess/Network/NetworkProcessProxy.messages.in:
+            * UIProcess/WebProcessPool.cpp:
+            (WebKit::WebProcessPool::ensureNetworkProcess):
+            * UIProcess/WebResourceLoadStatisticsStore.cpp:
+            (WebKit::WebResourceLoadStatisticsStore::didCreateNetworkProcess):
+            * UIProcess/WebResourceLoadStatisticsStore.h:
+            * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+            (WebKit::WebsiteDataStore::setShouldCapLifetimeForClientSideCookies):
+            (WebKit::WebsiteDataStore::didCreateNetworkProcess):
+            (WebKit::WebsiteDataStore::networkProcessDidCrash): Deleted.
+            * UIProcess/WebsiteData/WebsiteDataStore.h:
+
 2018-12-05  Alan Coon  <alancoon@apple.com>
 

branches/safari-606-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -427 +427 @@
 }
 
+void NetworkProcess::setShouldCapLifetimeForClientSideCookies(PAL::SessionID sessionID, bool value, uint64_t contextId)
+{
+    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
+        networkStorageSession->setShouldCapLifetimeForClientSideCookies(value);
+    parentProcessConnection()->send(Messages::NetworkProcessProxy::DidSetShouldCapLifetimeForClientSideCookies(contextId), 0);
+}
+
 void NetworkProcess::hasStorageAccessForFrame(PAL::SessionID sessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId)
 {

branches/safari-606-branch/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -133 +133 @@
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     void updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, bool shouldClearFirst, uint64_t callbackId);
+    void setShouldCapLifetimeForClientSideCookies(PAL::SessionID, bool value, uint64_t contextId);
     void hasStorageAccessForFrame(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId);
     void getAllStorageAccessEntries(PAL::SessionID, uint64_t contextId);

branches/safari-606-branch/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

@@ -86 +86 @@
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     UpdatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID sessionID, Vector<String> domainsToPartition, Vector<String> domainsToBlock, Vector<String> domainsToNeitherPartitionNorBlock, bool shouldClearFirst, uint64_t callbackId)
+    SetShouldCapLifetimeForClientSideCookies(PAL::SessionID sessionID, bool value, uint64_t contextId)
     HasStorageAccessForFrame(PAL::SessionID sessionID, String resourceDomain, String firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId)
     GetAllStorageAccessEntries(PAL::SessionID sessionID, uint64_t contextId)

branches/safari-606-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

@@ -445 +445 @@
 }
 
+void NetworkProcessProxy::setShouldCapLifetimeForClientSideCookies(PAL::SessionID sessionID, ShouldCapLifetimeForClientSideCookies shouldCapLifetime, CompletionHandler<void()>&& completionHandler)
+{
+    if (!canSendMessage()) {
+        completionHandler();
+        return;
+    }
+
+    auto callbackId = generateCallbackID();
+    auto addResult = m_updatePartitionOrBlockCookiesCallbackMap.add(callbackId, [protectedProcessPool = makeRef(m_processPool), token = throttler().backgroundActivityToken(), completionHandler = WTFMove(completionHandler)]() mutable {
+        completionHandler();
+    });
+    ASSERT_UNUSED(addResult, addResult.isNewEntry);
+    send(Messages::NetworkProcess::SetShouldCapLifetimeForClientSideCookies(sessionID, shouldCapLifetime == ShouldCapLifetimeForClientSideCookies::Yes, callbackId), 0);
+}
+    
+void NetworkProcessProxy::didSetShouldCapLifetimeForClientSideCookies(uint64_t callbackId)
+{
+    m_updatePartitionOrBlockCookiesCallbackMap.take(callbackId)();
+}
+
 static uint64_t nextRequestStorageAccessContextId()
 {

branches/safari-606-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h

@@ -80 +80 @@
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     void updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst, CompletionHandler<void()>&&);
+    void setShouldCapLifetimeForClientSideCookies(PAL::SessionID, ShouldCapLifetimeForClientSideCookies, CompletionHandler<void()>&&);
     void hasStorageAccessForFrame(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& callback);
     void getAllStorageAccessEntries(PAL::SessionID, CompletionHandler<void(Vector<String>&& domains)>&&);
@@ -149 +150 @@
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     void didUpdatePartitionOrBlockCookies(uint64_t callbackId);
+    void didSetShouldCapLifetimeForClientSideCookies(uint64_t contextId);
     void storageAccessRequestResult(bool wasGranted, uint64_t contextId);
     void allStorageAccessEntriesResult(Vector<String>&& domains, uint64_t contextId);

branches/safari-606-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in

@@ -49 +49 @@
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     DidUpdatePartitionOrBlockCookies(uint64_t callbackId)
+    DidSetShouldCapLifetimeForClientSideCookies(uint64_t callbackId)
     StorageAccessRequestResult(bool wasGranted, uint64_t contextId)
     AllStorageAccessEntriesResult(Vector<String> domains, uint64_t contextId)

branches/safari-606-branch/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -531 +531 @@
         m_didNetworkProcessCrash = false;
         reinstateNetworkProcessAssertionState(*m_networkProcess);
-        if (m_websiteDataStore)
-            m_websiteDataStore->websiteDataStore().networkProcessDidCrash();
     }
 
@@ -539 +537 @@
         withWebsiteDataStore->clearPendingCookies();
     }
+
+    if (m_websiteDataStore)
+        m_websiteDataStore->websiteDataStore().didCreateNetworkProcess();
 
     return *m_networkProcess;

branches/safari-606-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -39 +39 @@
 #include "WebsiteDataStore.h"
 #include <WebCore/ResourceLoadStatistics.h>
+#include <wtf/CallbackAggregator.h>
 #include <wtf/CrossThreadCopier.h>
 #include <wtf/NeverDestroyed.h>
@@ -318 +319 @@
 }
 
+void WebResourceLoadStatisticsStore::didCreateNetworkProcess()
+{
+    ASSERT(RunLoop::isMain());
+
+    postTask([this] {
+        if (!m_memoryStore)
+            return;
+        m_memoryStore->updateCookiePartitioning([]() { });
+    });
+
+#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+    if (m_websiteDataStore)
+        m_websiteDataStore->setShouldCapLifetimeForClientSideCookies(ShouldCapLifetimeForClientSideCookies::Yes, []() { });
+#endif
+}
+
 void WebResourceLoadStatisticsStore::removeAllStorageAccess()
 {

branches/safari-606-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h

@@ -141 +141 @@
     void callHasStorageAccessForFrameHandler(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
 
+     void didCreateNetworkProcess();
+
 private:
     explicit WebResourceLoadStatisticsStore(WebsiteDataStore&);
@@ -170 +172 @@
 
     WTF::Function<void(const String&)> m_statisticsTestingCallback;
+
+    bool m_firstNetworkProcessCreated { false };
 };
 

branches/safari-606-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1245 +1245 @@
 }
 
+void WebsiteDataStore::setShouldCapLifetimeForClientSideCookies(ShouldCapLifetimeForClientSideCookies shouldCapLifetime, CompletionHandler<void()>&& completionHandler)
+{
+    auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
+
+    for (auto& processPool : processPools()) {
+        if (auto* process = processPool->networkProcess())
+            process->setShouldCapLifetimeForClientSideCookies(m_sessionID, shouldCapLifetime, [processPool, callbackAggregator = callbackAggregator.copyRef()] { });
+    }
+}
+
 void WebsiteDataStore::hasStorageAccessForFrameHandler(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool hasAccess)>&& completionHandler)
 {
@@ -1325 +1335 @@
 }
 #endif
-
-void WebsiteDataStore::networkProcessDidCrash()
-{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
-    if (m_resourceLoadStatistics)
-        m_resourceLoadStatistics->scheduleCookiePartitioningStateReset();
-#endif
-}
 
 void WebsiteDataStore::webPageWasAdded(WebPageProxy& webPageProxy)
@@ -1624 +1626 @@
 #endif
 
-}
+void WebsiteDataStore::didCreateNetworkProcess()
+{
+#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+    if (m_resourceLoadStatistics)
+        m_resourceLoadStatistics->didCreateNetworkProcess();
+#endif
+}
+
+}

branches/safari-606-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73 +73 @@
 
 enum class ShouldClearFirst { No, Yes };
+enum class ShouldCapLifetimeForClientSideCookies { No, Yes };
 
 class WebsiteDataStore : public RefCounted<WebsiteDataStore>, public WebProcessLifetimeObserver, public Identified<WebsiteDataStore>, public CanMakeWeakPtr<WebsiteDataStore>  {
@@ -132 +133 @@
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     void updatePrevalentDomainsToPartitionOrBlockCookies(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst, CompletionHandler<void()>&&);
+    void setShouldCapLifetimeForClientSideCookies(ShouldCapLifetimeForClientSideCookies, CompletionHandler<void()>&&);
     void hasStorageAccessForFrameHandler(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool hasAccess)>&&);
     void getAllStorageAccessEntries(uint64_t pageID, CompletionHandler<void(Vector<String>&& domains)>&&);
@@ -141 +143 @@
     void grantStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool userWasPrompted, CompletionHandler<void(bool)>&&);
 #endif
-    void networkProcessDidCrash();
     void resolveDirectoriesIfNecessary();
     const String& resolvedApplicationCacheDirectory() const { return m_resolvedConfiguration.applicationCacheDirectory; }
@@ -185 +186 @@
 #endif
 
+    void didCreateNetworkProcess();
+
 private:
     explicit WebsiteDataStore(PAL::SessionID);