Changeset 252549 in webkit

Timestamp:

Nov 18, 2019, 10:15:44 AM (6 years ago)

Author:

Kocsen Chung

Message:

Apply patch. rdar://problem/57283187

Location:

branches/safari-608.4.9.0-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/resourceLoadStatistics/no-third-party-cookie-blocking-when-itp-is-off-expected.txt (added)
• LayoutTests/http/tests/resourceLoadStatistics/no-third-party-cookie-blocking-when-itp-is-off.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/NetworkStorageSession.cpp (modified) (3 diffs)
• Source/WebCore/platform/network/NetworkStorageSession.h (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkSession.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.h (modified) (1 diff)
• Tools/WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)

branches/safari-608.4.9.0-branch/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-18  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/57283187
+
+    2019-11-18  John Wilander  <wilander@apple.com>
+
+            Check if ITP is on before applying third-party cookie blocking
+            https://bugs.webkit.org/show_bug.cgi?id=204109
+            <rdar://problem/57120772>
+
+            Reviewed by Chris Dumez and Alexey Proskuryakov.
+
+            * http/tests/resourceLoadStatistics/no-third-party-cookie-blocking-when-itp-is-off-expected.txt: Added.
+            * http/tests/resourceLoadStatistics/no-third-party-cookie-blocking-when-itp-is-off.html: Added.
+
 2019-11-04  Alan Coon  <alancoon@apple.com>
 

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

@@ +1 @@
+2019-11-18  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/57283187
+
+    2019-11-18  John Wilander  <wilander@apple.com>
+
+            Check if ITP is on before applying third-party cookie blocking
+            https://bugs.webkit.org/show_bug.cgi?id=204109
+            <rdar://problem/57120772>
+
+            Reviewed by Chris Dumez and Alexey Proskuryakov.
+
+            This change makes sure WebCore::NetworkStorageSession knows
+            whether ITP is on or off and checks that first thing in
+            WebCore::NetworkStorageSession::shouldBlockCookies().
+
+            This check was never needed before since if ITP was off,
+            there would be no classified domains and thus the function
+            would always return false. However,
+            https://trac.webkit.org/changeset/251353/webkit introduced
+            full third-party cookie blocking for websites without user
+            interaction and that rule is checked before checking domain
+            classification. The effect was unconditional third-party
+            cookie blocking if ITP is off. This changes fixes that bug.
+
+            Note that this patch is branch-specific and expected to not
+            apply to trunk.
+
+            Test: http/tests/resourceLoadStatistics/no-third-party-cookie-blocking-when-itp-is-off.html
+
+            * platform/network/NetworkStorageSession.cpp:
+            (WebCore::NetworkStorageSession::shouldBlockThirdPartyCookies const):
+            (WebCore::NetworkStorageSession::shouldBlockCookies const):
+                Now checks whether ITP is on or off.
+            * platform/network/NetworkStorageSession.h:
+            (WebCore::NetworkStorageSession::setResourceLoadStatisticsEnabled):
+
 2019-11-10  Kocsen Chung  <kocsen_chung@apple.com>
 

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

@@ -61 +61 @@
 bool NetworkStorageSession::shouldBlockThirdPartyCookies(const RegistrableDomain& registrableDomain) const
 {
+    if (!m_isResourceLoadStatisticsEnabled || registrableDomain.isEmpty())
+        return false;
+
+    return m_registrableDomainsToBlockCookieFor.contains(registrableDomain);
+}
+
+bool NetworkStorageSession::hasHadUserInteractionAsFirstParty(const RegistrableDomain& registrableDomain) const
+{
     if (registrableDomain.isEmpty())
         return false;
 
-    return m_registrableDomainsToBlockCookieFor.contains(registrableDomain);
-}
-
-bool NetworkStorageSession::hasHadUserInteractionAsFirstParty(const RegistrableDomain& registrableDomain) const
-{
-    if (registrableDomain.isEmpty())
-        return false;
-
     return m_registrableDomainsWithUserInteractionAsFirstParty.contains(registrableDomain);
 }
@@ -77 +77 @@
 bool NetworkStorageSession::shouldBlockCookies(const ResourceRequest& request, Optional<uint64_t> frameID, Optional<PageIdentifier> pageID) const
 {
+    if (!m_isResourceLoadStatisticsEnabled)
+        return false;
+
     return shouldBlockCookies(request.firstPartyForCookies(), request.url(), frameID, pageID);
 }
@@ -82 +85 @@
 bool NetworkStorageSession::shouldBlockCookies(const URL& firstPartyForCookies, const URL& resource, Optional<uint64_t> frameID, Optional<PageIdentifier> pageID) const
 {
+    if (!m_isResourceLoadStatisticsEnabled)
+        return false;
+
     RegistrableDomain firstPartyDomain { firstPartyForCookies };
     if (firstPartyDomain.isEmpty())

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

@@ -166 +166 @@
     WEBCORE_EXPORT void resetCrossSiteLoadsWithLinkDecorationForTesting();
     void setIsThirdPartyCookieBlockingOnSitesWithoutUserInteractionEnabled(bool enabled) { m_isThirdPartyCookieBlockingOnSitesWithoutUserInteractionEnabled = enabled; }
+    void setResourceLoadStatisticsEnabled(bool enabled) { m_isResourceLoadStatisticsEnabled = enabled; }
 #endif
 
@@ -200 +201 @@
     bool m_navigationWithLinkDecorationTestMode = false;
     bool m_isThirdPartyCookieBlockingOnSitesWithoutUserInteractionEnabled = true;
+    bool m_isResourceLoadStatisticsEnabled = false;
 #endif
 

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

@@ +1 @@
+2019-11-18  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/57283187
+
+    2019-11-18  John Wilander  <wilander@apple.com>
+
+            Check if ITP is on before applying third-party cookie blocking
+            https://bugs.webkit.org/show_bug.cgi?id=204109
+            <rdar://problem/57120772>
+
+            Reviewed by Chris Dumez and Alexey Proskuryakov.
+
+            This change makes sure WebCore::NetworkStorageSession knows
+            whether ITP is on or off and checks that first thing in
+            WebCore::NetworkStorageSession::shouldBlockCookies().
+
+            This check was never needed before since if ITP was off,
+            there would be no classified domains and thus the function
+            would always return false. However,
+            https://trac.webkit.org/changeset/251353/webkit introduced
+            full third-party cookie blocking for websites without user
+            interaction and that rule is checked before checking domain
+            classification. The effect was unconditional third-party
+            cookie blocking if ITP is off. This changes fixes that bug.
+
+            Note that this patch is branch-specific and expected to not
+            apply to trunk.
+
+            * NetworkProcess/NetworkSession.cpp:
+            (WebKit::NetworkSession::setResourceLoadStatisticsEnabled):
+                Now tells WebCore::NetworkStorageSession the status of
+                ITP.
+
 2019-11-12  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.4.9.0-branch/Source/WebKit/NetworkProcess/NetworkSession.cpp

@@ -131 +131 @@
 {
     ASSERT(!m_isInvalidated);
+    if (auto* storageSession = networkStorageSession())
+        storageSession->setResourceLoadStatisticsEnabled(enable);
     if (!enable) {
         destroyResourceLoadStatistics();

branches/safari-608.4.9.0-branch/Tools/ChangeLog

@@ +1 @@
+2019-11-18  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/57283187
+
+    2019-11-18  John Wilander  <wilander@apple.com>
+
+            Check if ITP is on before applying third-party cookie blocking
+            https://bugs.webkit.org/show_bug.cgi?id=204109
+            <rdar://problem/57120772>
+
+            Reviewed by Chris Dumez and Alexey Proskuryakov.
+
+            This is test infrastructure to allow a layout test to
+            disable ITP in the network process.
+
+            * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+            * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+            (WTR::TestRunner::setStatisticsEnabled):
+            (WTR::TestRunner::setStatisticsDebugMode):
+            * WebKitTestRunner/InjectedBundle/TestRunner.h:
+            * WebKitTestRunner/TestController.cpp:
+            (WTR::TestController::setStatisticsEnabled):
+            * WebKitTestRunner/TestController.h:
+            * WebKitTestRunner/TestInvocation.cpp:
+            (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+
 2019-11-11  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.4.9.0-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

@@ -293 +293 @@
 
     // Resource Load Statistics
+    void setStatisticsEnabled(boolean value);
     void installStatisticsDidModifyDataRecordsCallback(object callback);
     void installStatisticsDidScanDataRecordsCallback(object callback);

branches/safari-608.4.9.0-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -1378 +1378 @@
 }
 
+void TestRunner::setStatisticsEnabled(bool value)
+{
+    WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("SetStatisticsEnabled"));
+    WKRetainPtr<WKBooleanRef> messageBody = adoptWK(WKBooleanCreate(value));
+    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
+}
+
 void TestRunner::setStatisticsDebugMode(bool value, JSValueRef completionHandler)
 {
@@ -1385 +1392 @@
     WKRetainPtr<WKBooleanRef> messageBody = adoptWK(WKBooleanCreate(value));
     WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
-
 }
 

branches/safari-608.4.9.0-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

@@ -381 +381 @@
     
     // Resource Load Statistics
+    void setStatisticsEnabled(bool value);
     void installStatisticsDidModifyDataRecordsCallback(JSValueRef callback);
     void installStatisticsDidScanDataRecordsCallback(JSValueRef callback);

branches/safari-608.4.9.0-branch/Tools/WebKitTestRunner/TestController.cpp

@@ -3211 +3211 @@
 }
 
+void TestController::setStatisticsEnabled(bool value)
+{
+    auto* dataStore = WKContextGetWebsiteDataStore(platformContext());
+    WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(dataStore, value);
+}
+
 void TestController::setStatisticsDebugMode(bool value)
 {

branches/safari-608.4.9.0-branch/Tools/WebKitTestRunner/TestController.h

@@ -205 +205 @@
     void setShouldAllowDeviceOrientationAndMotionAccess(bool value) { m_shouldAllowDeviceOrientationAndMotionAccess = value; }
 
+    void setStatisticsEnabled(bool value);
     void setStatisticsDebugMode(bool value);
     void setStatisticsPrevalentResourceForDebugMode(WKStringRef hostName);

branches/safari-608.4.9.0-branch/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -1062 +1062 @@
     }
 
+    if (WKStringIsEqualToUTF8CString(messageName, "SetStatisticsEnabled")) {
+        ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
+        WKBooleanRef value = static_cast<WKBooleanRef>(messageBody);
+        TestController::singleton().setStatisticsEnabled(WKBooleanGetValue(value));
+        return nullptr;
+    }
+    
     if (WKStringIsEqualToUTF8CString(messageName, "SetStatisticsDebugMode")) {
         ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());