Improve OriginAccessEntry support for IP addresses.

Source/platform/weborigin/OriginAccessEntry.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/weborigin/OriginAccessEntry.h"
 
+#include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebPublicSuffixList.h"
+#include <url/third_party/mozilla/url_parse.h>
+#include <url/url_canon.h>
 
 namespace blink {
 
+namespace {
+
+// TODO(mkwst): This basically replicates GURL::HostIsIPAddress. If/when
+// we re-evaluate everything after merging the Blink and Chromium
+// repositories, perhaps we can just use that directly.
+bool HostIsIPAddress(const String& host)
+{
+    if (host.isEmpty())
+        return false;
+
+    String protocol("https://");
+    KURL url(KURL(), protocol + host + "/");
+    if (!url.isValid())
+        return false;
+
+    url::RawCanonOutputT<char, 128> ignoredOutput;
+    url::CanonHostInfo hostInfo;
+    url::Component hostComponent(protocol.length(), host.length());
+    url::CanonicalizeIPAddress(url.string().utf8().data(), hostComponent, &ignoredOutput, &hostInfo);
+    return hostInfo.IsIPAddress();
+}
+
+}
+
 OriginAccessEntry::OriginAccessEntry(const String& protocol, const String& host, SubdomainSetting subdomainSetting, IPAddressSetting ipAddressSetting)
     : m_protocol(protocol.lower())
     , m_host(host.lower())
     , m_subdomainSettings(subdomainSetting)
     , m_ipAddressSettings(ipAddressSetting)
     , m_hostIsPublicSuffix(false)
 {
     ASSERT(subdomainSetting == AllowSubdomains || subdomainSetting == DisallowSubdomains);
 
-    // Assume that any host that ends with a digit is trying to be an IP address.
-    m_hostIsIPAddress = !m_host.isEmpty() && isASCIIDigit(m_host[m_host.length() - 1]);
+    m_hostIsIPAddress = HostIsIPAddress(host);
 
     // Look for top-level domains, either with or without an additional dot.
     if (!m_hostIsIPAddress) {
         WebPublicSuffixList* suffixList = Platform::current()->publicSuffixList();
         if (suffixList && m_host.length() <= suffixList->getPublicSuffixLength(m_host) + 1)
             m_hostIsPublicSuffix = true;
     }
 }
 
 OriginAccessEntry::MatchResult OriginAccessEntry::matchesOrigin(const SecurityOrigin& origin) const
@@ skipping 24 matching lines @@
     if (origin.host().length() <= m_host.length() || origin.host()[origin.host().length() - m_host.length() - 1] != '.' || !origin.host().endsWith(m_host))
         return DoesNotMatchOrigin;
 
     if (m_hostIsPublicSuffix)
         return MatchesOriginButIsPublicSuffix;
 
     return MatchesOrigin;
 }
 
 } // namespace blink