Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(949)

Unified Diff: Source/platform/weborigin/OriginAccessEntry.h

Issue 1128913004: Improve OriginAccessEntry support for IP addresses. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/weborigin/OriginAccessEntry.h
diff --git a/Source/platform/weborigin/OriginAccessEntry.h b/Source/platform/weborigin/OriginAccessEntry.h
index 523153a2eee0a59b311e58d1703b56e581ebf3ea..f7a45177f2dc43a72501ebf7a60b3e7bcb68acd0 100644
--- a/Source/platform/weborigin/OriginAccessEntry.h
+++ b/Source/platform/weborigin/OriginAccessEntry.h
@@ -45,6 +45,12 @@ public:
DisallowSubdomains
};
+ // Note that 'TreatIPAddressAsDomain' MUST only be used for testing, and does not work for IPv6 addresses. It does the
+ // bare minimum necessary to support 'document.domain' layout test expectations, and should not be relied upon for either
+ // robustness or sanity.
+ //
+ // TODO(mkwst): Remove this enum once we rewrite the 'document.domain' layout tests to use '*.example.test' rather than
+ // raw IP addresses.
enum IPAddressSetting {
TreatIPAddressAsDomain,
TreatIPAddressAsIPAddress
@@ -57,6 +63,7 @@ public:
};
// If host is empty string and SubdomainSetting is AllowSubdomains, the entry will match all domains in the specified protocol.
+ // IPv6 addresses must include brackets (e.g. '[2001:db8:85a3::8a2e:370:7334]', not '2001:db8:85a3::8a2e:370:7334').
OriginAccessEntry(const String& protocol, const String& host, SubdomainSetting, IPAddressSetting);
MatchResult matchesOrigin(const SecurityOrigin&) const;
@@ -64,6 +71,7 @@ public:
const String& host() const { return m_host; }
SubdomainSetting subdomainSettings() const { return m_subdomainSettings; }
IPAddressSetting ipAddressSettings() const { return m_ipAddressSettings; }
+ bool hostIsIPAddress() const { return m_hostIsIPAddress; }
private:
String m_protocol;
« no previous file with comments | « no previous file | Source/platform/weborigin/OriginAccessEntry.cpp » ('j') | Source/platform/weborigin/OriginAccessEntry.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698