Title: [265048] trunk
Revision
265048
Author
[email protected]
Date
2020-07-29 11:30:14 -0700 (Wed, 29 Jul 2020)

Log Message

http/tests/cookies/document-cookie-multiple-cookies.html is failing on Windows
https://bugs.webkit.org/show_bug.cgi?id=214880

Reviewed by Darin Adler.

Source/WebCore:

Fix same bug as in r264943 but on Windows.

No new tests, covered by http/tests/cookies/document-cookie-multiple-cookies.html.

* platform/network/cf/NetworkStorageSessionCFNetWin.cpp:
(WebCore::parseDOMCookie):
(WebCore::NetworkStorageSession::setCookiesFromDOM const):

LayoutTests:

Unskip test that is no longer failing on Windows.

* platform/win/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (265047 => 265048)


--- trunk/LayoutTests/ChangeLog	2020-07-29 18:11:14 UTC (rev 265047)
+++ trunk/LayoutTests/ChangeLog	2020-07-29 18:30:14 UTC (rev 265048)
@@ -1,3 +1,14 @@
+2020-07-29  Chris Dumez  <[email protected]>
+
+        http/tests/cookies/document-cookie-multiple-cookies.html is failing on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=214880
+
+        Reviewed by Darin Adler.
+
+        Unskip test that is no longer failing on Windows.
+
+        * platform/win/TestExpectations:
+
 2020-07-29  Youenn Fablet  <[email protected]>
 
         scaleResolutionDownBy has no effect on RTCRtpSender

Modified: trunk/LayoutTests/platform/win/TestExpectations (265047 => 265048)


--- trunk/LayoutTests/platform/win/TestExpectations	2020-07-29 18:11:14 UTC (rev 265047)
+++ trunk/LayoutTests/platform/win/TestExpectations	2020-07-29 18:30:14 UTC (rev 265048)
@@ -782,9 +782,6 @@
 # <rdar://5723121>
 http/tests/xmlhttprequest/cookies.html [ Skip ]
 
-#Failing on Windows
-webkit.org/b/214880 http/tests/cookies/document-cookie-multiple-cookies.html [ Pass Failure ]
-
 # <rdar://5723191>
 http/tests/navigation/_javascript_link-frames.html [ Skip ]
 

Modified: trunk/Source/WebCore/ChangeLog (265047 => 265048)


--- trunk/Source/WebCore/ChangeLog	2020-07-29 18:11:14 UTC (rev 265047)
+++ trunk/Source/WebCore/ChangeLog	2020-07-29 18:30:14 UTC (rev 265048)
@@ -1,3 +1,18 @@
+2020-07-29  Chris Dumez  <[email protected]>
+
+        http/tests/cookies/document-cookie-multiple-cookies.html is failing on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=214880
+
+        Reviewed by Darin Adler.
+
+        Fix same bug as in r264943 but on Windows.
+
+        No new tests, covered by http/tests/cookies/document-cookie-multiple-cookies.html.
+
+        * platform/network/cf/NetworkStorageSessionCFNetWin.cpp:
+        (WebCore::parseDOMCookie):
+        (WebCore::NetworkStorageSession::setCookiesFromDOM const):
+
 2020-07-29  Youenn Fablet  <[email protected]>
 
         scaleResolutionDownBy has no effect on RTCRtpSender

Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp (265047 => 265048)


--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp	2020-07-29 18:11:14 UTC (rev 265047)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp	2020-07-29 18:30:14 UTC (rev 265048)
@@ -188,40 +188,55 @@
     return adoptCF(CFHTTPCookieStorageCopyCookiesForURL(session.cookieStorage().get(), url.createCFURL().get(), secure));
 }
 
-static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
+static RetainPtr<CFHTTPCookieRef> parseDOMCookie(String cookieString, CFURLRef url)
 {
-    CFArrayRef parsedCookies = CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-    if (!parsedCookies)
-        parsedCookies = CFArrayCreate(kCFAllocatorDefault, 0, 0, &kCFTypeArrayCallBacks);
-    
-    return parsedCookies;
-}
+    // <rdar://problem/5632883> CFHTTPCookieStorage stores an empty cookie, which would be sent as "Cookie: =".
+    if (cookieString.isEmpty())
+        return nullptr;
 
-void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier> frameID, Optional<PageIdentifier> pageID, ShouldAskITP, const String& value, ShouldRelaxThirdPartyCookieBlocking) const
-{
-    UNUSED_PARAM(frameID);
-    UNUSED_PARAM(pageID);
-    // <rdar://problem/5632883> CFHTTPCookieStorage stores an empty cookie, which would be sent as "Cookie: =".
-    if (value.isEmpty())
-        return;
-    
-    RetainPtr<CFURLRef> urlCF = url.createCFURL();
-    RetainPtr<CFURLRef> firstPartyForCookiesCF = firstParty.createCFURL();
-    
     // <http://bugs.webkit.org/show_bug.cgi?id=6531>, <rdar://4409034>
     // cookiesWithResponseHeaderFields doesn't parse cookies without a value
-    String cookieString = value.contains('=') ? value : value + "=";
-    
-    RetainPtr<CFStringRef> cookieStringCF = cookieString.createCFString();
+    cookieString = cookieString.contains('=') ? cookieString : cookieString + "=";
+
+    auto cookieStringCF = cookieString.createCFString();
     auto cookieStringCFPtr = cookieStringCF.get();
-    RetainPtr<CFDictionaryRef> headerFieldsCF = adoptCF(CFDictionaryCreate(kCFAllocatorDefault,
+    auto headerFieldsCF = adoptCF(CFDictionaryCreate(kCFAllocatorDefault,
         (const void**)&s_setCookieKeyCF, (const void**)&cookieStringCFPtr, 1,
         &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
-    
-    RetainPtr<CFArrayRef> unfilteredCookies = adoptCF(createCookies(headerFieldsCF.get(), urlCF.get()));
-    CFHTTPCookieStorageSetCookies(cookieStorage().get(), filterCookies(unfilteredCookies.get()).get(), urlCF.get(), firstPartyForCookiesCF.get());
+    // FIXME: _CFHTTPCookieCreateWithStringAndPartition() is currently unavailable on Windows (rdar://problem/66248550).
+    auto parsedCookies = adoptCF(CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFieldsCF.get(), url));
+    if (!parsedCookies || !CFArrayGetCount(parsedCookies.get()))
+        return nullptr;
+
+    auto cookie = checked_cf_cast<CFHTTPCookieRef>(CFArrayGetValueAtIndex(parsedCookies.get(), 0));
+
+    // <rdar://problem/5632883> CFHTTPCookieStorage would store an empty cookie,
+    // which would be sent as "Cookie: =". We have a workaround in setCookies() to prevent
+    // that, but we also need to avoid sending cookies that were previously stored, and
+    // there's no harm to doing this check because such a cookie is never valid.
+    if (!CFStringGetLength(cookieName(cookie).get()))
+        return nullptr;
+
+    if (CFHTTPCookieIsHTTPOnly(cookie))
+        return nullptr;
+
+    return cookie;
 }
 
+void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier>, Optional<PageIdentifier>, ShouldAskITP, const String& cookieString, ShouldRelaxThirdPartyCookieBlocking) const
+{
+    auto urlCF = url.createCFURL();
+    auto cookie = parseDOMCookie(cookieString, urlCF.get());
+    if (!cookie)
+        return;
+
+    auto firstPartyForCookiesCF = firstParty.createCFURL();
+
+    CFTypeRef cookies[] = { cookie.get() };
+    RetainPtr<CFArrayRef> cookieArray = adoptCF(CFArrayCreate(kCFAllocatorDefault, cookies, 1, &kCFTypeArrayCallBacks));
+    CFHTTPCookieStorageSetCookies(cookieStorage().get(), cookieArray.get(), urlCF.get(), firstPartyForCookiesCF.get());
+}
+
 static bool containsSecureCookies(CFArrayRef cookies)
 {
     CFIndex cookieCount = CFArrayGetCount(cookies);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to