Changeset 150916 in webkit

Timestamp:

May 29, 2013 11:46:40 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Handle Host-Only cookies
​https://bugs.webkit.org/show_bug.cgi?id=116969

PR 338809
Patch by Otto Derek Cheung <​otcheung@rim.com> on 2013-05-29
Reviewed by Rob Buis.
Internally Reviewed by Joe Mason.

Adding support for host-only cookies (cookies with no
specified domains). These cookies should only be returned
when the host matches the cookie domain exactly.

Tested using Opera and Browser cookie test suite. Tested
that host cookies are being stored in it's own map using
Web Inspector.

• platform/blackberry/CookieManager.cpp:

(WebCore::CookieManager::getRawCookies):
(WebCore::CookieManager::checkAndTreatCookie):
(WebCore::CookieManager::findOrCreateCookieMap):

• platform/blackberry/CookieParser.cpp:

(WebCore::CookieParser::CookieParser):
(WebCore::CookieParser::parseOneCookie):

• platform/blackberry/ParsedCookie.h:

(WebCore::ParsedCookie::isHostOnly):
(ParsedCookie):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/blackberry/CookieManager.cpp (modified) (4 diffs)
• platform/blackberry/CookieParser.cpp (modified) (5 diffs)
• platform/blackberry/ParsedCookie.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-29  Otto Derek Cheung  <otcheung@rim.com>
+
+        [BlackBerry] Handle Host-Only cookies
+        https://bugs.webkit.org/show_bug.cgi?id=116969
+
+        PR 338809
+        Reviewed by Rob Buis.
+        Internally Reviewed by Joe Mason.
+
+        Adding support for host-only cookies (cookies with no
+        specified domains). These cookies should only be returned
+        when the host matches the cookie domain exactly.
+
+        Tested using Opera and Browser cookie test suite. Tested
+        that host cookies are being stored in it's own map using
+        Web Inspector.
+
+        * platform/blackberry/CookieManager.cpp:
+        (WebCore::CookieManager::getRawCookies):
+        (WebCore::CookieManager::checkAndTreatCookie):
+        (WebCore::CookieManager::findOrCreateCookieMap):
+        * platform/blackberry/CookieParser.cpp:
+        (WebCore::CookieParser::CookieParser):
+        (WebCore::CookieParser::parseOneCookie):
+        * platform/blackberry/ParsedCookie.h:
+        (WebCore::ParsedCookie::isHostOnly):
+        (ParsedCookie):
+
 2013-05-29  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/blackberry/CookieManager.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2008, 2009 Julien Chaffraix <julien.chaffraix@gmail.com>
- * Copyright (C) 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
+ * Copyright (C) 2010, 2011, 2012, 2013 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -297 +297 @@
             currentMap->getAllCookies(&cookieCandidates);
 
+            // Get cookies from Host-only cookies
+            if (canonicalIP.empty()) {
+                CookieLog("CookieManager - looking for host-only cookies for host - %s", requestURL.host().utf8().data());
+                CookieMap* hostMap = currentMap->getSubdomainMap(requestURL.host());
+                if (hostMap)
+                    hostMap->getAllCookies(&cookieCandidates);
+            }
+
             // Get cookies from the valid domain maps
             int i = delimitedHost.size() - 1;
@@ -423 +431 @@
     } else {
         ASSERT(curMap);
+        CookieLog("CookieManager - adding cookiemap - %s\n", curMap->getName().utf8().data());
         addCookieToMap(curMap, candidateCookie, postToBackingStore, filter);
     }
@@ -549 +558 @@
     Vector<String> delimitedHost;
 
-    // If the domain is an IP address, don't split it.
-    if (candidateCookie->domainIsIPAddress())
+    // If the domain is an IP address or is a host-only domain, don't split it.
+    if (candidateCookie->domainIsIPAddress() || candidateCookie->isHostOnly())
         delimitedHost.append(candidateCookie->domain());
     else

trunk/Source/WebCore/platform/blackberry/CookieParser.cpp

@@ -33 +33 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
@@ -61 +62 @@
         m_defaultCookieHost = hostDomainCanonical;
         m_defaultDomainIsIPAddress = true;
-    } else
-        m_defaultCookieHost = m_defaultCookieHost.startsWith(".") ? m_defaultCookieHost : "." + m_defaultCookieHost;
+    }
 }
 
@@ -266 +266 @@
                     LOG_ERROR_AND_RETURN("Invalid cookie attribute %s (domain): it does not contain an embedded dot", cookie.ascii().data());
 
-                // If the domain does not start with a dot, add one for security checks,
+                // If the domain does not start with a dot, add one for security checks and to distinguish it from host-only domains
                 // For example: ab.c.com dose not domain match b.c.com;
-                String realDomain = parsedValue[0] == '.' ? parsedValue : "." + parsedValue;
+                StringBuilder parsedValueBuilder;
+                if (parsedValue[0] != '.')
+                    parsedValueBuilder.appendLiteral(".");
+                parsedValueBuilder.append(parsedValue);
+                String realDomain = parsedValueBuilder.toString();
+
+                StringBuilder defaultHostBuilder;
+                defaultHostBuilder.appendLiteral(".");
+                defaultHostBuilder.append(m_defaultCookieHost);
+                String defaultHost = defaultHostBuilder.toString();
 
                 // Try to return an canonical ip address if the domain is an ip
@@ -279 +288 @@
                 if (m_defaultDomainIsIPAddress) {
                     String realDomainCanonical = BlackBerry::Platform::getCanonicalIPFormat(realDomain);
-                    if (realDomainCanonical.isEmpty() || realDomainCanonical != m_defaultCookieHost)
+                    if (realDomainCanonical.isEmpty() || realDomainCanonical != defaultHost)
                         LOG_ERROR_AND_RETURN("Invalid cookie attribute %s (domain): domain is IP but does not match host's IP", cookie.ascii().data());
                     realDomain = realDomainCanonical;
@@ -289 +298 @@
                     // a.b.com matches b.com, a.b.com matches .B.com and a.b.com matches .A.b.Com
                     // and so on.
-                    // We also have to make a special case for IP addresses. If a website tries to set
-                    // a cookie to 61.97, that domain is not an IP address and will end with the m_defaultCookieHost
-                    if (!m_defaultCookieHost.endsWith(realDomain, false))
+                    if (!defaultHost.endsWith(realDomain, false))
                         LOG_ERROR_AND_RETURN("Invalid cookie attribute %s (domain): it does not domain match the host", cookie.ascii().data());
+
                     // We should check for an embedded dot in the portion of string in the host not in the domain
                     // but to match firefox behaviour we do not.

trunk/Source/WebCore/platform/blackberry/ParsedCookie.h

@@ -86 +86 @@
     bool isSession() const { return m_isSession; }
 
+    bool isHostOnly() const { return !m_domain.startsWith("."); }
+
     bool hasExpired() const;
     bool isForceExpired() const { return m_isForceExpired; }