Fix CanonicalCookie::IsEquivalentForSecureCookieMatching

net/cookies/canonical_cookie.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Portions of this code based on Mozilla:
 //   (netwerk/cookie/src/nsCookieService.cpp)
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ skipping 119 matching lines @@
                                  const std::string& value,
                                  const std::string& domain,
                                  const std::string& path,
                                  const base::Time& creation,
                                  const base::Time& expiration,
                                  const base::Time& last_access,
                                  bool secure,
                                  bool httponly,
                                  CookieSameSite same_site,
                                  CookiePriority priority)
-    : source_(url.SchemeIsFile() ? url : url.GetOrigin()),
-      name_(name),
+    : name_(name),
       value_(value),
       domain_(domain),
       path_(path),
       creation_date_(creation),
       expiry_date_(expiration),
       last_access_date_(last_access),
       secure_(secure),
       httponly_(httponly),
       same_site_(same_site),
       priority_(priority) {}
@@ skipping 169 matching lines @@
     const base::Time& last_access,
     bool secure,
     bool http_only,
     CookieSameSite same_site,
     CookiePriority priority) {
   return base::WrapUnique(new CanonicalCookie(
       GURL(), name, value, domain, path, creation, expiration, last_access,
       secure, http_only, same_site, priority));
 }
 
+bool CanonicalCookie::IsEquivalentForSecureCookieMatching(
+    const CanonicalCookie& ecc) const {
+  return (name_ == ecc.Name() && (ecc.IsDomainMatch(DomainWithoutDot()) ||
+                                  IsDomainMatch(ecc.DomainWithoutDot())));
+}
+
 bool CanonicalCookie::IsOnPath(const std::string& url_path) const {
 
   // A zero length would be unsafe for our trailing '/' checks, and
   // would also make no sense for our prefix match.  The code that
   // creates a CanonicalCookie should make sure the path is never zero length,
   // but we double check anyway.
   if (path_.empty())
     return false;
 
   // The Mozilla code broke this into three cases, based on if the cookie path
@@ skipping 170 matching lines @@
                                           const ParsedCookie& parsed_cookie) {
   if (prefix == CanonicalCookie::COOKIE_PREFIX_SECURE)
     return parsed_cookie.IsSecure() && url.SchemeIsCryptographic();
   if (prefix == CanonicalCookie::COOKIE_PREFIX_HOST) {
     return parsed_cookie.IsSecure() && url.SchemeIsCryptographic() &&
            !parsed_cookie.HasDomain() && parsed_cookie.Path() == "/";
   }
   return true;
 }
 
+std::string CanonicalCookie::DomainWithoutDot() const {
+  if (domain_.empty() || domain_[0] != '.')
+    return domain_;
+  return domain_.substr(1);
+}
+
 }  // namespace net