Changeset 216292 in webkit

Timestamp:

May 5, 2017 4:45:05 PM (7 years ago)

Author:

BJ Burg

Message:

[Cocoa] Converting from WebCore::Cookie to NSHTTPCookie always marks cookies as session cookies
​https://bugs.webkit.org/show_bug.cgi?id=171748
<rdar://problem/32027327>

Reviewed by Michael Catanzaro.

Source/WebCore:

The function that we use to convert from WebCore::Cookie to NSHTTPCookie was
also misusing the NSHTTPCookieDiscard property. If any value is provided for
this key, even @NO, CFNetwork interprets that to mean that the cookie has the
"session" flag.

This is known to affect cookies set via WebCookieManager, WKHTTPCookieStore,
and WebAutomationSession.

This is covered by existing test WebKit2.WKHTTPCookieStore.

• platform/network/cocoa/CookieCocoa.mm:

(WebCore::Cookie::operator NSHTTPCookie *):
Don't include the property if the cookie is not a session cookie.

Tools:

Remove temporary workaround now that the assertion failure is fixed.

• TestWebKitAPI/Tests/WebKit2Cocoa/WKHTTPCookieStore.mm:

(TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/cocoa/CookieCocoa.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKHTTPCookieStore.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-05  Brian Burg  <bburg@apple.com>
+
+        [Cocoa] Converting from WebCore::Cookie to NSHTTPCookie always marks cookies as session cookies
+        https://bugs.webkit.org/show_bug.cgi?id=171748
+        <rdar://problem/32027327>
+
+        Reviewed by Michael Catanzaro.
+
+        The function that we use to convert from WebCore::Cookie to NSHTTPCookie was
+        also misusing the NSHTTPCookieDiscard property. If any value is provided for
+        this key, even @NO, CFNetwork interprets that to mean that the cookie has the
+        "session" flag.
+
+        This is known to affect cookies set via WebCookieManager, WKHTTPCookieStore,
+        and WebAutomationSession.
+
+        This is covered by existing test WebKit2.WKHTTPCookieStore.
+
+        * platform/network/cocoa/CookieCocoa.mm:
+        (WebCore::Cookie::operator NSHTTPCookie *):
+        Don't include the property if the cookie is not a session cookie.
+
 2017-05-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm

@@ -99 +99 @@
         [properties setObject:@YES forKey:NSHTTPCookieSecure];
 
-    [properties setObject:(session ? @"TRUE" : @"FALSE") forKey:NSHTTPCookieDiscard];
+    if (session)
+        [properties setObject:@YES forKey:NSHTTPCookieDiscard];
+
     [properties setObject:@"1" forKey:NSHTTPCookieVersion];
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-05-05  Brian Burg  <bburg@apple.com>
+
+        [Cocoa] Converting from WebCore::Cookie to NSHTTPCookie always marks cookies as session cookies
+        https://bugs.webkit.org/show_bug.cgi?id=171748
+        <rdar://problem/32027327>
+
+        Reviewed by Michael Catanzaro.
+
+        Remove temporary workaround now that the assertion failure is fixed.
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WKHTTPCookieStore.mm:
+        (TEST):
+
 2017-05-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKHTTPCookieStore.mm

@@ -132 +132 @@
             ASSERT_TRUE([cookie2.get().domain isEqualToString:cookie.domain]);
             ASSERT_FALSE(cookie.secure);
-            // FIXME: this should be ASSERT_FALSE. Investigating in <https://bugs.webkit.org/show_bug.cgi?id=171748>.
-            ASSERT_TRUE(cookie.sessionOnly);
+            ASSERT_FALSE(cookie.sessionOnly);
         }
     }