Attachment 373558 Details for Bug 193458 – Patch

[patch] Patch

bug-193458-20190705202356.patch (text/plain), 32.84 KB, created by Michael Catanzaro on 2019-07-05 18:23:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-07-05 18:23:57 PDT

Size: 32.84 KB

patch

obsolete

>Subversion Revision: 247188
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e56338d2132f1f805432999a94a52ecd03556722..a79a4d575bb62ed5a4797991071828cb7e562f15 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,56 @@
>+2019-07-05  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Resolve confusion between HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain and HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
>+        https://bugs.webkit.org/show_bug.cgi?id=193458
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Currently we have two different HTTPCookieAcceptPolicy enum values with almost identical
>+        names: HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain and
>+        HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain. A plain English meaning of these
>+        names would indicate that the policies are identical, but they are not.
>+        OnlyFromMainDocumentDomain seems like it means "no third-party cookies," but it actually
>+        means "no third-party cookies unless from a domain that has previously set cookies," e.g. a
>+        domain that has previously been visited in a first-party context. In contrast,
>+        ExclusivelyFromMainDocumentDomain actually really means no third-party cookies period. This
>+        is not good.
>+
>+        Except the above is only true for the Cocoa and Curl backends. For libsoup,
>+        OnlyFromMainDocumentDomain means no third-party cookies period, the same way
>+        ExclusivelyFomMainDocumentDomain works for the other ports, and
>+        ExclusivelyFromMainDocumentDomain is unimplemented. This patch fixes this inconsistency by
>+        swapping the soup backend's use of OnlyFromMainDocumentDomain in favor of
>+        ExclusivelyFromMainDocumentDomain, leaving OnlyFromMainDocumentDomain unimplemented instead.
>+
>+        Now, to properly resolve the confusion between these enum values, we also need to rename
>+        OnlyFromMainDocumentDomain to reflect what it actually does. Unfortunately, it is difficult
>+        to think of a meaningful short name, so this is a bit lengthy, but
>+        OnlyFromMainDocumentDomainAndGrandfatheredDomains is accurate and shorter than alternatives
>+        like OnlyFromMainDocumentDomainAndDomainsThatHaveSetCookiesBefore (ugh). In this case, I
>+        decided readability trumps brevity. It's more important for programmers to know what the
>+        policy actually does.
>+
>+        I also removed the curl backend's separate CookieAcceptPolicy enum, since it's identical to
>+        HTTPCookieAcceptPolicy and not doing anything. It's not part of any public API and can
>+        always be restored in the future if it would ever be useful, but it's not useful now.
>+
>+        Finally, note that I left two references to OnlyFromMainDocumentDomain unchanged in
>+        WebKitLegacy/win, because they appeared to be public API, in IWebPreferences.idl and in
>+        WebPreferencesKeysPrivate.h. These left me quite confused, though, because it doesn't
>+        appear that this API is actually implemented anywhere. At least, I don't see any actual
>+        preferences backing it. At any rate, I dare not change it.
>+
>+        * platform/network/cf/NetworkStorageSessionCFNetWin.cpp:
>+        (WebCore::NetworkStorageSession::cookiesEnabled const):
>+        * platform/network/cocoa/NetworkStorageSessionCocoa.mm:
>+        (WebCore::NetworkStorageSession::cookiesEnabled const):
>+        * platform/network/curl/CookieJarDB.cpp:
>+        (WebCore::CookieJarDB::isEnabled const):
>+        (WebCore::CookieJarDB::checkCookieAcceptPolicy):
>+        * platform/network/curl/CookieJarDB.h:
>+        (WebCore::CookieJarDB::setAcceptPolicy):
>+        (WebCore::CookieJarDB::acceptPolicy const):
>+
> 2019-07-05  Youenn Fablet  <youenn@apple.com> and Simon Fraser  <simon.fraser@apple.com>
> 
>         Trigger a compositing update when video element is changing
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 4406811f6eb73982a456175d5d571e74c336122d..70074da83dc9495d8e70bb09c279831fc7c95c63 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-05  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Resolve confusion between HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain and HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
>+        https://bugs.webkit.org/show_bug.cgi?id=193458
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/spi/cf/CFNetworkSPI.h:
>+
> 2019-07-05  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r247159.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9ce3be4b4fdd460e9403d80d1311644c4df2fa8a..234e1f3232051de9ecf83e645c045c0ed4599188 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,31 @@
>+2019-07-05  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Resolve confusion between HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain and HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
>+        https://bugs.webkit.org/show_bug.cgi?id=193458
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp:
>+        (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
>+        (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):
>+        * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
>+        (WebKit::toCFHTTPCookieStorageAcceptPolicy):
>+        (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):
>+        * NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp:
>+        (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
>+        (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):
>+        * Shared/HTTPCookieAcceptPolicy.h:
>+        * UIProcess/API/C/WKAPICast.h:
>+        (WebKit::toHTTPCookieAcceptPolicy):
>+        (WebKit::toAPI):
>+        * UIProcess/API/C/WKCookieManager.h:
>+        * UIProcess/API/Cocoa/WKProcessPool.mm:
>+        (toHTTPCookieAcceptPolicy):
>+        * UIProcess/API/glib/WebKitCookieManager.cpp:
>+        (toWebKitCookieAcceptPolicy):
>+        (toHTTPCookieAcceptPolicy):
>+        * UIProcess/WebProcessPool.h:
>+
> 2019-07-05  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Unreviewed, fix -Wswitch warning
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 0797db0aac26c902ca24c556dbbd6937a5827973..8e0a2a4e7050ccd33f6e4c2f682cc8db22137e47 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-07-05  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Resolve confusion between HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain and HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
>+        https://bugs.webkit.org/show_bug.cgi?id=193458
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebView/WebPreferences.mm:
>+        (-[WebPreferences _synchronizeWebStoragePolicyWithCookiePolicy]):
>+
> 2019-07-03  Sam Weinig  <weinig@apple.com>
> 
>         Adopt simple structured bindings in more places
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index e055425abab6f3b190fa44df476d721852caaa54..58f2046d43aa6102e365eb18d13eb8c6a39fb282 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -105,7 +105,7 @@ CF_ENUM(CFHTTPCookieStorageAcceptPolicy)
> {
>     CFHTTPCookieStorageAcceptPolicyAlways = 0,
>     CFHTTPCookieStorageAcceptPolicyNever = 1,
>-    CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain = 2,
>+    CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains = 2,
>     CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
> };
> 
>diff --git a/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp b/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp
>index 330aa60866140b24d9b7052383a81cecf90b99f6..5f57a2393fb4fa8d22134ed4da552748f5d32930 100644
>--- a/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp
>+++ b/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp
>@@ -261,7 +261,7 @@ std::pair<String, bool> NetworkStorageSession::cookieRequestHeaderFieldValue(con
> bool NetworkStorageSession::cookiesEnabled() const
> {
>     CFHTTPCookieStorageAcceptPolicy policy = CFHTTPCookieStorageGetCookieAcceptPolicy(cookieStorage().get());
>-    return policy == CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain || policy == CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain || policy == CFHTTPCookieStorageAcceptPolicyAlways;
>+    return policy == CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains || policy == CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain || policy == CFHTTPCookieStorageAcceptPolicyAlways;
> }
> 
> bool NetworkStorageSession::getRawCookies(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<uint64_t> frameID, Optional<PageIdentifier> pageID, Vector<Cookie>& rawCookies) const
>diff --git a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
>index 84b73b8344b0cab5a9048b485efb176d5d340581..96fdebbfc8682938b54f1d3256805b6f9560f5dc 100644
>--- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
>+++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
>@@ -437,7 +437,7 @@ bool NetworkStorageSession::cookiesEnabled() const
>     BEGIN_BLOCK_OBJC_EXCEPTIONS;
> 
>     NSHTTPCookieAcceptPolicy cookieAcceptPolicy = httpCookieAcceptPolicy(cookieStorage().get());
>-    return cookieAcceptPolicy == NSHTTPCookieAcceptPolicyAlways || cookieAcceptPolicy == NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain || cookieAcceptPolicy == NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
>+    return cookieAcceptPolicy == NSHTTPCookieAcceptPolicyAlways || cookieAcceptPolicy == NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains || cookieAcceptPolicy == NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
> 
>     END_BLOCK_OBJC_EXCEPTIONS;
>     return false;
>diff --git a/Source/WebCore/platform/network/curl/CookieJarDB.cpp b/Source/WebCore/platform/network/curl/CookieJarDB.cpp
>index a45a5f4e4a028fe6e7f2dfb75ec2c8aec93ed2bb..b847ad0dc5545af37c3cfc728769b3bdcd665281 100644
>--- a/Source/WebCore/platform/network/curl/CookieJarDB.cpp
>+++ b/Source/WebCore/platform/network/curl/CookieJarDB.cpp
>@@ -307,16 +307,16 @@ bool CookieJarDB::isEnabled() const
>     if (m_databasePath.isEmpty())
>         return false;
> 
>-    return (m_acceptPolicy == CookieAcceptPolicy::Always || m_acceptPolicy == CookieAcceptPolicy::OnlyFromMainDocumentDomain || m_acceptPolicy == CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain);
>+    return (m_acceptPolicy == CookieAcceptPolicy::Always || m_acceptPolicy == CookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains || m_acceptPolicy == CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain);
> }
> 
> bool CookieJarDB::checkCookieAcceptPolicy(const URL& firstParty, const URL& url)
> {
>-    if (m_acceptPolicy == CookieAcceptPolicy::Always)
>+    if (m_acceptPolicy == CookieAcceptPolicy::AlwaysAccept)
>         return true;
> 
>     // See https://bugs.webkit.org/show_bug.cgi?id=193458#c0
>-    if (m_acceptPolicy != CookieAcceptPolicy::OnlyFromMainDocumentDomain && m_acceptPolicy != CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain)
>+    if (m_acceptPolicy != CookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains && m_acceptPolicy != CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain)
>         return false;
> 
>     if (firstParty.host() == url.host())
>@@ -326,7 +326,7 @@ bool CookieJarDB::checkCookieAcceptPolicy(const URL& firstParty, const URL& url)
>         return true;
> 
>     // third-party resources can read or write cookies if they have pre-existing cookies.
>-    if (m_acceptPolicy == CookieAcceptPolicy::OnlyFromMainDocumentDomain && hasCookies(url))
>+    if (m_acceptPolicy == CookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains && hasCookies(url))
>         return true;
> 
>     return false;
>diff --git a/Source/WebCore/platform/network/curl/CookieJarDB.h b/Source/WebCore/platform/network/curl/CookieJarDB.h
>index 0c03e9d692c7f6dc613086ff255c20e5c6bbe9e9..8608adf08fd01b33af7417876c685eb4aaa58428 100644
>--- a/Source/WebCore/platform/network/curl/CookieJarDB.h
>+++ b/Source/WebCore/platform/network/curl/CookieJarDB.h
>@@ -25,6 +25,7 @@
> #pragma once
> 
> #include "Cookie.h"
>+#include "HTTPCookieAcceptPolicy.h"
> #include "SQLiteDatabase.h"
> #include "SQLiteStatement.h"
> #include <wtf/HashMap.h>
>@@ -33,13 +34,6 @@
> 
> namespace WebCore {
> 
>-enum class CookieAcceptPolicy {
>-    Always,
>-    Never,
>-    OnlyFromMainDocumentDomain,
>-    ExclusivelyFromMainDocumentDomain
>-};
>-
> class CookieJarDB {
>     WTF_MAKE_NONCOPYABLE(CookieJarDB);
> 
>@@ -52,8 +46,8 @@ public:
>     void open();
>     bool isEnabled() const;
> 
>-    void setAcceptPolicy(CookieAcceptPolicy policy) { m_acceptPolicy = policy; }
>-    CookieAcceptPolicy acceptPolicy() const { return m_acceptPolicy; }
>+    void setAcceptPolicy(HTTPCookieAcceptPolicy policy) { m_acceptPolicy = policy; }
>+    HTTPCookieAcceptPolicy acceptPolicy() const { return m_acceptPolicy; }
> 
>     Optional<Vector<Cookie>> searchCookies(const URL& firstParty, const URL& requestUrl, const Optional<bool>& httpOnly, const Optional<bool>& secure, const Optional<bool>& session);
>     bool setCookie(const URL& firstParty, const URL&, const String& cookie, Source);
>@@ -67,7 +61,7 @@ public:
>     WEBCORE_EXPORT ~CookieJarDB();
> 
> private:
>-    CookieAcceptPolicy m_acceptPolicy { CookieAcceptPolicy::Always };
>+    HTTPCookieAcceptPolicy m_acceptPolicy { HTTPCookieAcceptPolicy::AlwaysAccept };
>     String m_databasePath;
> 
>     bool m_detectedDatabaseCorruption { false };
>diff --git a/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp b/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>index 80f3b494b55396e8355c8ded48bf68fb9893c59a..957914ba7f38d61153b3acef74cb2a1e0e9ad180 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
>@@ -35,43 +35,15 @@ using namespace WebCore;
> 
> void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
> {
>-    CookieAcceptPolicy curlPolicy = CookieAcceptPolicy::OnlyFromMainDocumentDomain;
>-    switch (policy) {
>-    case HTTPCookieAcceptPolicy::AlwaysAccept:
>-        curlPolicy = CookieAcceptPolicy::Always;
>-        break;
>-    case HTTPCookieAcceptPolicy::Never:
>-        curlPolicy = CookieAcceptPolicy::Never;
>-        break;
>-    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>-        curlPolicy = CookieAcceptPolicy::OnlyFromMainDocumentDomain;
>-        break;
>-    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>-        curlPolicy = CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>-        break;
>-    }
>-
>-    m_process.forEachNetworkStorageSession([curlPolicy] (const auto& networkStorageSession) {
>-        networkStorageSession.cookieStorage().setCookieAcceptPolicy(networkStorageSession, curlPolicy);
>+    m_process.forEachNetworkStorageSession([policy] (const auto& networkStorageSession) {
>+        networkStorageSession.cookieStorage().setCookieAcceptPolicy(networkStorageSession, policy);
>     });
> }
> 
> HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
> {
>     const auto& networkStorageSession = m_process.defaultStorageSession();
>-    switch (networkStorageSession.cookieStorage().cookieAcceptPolicy(networkStorageSession)) {
>-    case CookieAcceptPolicy::Always:
>-        return HTTPCookieAcceptPolicy::AlwaysAccept;
>-    case CookieAcceptPolicy::Never:
>-        return HTTPCookieAcceptPolicy::Never;
>-    case CookieAcceptPolicy::OnlyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>-    case CookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>-    }
>-
>-    ASSERT_NOT_REACHED();
>-    return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+    return networkStorageSession.cookieStorage().cookieAcceptPolicy(networkStorageSession);
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm b/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>index ee46ae5dc746cf52dfc85b0236590cd84e6a7c23..4b0354fa29275d8a728a28439306f85408c06977 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>+++ b/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>@@ -42,8 +42,8 @@ static CFHTTPCookieStorageAcceptPolicy toCFHTTPCookieStorageAcceptPolicy(HTTPCoo
>         return CFHTTPCookieStorageAcceptPolicyAlways;
>     case HTTPCookieAcceptPolicy::Never:
>         return CFHTTPCookieStorageAcceptPolicyNever;
>-    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>-        return CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain;
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains:
>+        return CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains;
>     case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>         return CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain;
>     }
>@@ -71,8 +71,8 @@ HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
>     switch ([[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy]) {
>     case NSHTTPCookieAcceptPolicyAlways:
>         return HTTPCookieAcceptPolicy::AlwaysAccept;
>-    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains:
>+        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains;
>     case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>         return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     case NSHTTPCookieAcceptPolicyNever:
>diff --git a/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp b/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>index 28cab20894ad92034e32fe6fdb9f9e156af677aa..344e1f19017edd8edb7e94a1bf5584efb81ff6f7 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
>@@ -47,10 +47,10 @@ void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy
>     case HTTPCookieAcceptPolicy::Never:
>         soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NEVER;
>         break;
>-    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>         soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
>         break;
>-    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains:
>         ASSERT_NOT_REACHED();
>         break;
>     }
>@@ -68,11 +68,11 @@ HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
>     case SOUP_COOKIE_JAR_ACCEPT_NEVER:
>         return HTTPCookieAcceptPolicy::Never;
>     case SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY:
>-        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     }
> 
>     ASSERT_NOT_REACHED();
>-    return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+    return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains;
> }
> 
> void WebCookieManager::setCookiePersistentStorage(PAL::SessionID sessionID, const String& storagePath, SoupCookiePersistentStorageType storageType)
>diff --git a/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h b/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h
>index 457c2344c9c8986ff6e2323305a28433d86ea0eb..b43544dd6b9bf240d132af650e7072ba9263b6f4 100644
>--- a/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h
>+++ b/Source/WebKit/Shared/HTTPCookieAcceptPolicy.h
>@@ -30,7 +30,7 @@ namespace WebKit {
> enum class HTTPCookieAcceptPolicy : uint8_t {
>     AlwaysAccept = 0,
>     Never = 1,
>-    OnlyFromMainDocumentDomain = 2,
>+    OnlyFromMainDocumentDomainAndGrandfatheredDomains = 2,
>     ExclusivelyFromMainDocumentDomain = 3,
> };
> 
>@@ -43,7 +43,7 @@ template<> struct EnumTraits<WebKit::HTTPCookieAcceptPolicy> {
>         WebKit::HTTPCookieAcceptPolicy,
>         WebKit::HTTPCookieAcceptPolicy::AlwaysAccept,
>         WebKit::HTTPCookieAcceptPolicy::Never,
>-        WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain,
>+        WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains,
>         WebKit::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
>     >;
> };
>diff --git a/Source/WebKit/UIProcess/API/C/WKAPICast.h b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>index 5173755948dd415e27a5f73ea472fac8095beb19..7f8ce811d650fa50912ea4a89469023902b98a71 100644
>--- a/Source/WebKit/UIProcess/API/C/WKAPICast.h
>+++ b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>@@ -372,8 +372,8 @@ inline HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(WKHTTPCookieAcceptPolicy
>         return HTTPCookieAcceptPolicy::AlwaysAccept;
>     case kWKHTTPCookieAcceptPolicyNever:
>         return HTTPCookieAcceptPolicy::Never;
>-    case kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>-        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+    case kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains:
>+        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains;
>     case kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>         return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     }
>@@ -389,8 +389,8 @@ inline WKHTTPCookieAcceptPolicy toAPI(HTTPCookieAcceptPolicy policy)
>         return kWKHTTPCookieAcceptPolicyAlways;
>     case HTTPCookieAcceptPolicy::Never:
>         return kWKHTTPCookieAcceptPolicyNever;
>-    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>-        return kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains:
>+        return kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains;
>     case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>         return kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain;
>     }
>diff --git a/Source/WebKit/UIProcess/API/C/WKCookieManager.h b/Source/WebKit/UIProcess/API/C/WKCookieManager.h
>index 73354d2cba4edf97b9a57920cd45bc774252baa5..958432897afacda6683fc9a25202ea98e04a50e3 100644
>--- a/Source/WebKit/UIProcess/API/C/WKCookieManager.h
>+++ b/Source/WebKit/UIProcess/API/C/WKCookieManager.h
>@@ -35,7 +35,7 @@ extern "C" {
> enum {
>     kWKHTTPCookieAcceptPolicyAlways = 0,
>     kWKHTTPCookieAcceptPolicyNever = 1,
>-    kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain = 2,
>+    kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains = 2,
>     kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3
> };
> typedef uint32_t WKHTTPCookieAcceptPolicy;
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>index c06e1afb33ffa318b7e29dfdc4f067957a838bf2..b4094fff332119dca9300e526cd6227623187010 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>@@ -210,8 +210,8 @@ static WebKit::HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(NSHTTPCookieAccep
>         return WebKit::HTTPCookieAcceptPolicy::AlwaysAccept;
>     case NSHTTPCookieAcceptPolicyNever:
>         return WebKit::HTTPCookieAcceptPolicy::Never;
>-    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>-        return WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains:
>+        return WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomainAndGrandfatheredDomains;
>     case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>         return WebKit::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     }
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>index 8327ae93084f9d1e7260cfdcf15b5bcf1c1799a0..093b2d7ba087fe41a02cf8c9fbcf2132792322a8 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
>@@ -94,7 +94,7 @@ static inline WebKitCookieAcceptPolicy toWebKitCookieAcceptPolicy(HTTPCookieAcce
>         return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
>     case HTTPCookieAcceptPolicy::Never:
>         return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
>-    case HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain:
>+    case HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain:
>         return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
>     default:
>         ASSERT_NOT_REACHED();
>@@ -110,7 +110,7 @@ static inline HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(WebKitCookieAccept
>     case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
>         return HTTPCookieAcceptPolicy::Never;
>     case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
>-        return HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain;
>+        return HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain;
>     default:
>         ASSERT_NOT_REACHED();
>         return HTTPCookieAcceptPolicy::AlwaysAccept;
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 9969112d69b3c38c42c9f7a60a93a2cccd10e453..c96e720776f20f3b48e3f5b44d41586e5546dbb1 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -682,7 +682,7 @@ private:
>     WebContextSupplementMap m_supplements;
> 
> #if USE(SOUP)
>-    HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain };
>+    HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain };
>     WebCore::SoupNetworkProxySettings m_networkProxySettings;
> #endif
>     HashSet<String, ASCIICaseInsensitiveHash> m_urlSchemesRegisteredForCustomProtocols;
>diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferences.mm b/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
>index ec9132769148fa7008b1c49b2718ccd26244b08d..a65c2de3564c4ba6746f5a206efd893101b08d4b 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
>@@ -2603,7 +2603,7 @@ - (void)_synchronizeWebStoragePolicyWithCookiePolicy
>     case NSHTTPCookieAcceptPolicyAlways:
>         storageBlockingPolicy = WebAllowAllStorage;
>         break;
>-    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
>+    case NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains:
>     case NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain:
>         storageBlockingPolicy = WebBlockThirdPartyStorage;
>         break;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7e06dc2841be8d9c8bb22479faa28e92a35b9a2f..a82f629d1406cec5e8aae416a7f3a401056884d7 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-07-05  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Resolve confusion between HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain and HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain
>+        https://bugs.webkit.org/show_bug.cgi?id=193458
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/mac/DumpRenderTree.mm:
>+        (resetWebPreferencesToConsistentValues):
>+        * DumpRenderTree/mac/TestRunnerMac.mm:
>+        (TestRunner::setAlwaysAcceptCookies):
>+        (TestRunner::setOnlyAcceptFirstPartyCookies):
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
>+        * WebKitTestRunner/TestInvocation.cpp:
>+        (WTR::TestInvocation::invoke):
>+
> 2019-07-05  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         [iOS] Crash in WebKit::WebPage::positionInformation via Range::startPosition
>diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>index 6660c32d9215a2c73717d9c336fbb780126eff5e..80ae97aa0ef82d6ec01c5282184685040593f383 100644
>--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>@@ -1000,7 +1000,7 @@ static void resetWebPreferencesToConsistentValues()
>     preferences.selectionAcrossShadowBoundariesEnabled = YES;
> 
>     [WebPreferences _clearNetworkLoaderSession];
>-    [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
>+    [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains];
> }
> 
> static void setWebPreferencesForTestOptions(const TestOptions& options)
>diff --git a/Tools/DumpRenderTree/mac/TestRunnerMac.mm b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>index c01bda566e51bfaa6f079b112945f9562efc1615..e5f637fed9f0177c395c2c592d891fcca913dd7e 100644
>--- a/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>+++ b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>@@ -398,7 +398,7 @@ void TestRunner::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
>         return;
> 
>     m_alwaysAcceptCookies = alwaysAcceptCookies;
>-    NSHTTPCookieAcceptPolicy cookieAcceptPolicy = alwaysAcceptCookies ? NSHTTPCookieAcceptPolicyAlways : NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+    NSHTTPCookieAcceptPolicy cookieAcceptPolicy = alwaysAcceptCookies ? NSHTTPCookieAcceptPolicyAlways : NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains;
>     [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:cookieAcceptPolicy];
> }
> 
>@@ -407,7 +407,7 @@ void TestRunner::setOnlyAcceptFirstPartyCookies(bool onlyAcceptFirstPartyCookies
>     if (onlyAcceptFirstPartyCookies)
>         m_alwaysAcceptCookies = NO;
> 
>-    NSHTTPCookieAcceptPolicy cookieAcceptPolicy = onlyAcceptFirstPartyCookies ? static_cast<NSHTTPCookieAcceptPolicy>(NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain) : NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+    NSHTTPCookieAcceptPolicy cookieAcceptPolicy = onlyAcceptFirstPartyCookies ? static_cast<NSHTTPCookieAcceptPolicy>(NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain) : NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains;
>     [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:cookieAcceptPolicy];
> }
> 
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index bfac192334c362e1774a7bedf7727c63c166280b..1e20412f039aced0534f3cd3c82989dc4b72f9d1 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -2092,13 +2092,13 @@ void TestController::didReceiveSynchronousMessageFromInjectedBundle(WKStringRef
> 
>     if (WKStringIsEqualToUTF8CString(messageName, "SetAlwaysAcceptCookies")) {
>         WKBooleanRef accept = static_cast<WKBooleanRef>(messageBody);
>-        WKHTTPCookieAcceptPolicy policy = WKBooleanGetValue(accept) ? kWKHTTPCookieAcceptPolicyAlways : kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+        WKHTTPCookieAcceptPolicy policy = WKBooleanGetValue(accept) ? kWKHTTPCookieAcceptPolicyAlways : kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains;
>         return setHTTPCookieAcceptPolicy(policy, WTFMove(completionHandler));
>     }
> 
>     if (WKStringIsEqualToUTF8CString(messageName, "SetOnlyAcceptFirstPartyCookies")) {
>         WKBooleanRef accept = static_cast<WKBooleanRef>(messageBody);
>-        WKHTTPCookieAcceptPolicy policy = WKBooleanGetValue(accept) ? kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain : kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
>+        WKHTTPCookieAcceptPolicy policy = WKBooleanGetValue(accept) ? kWKHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain : kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains;
>         return setHTTPCookieAcceptPolicy(policy, WTFMove(completionHandler));
>     }
> 
>diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp
>index c4d77b8593a0cc7a6cadd9b26fe10c26f966740e..c248b6138ee45ad7583e8c2057c8072f3d34c6da 100644
>--- a/Tools/WebKitTestRunner/TestInvocation.cpp
>+++ b/Tools/WebKitTestRunner/TestInvocation.cpp
>@@ -164,7 +164,7 @@ void TestInvocation::invoke()
> 
>     TestController::singleton().setShouldLogHistoryClientCallbacks(shouldLogHistoryClientCallbacks());
> 
>-    WKCookieManagerSetHTTPCookieAcceptPolicy(WKContextGetCookieManager(TestController::singleton().context()), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain, nullptr, nullptr);
>+    WKCookieManagerSetHTTPCookieAcceptPolicy(WKContextGetCookieManager(TestController::singleton().context()), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomainAndGrandfatheredDomains, nullptr, nullptr);
> 
>     // FIXME: We should clear out visited links here.
>

Flags:

mcatanzaro: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 193458: 373558