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>

[Ryan Sleevi, 2015/05/13 23:23:34]

what the wat?

[Mike West, 2015/05/15 14:45:16]

This is where 'url::Component' is defined. Don't ask me why, I'm just the guy
copy/pasting from KURL and GURL.

+#include <url/url_canon.h>
 
 namespace blink {
 
+namespace {
+
+    bool HostIsIPAddress(const String& host)

[jochen (gone - plz use gerrit), 2015/05/15 14:44:13]

no indent

+    {
+        if (host.isEmpty())
+            return false;
+
+        KURL url(KURL(), "http://" + host + "/");
+        if (!url.isValid())
+            return false;
+
+        url::RawCanonOutputT<char, 128> ignoredOutput;
+        url::CanonHostInfo hostInfo;
+        url::Component hostComponent(7, host.length());

[Ryan Sleevi, 2015/05/13 23:23:34]

grumble-nit - It's not immediately obvious that the 7 is tied to line 50, or
that someone won't come along and helpfully change things to https:// because
http:// is bad and then bad things happen :)

Make these two static constants in the function?

[jochen (gone - plz use gerrit), 2015/05/15 14:44:13]

why not make it https:// already now :)

[Mike West, 2015/05/15 14:45:16]

I _should_ change this to HTTPS! It'll be tons more secure.
Done.

+        url::CanonicalizeIPAddress(url.string().utf8().data(), hostComponent, &ignoredOutput, &hostInfo);
+        return hostInfo.IsIPAddress();

[Ryan Sleevi, 2015/05/13 23:23:34]

This is basically duplicating GURL::HostIsIPAddress.

[Mike West, 2015/05/15 14:45:16]

Noted.

+    }
+}
+
 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