Cookie Store API: add branch for empty string path

https://bugs.webkit.org/show_bug.cgi?id=297268

Reviewed by NOBODY (OOPS!).

Implement whatwg/cookiestore#283 with tests
upstreamed at web-platform-tests/wpt#54264

Author: annevk

LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_set_path.https.window-expected.txt

@@ -0,0 +1,4 @@
+
+PASS CookieListItem - cookieStore.set with empty string path defaults to current URL
+PASS CookieListItem - cookieStore.set with empty string path defaults to current URL with __host- prefix
+

LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_set_path.https.window.html

@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->

LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_set_path.https.window.js

@@ -0,0 +1,23 @@
+// META: title=Cookie Store API: set()'s path option
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+
+promise_test(async testCase => {
+  const currentUrl = new URL(self.location.href);
+  const currentPath = currentUrl.pathname;
+  const currentDirectory = currentPath.substr(0, currentPath.lastIndexOf('/'));
+
+  await cookieStore.set({ name: 'cookie-name', value: 'cookie-value', path: '' });
+  testCase.add_cleanup(async () => {
+    await cookieStore.delete({ name: 'cookie-name', path: currentDirectory });
+  });
+
+  const internalCookie = await test_driver.get_named_cookie('cookie-name');
+  assert_equals(internalCookie.path, currentDirectory);
+}, 'CookieListItem - cookieStore.set with empty string path defaults to current URL');
+
+promise_test(async testCase => {
+  const currentUrl = new URL(self.location.href);
+  const currentPath = currentUrl.pathname;
+  return promise_rejects_js(testCase, TypeError, cookieStore.set({ name: '__host-cookie-name', value: 'cookie-value', path: '' }));
+}, 'CookieListItem - cookieStore.set with empty string path defaults to current URL with __host- prefix');

LayoutTests/imported/w3c/web-platform-tests/cookiestore/w3c-import.log

@@ -53,6 +53,7 @@ List of files:
 /LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_set_domain_parsing.sub.https.html
 /LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_set_domain_parsing.tentative.sub.https.html
 /LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_set_limit.https.any.js
+/LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_set_path.https.window.js
 /LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_special_names.https.any.js
 /LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_subscribe_arguments.https.any.js
 /LayoutTests/imported/w3c/web-platform-tests/cookiestore/cookieStore_subscriptions_empty.https.window.js

Source/WebCore/Modules/cookie-store/CookieStore.cpp

@@ -464,18 +464,13 @@ void CookieStore::set(CookieInit&& options, Ref<DeferredPromise>&& promise)
         return;
     }
 
-    if (cookie.name.startsWithIgnoringASCIICase("__Host-"_s)) {
-        if (!options.domain.isNull()) {
-            promise->reject(Exception { ExceptionCode::TypeError, "If the cookie name begins with \"__Host-\", the domain must not be specified."_s });
-            return;
-        }
-
-        if (!options.path.isNull() && options.path != "/"_s)  {
-            promise->reject(Exception { ExceptionCode::TypeError, "If the cookie name begins with \"__Host-\", the path must either not be specified or be \"/\"."_s });
-            return;
-        }
+    // FIXME: This should be further down.
+    if (!options.domain.isNull() && cookie.name.startsWithIgnoringASCIICase("__Host-"_s)) {
+        promise->reject(Exception { ExceptionCode::TypeError, "If the cookie name begins with \"__Host-\", the domain must not be specified."_s });
+        return;
     }
 
+    // FIXME: The specification does not perform this initialization of domain.
     cookie.domain = options.domain.isNull() ? domain : options.domain;
     if (!cookie.domain.isNull()) {
         if (cookie.domain.startsWith('.')) {
@@ -507,17 +502,24 @@ void CookieStore::set(CookieInit&& options, Ref<DeferredPromise>&& promise)
     }
 
     cookie.path = WTFMove(options.path);
-    if (!cookie.path.isNull()) {
-        if (!cookie.path.startsWith('/')) {
-            promise->reject(Exception { ExceptionCode::TypeError, "The path must begin with a '/'"_s });
-            return;
-        }
+    ASSERT(!cookie.path.isNull());
+    if (cookie.path.isEmpty())
+        cookie.path = CookieUtil::defaultPathForURL(url);
 
-        // FIXME: <rdar://85515842> Obtain the encoded length without allocating and encoding.
-        if (cookie.path.utf8().length() > maximumAttributeValueSize) {
-            promise->reject(Exception { ExceptionCode::TypeError, makeString("The size of the path must not be greater than "_s, maximumAttributeValueSize, " bytes"_s) });
-            return;
-        }
+    if (!cookie.path.startsWith('/')) {
+        promise->reject(Exception { ExceptionCode::TypeError, "The path must begin with a '/'"_s });
+        return;
+    }
+
+    if (cookie.path != "/"_s && cookie.name.startsWithIgnoringASCIICase("__Host-"_s)) {
+        promise->reject(Exception { ExceptionCode::TypeError, "If the cookie name begins with \"__Host-\", the path must be \"/\" or default to that."_s });
+        return;
+    }
+
+    // FIXME: <rdar://85515842> Obtain the encoded length without allocating and encoding.
+    if (cookie.path.utf8().length() > maximumAttributeValueSize) {
+        promise->reject(Exception { ExceptionCode::TypeError, makeString("The size of the path must not be greater than "_s, maximumAttributeValueSize, " bytes"_s) });
+        return;
     }
 
     if (options.expires) {

Source/WebCore/platform/Cookie.h

@@ -137,7 +137,13 @@ struct CookieHash {
     static const bool safeToCompareToEmptyOrDeleted = false;
 };
 
-}
+namespace CookieUtil {
+
+WEBCORE_EXPORT String defaultPathForURL(const URL&);
+
+} // namespace CookieUtil
+
+} // namespace WebCore
 
 namespace WTF {
     template<typename T> struct DefaultHash;

Source/WebCore/platform/network/Cookie.cpp

@@ -42,6 +42,25 @@ unsigned Cookie::hash() const
     return StringHash::hash(name) + StringHash::hash(domain) + StringHash::hash(path) + secure;
 }
 #endif
-    
+
+namespace CookieUtil {
+
+String defaultPathForURL(const URL& url)
+{
+    // Algorithm to generate the default path is outlined in https://tools.ietf.org/html/rfc6265#section-5.1.4
+
+    String path = url.path().toString();
+    if (path.isEmpty() || !path.startsWith('/'))
+        return "/"_s;
+
+    auto lastSlashPosition = path.reverseFind('/');
+    if (!lastSlashPosition)
+        return "/"_s;
+
+    return path.left(lastSlashPosition);
+}
+
+} // namespace CookieUtil
+
 } // namespace WebCore
 

Source/WebCore/platform/network/curl/CookieUtil.cpp

@@ -183,21 +183,6 @@ std::optional<Cookie> parseCookieHeader(const String& cookieLine)
     return cookie;
 }
 
-String defaultPathForURL(const URL& url)
-{
-    // Algorithm to generate the default path is outlined in https://tools.ietf.org/html/rfc6265#section-5.1.4
-
-    String path = url.path().toString();
-    if (path.isEmpty() || !path.startsWith('/'))
-        return "/"_s;
-
-    auto lastSlashPosition = path.reverseFind('/');
-    if (!lastSlashPosition)
-        return "/"_s;
-
-    return path.left(lastSlashPosition);
-}
-
 } // namespace CookieUtil
 
 } // namespace WebCore

Source/WebCore/platform/network/curl/CookieUtil.h

@@ -40,8 +40,6 @@ bool isIPAddress(const String&);
 
 bool domainMatch(const String& cookieDomain, const String& host);
 
-WEBCORE_EXPORT String defaultPathForURL(const URL&);
-
 } // namespace CookieUtil
 
 } // namespace WebCore