Content settings pattern trim trailing dots from hostnames before matching a URL.

chrome/browser/content_settings/content_settings_pattern.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/content_settings/content_settings_pattern.h"
 
 #include "base/string_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/content_settings/content_settings_pattern_parser.h"
 #include "chrome/common/url_constants.h"
+#include "net/base/dns_util.h"
 #include "net/base/net_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
 
 namespace {
 
 std::string GetDefaultPort(const std::string& scheme) {
   if (scheme == chrome::kHttpScheme)
     return "80";
   if (scheme == chrome::kHttpsScheme)
@@ skipping 94 matching lines @@
 
   if (parts->scheme == std::string(chrome::kFileScheme)) {
     GURL url(std::string(chrome::kFileScheme) +
              std::string(chrome::kStandardSchemeSeparator) + parts->path);
     parts->path = url.path();
   }
 
   // Canonicalize the host part.
   const std::string host(parts->host);
   url_canon::CanonHostInfo host_info;
-  const std::string canonicalized_host(net::CanonicalizeHost(host, &host_info));
+  std::string canonicalized_host(net::CanonicalizeHost(host, &host_info));
+  canonicalized_host = net::TrimEndingDot(canonicalized_host);
 
   parts->host = "";
   if ((host.find('*') == std::string::npos) &&
       !canonicalized_host.empty()) {
     // Valid host.
     parts->host += canonicalized_host;
   }
 }
 
 // ////////////////////////////////////////////////////////////////////////////
@@ skipping 158 matching lines @@
   // TODO(markusheintz): This should change in the future. There should be only
   // one setting for all file URLs. So the path should be ignored.
   if (!parts_.is_scheme_wildcard &&
       scheme == std::string(chrome::kFileScheme)) {
     if (parts_.path == std::string(url.path()))
       return true;
     return false;
   }
 
   // Match the host part.
-  const std::string host(url.host());
+  const std::string host(net::TrimEndingDot(url.host()));
   if (!parts_.has_domain_wildcard) {
     if (parts_.host != host)
       return false;
   } else {
     if (!IsSubDomainOrEqual(host, parts_.host))
       return false;
   }
 
   // For chrome extensions URLs ignore the port.
   if (parts_.scheme == std::string(chrome::kExtensionScheme))
@@ skipping 150 matching lines @@
     const ContentSettingsPattern::PatternParts& parts,
     const ContentSettingsPattern::PatternParts& other_parts) {
   if (parts.is_port_wildcard && !other_parts.is_port_wildcard)
     return ContentSettingsPattern::SUCCESSOR;
   if (!parts.is_port_wildcard && other_parts.is_port_wildcard)
     return ContentSettingsPattern::PREDECESSOR;
   if (parts.port != other_parts.port)
     return ContentSettingsPattern::DISJOINT;
   return ContentSettingsPattern::IDENTITY;
 }