Skip to content

GitLab

T
tangled
Commit 56679603 authored by mkwst's avatar mkwst Committed by Commit bot
Browse files
Options

Tag SecurityContext objects as being hosted in reserved IP ranges. [2/2] 

This patch updates the Chromium side of the Blink platform changes,
removing method variants we no longer use, and converting the whole
thing to work on hostnames rather than WebURL/WebSecurityOrigin.

Patch 1 - Blink:    https://codereview.chromium.org/845303003
Patch 2 - Chromium: [THIS PATCH]

BUG=378566
R=jochen@chromium.org

Review URL: https://codereview.chromium.org/852573002

Cr-Commit-Position: refs/heads/master@{#311471}
parent cf6aff1f
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 113 deletions
content/child/blink_platform_impl.cc
View file @ 56679603
......@@ -154,13 +154,6 @@ class ConvertableToTraceFormatWrapper
blink::WebConvertableToTraceFormat convertable_;
};
bool isHostnameReservedIPAddress(const std::string& host) {
net::IPAddressNumber address;
if (!net::ParseURLHostnameToNumber(host, &address))
return false;
return net::IsIPAddressReserved(address);
}
} // namespace
static int ToMessageID(WebLocalizedString::Name name) {
......@@ -498,12 +491,11 @@ WebURLError BlinkPlatformImpl::cancelledError(
}
bool BlinkPlatformImpl::isReservedIPAddress(
const blink::WebSecurityOrigin& securityOrigin) const {
return isHostnameReservedIPAddress(securityOrigin.host().utf8());
}
bool BlinkPlatformImpl::isReservedIPAddress(const blink::WebURL& url) const {
return isHostnameReservedIPAddress(GURL(url).host());
const blink::WebString& host) const {
net::IPAddressNumber address;
if (!net::ParseURLHostnameToNumber(host.utf8(), &address))
return false;
return net::IsIPAddressReserved(address);
}
blink::WebThread* BlinkPlatformImpl::createThread(const char* name) {
......
content/child/blink_platform_impl.h
View file @ 56679603
......@@ -82,9 +82,7 @@ class CONTENT_EXPORT BlinkPlatformImpl
const blink::WebURL& url, blink::WebString& mimetype,
blink::WebString& charset);
virtual blink::WebURLError cancelledError(const blink::WebURL& url) const;
virtual bool isReservedIPAddress(
const blink::WebSecurityOrigin&) const;
virtual bool isReservedIPAddress(const blink::WebURL&) const;
virtual bool isReservedIPAddress(const blink::WebString& host) const;
virtual blink::WebThread* createThread(const char* name);
virtual blink::WebThread* currentThread();
virtual void yieldCurrentThread();
......
content/child/blink_platform_impl_unittest.cc
View file @ 56679603
......@@ -68,42 +68,41 @@ TEST(BlinkPlatformTest, SuspendResumeSharedTimer) {
EXPECT_TRUE(base::TimeDelta() == platform_impl.shared_timer_delay());
}
TEST(BlinkPlatformTest, IsReservedIPAddress_WebURL) {
TEST(BlinkPlatformTest, IsReservedIPAddress) {
TestBlinkPlatformImpl platform_impl;
// Unreserved IPv4 addresses (in various forms).
EXPECT_FALSE(platform_impl.isReservedIPAddress(GURL("http://8.8.8.8/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(GURL("http://99.64.0.0/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(GURL("http://212.15.0.0/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(GURL("http://212.15/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(GURL("http://212.15.0/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(GURL("http://3557752832/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress("8.8.8.8"));
EXPECT_FALSE(platform_impl.isReservedIPAddress("99.64.0.0"));
EXPECT_FALSE(platform_impl.isReservedIPAddress("212.15.0.0"));
EXPECT_FALSE(platform_impl.isReservedIPAddress("212.15"));
EXPECT_FALSE(platform_impl.isReservedIPAddress("212.15.0"));
EXPECT_FALSE(platform_impl.isReservedIPAddress("3557752832"));
// Reserved IPv4 addresses (in various forms).
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://192.168.0.0/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://192.168.0.6/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://10.0.0.5/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://10.0.0/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://10.0/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://3232235526/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress("192.168.0.0"));
EXPECT_TRUE(platform_impl.isReservedIPAddress("192.168.0.6"));
EXPECT_TRUE(platform_impl.isReservedIPAddress("10.0.0.5"));
EXPECT_TRUE(platform_impl.isReservedIPAddress("10.0.0"));
EXPECT_TRUE(platform_impl.isReservedIPAddress("10.0"));
EXPECT_TRUE(platform_impl.isReservedIPAddress("3232235526"));
// Unreserved IPv6 addresses.
EXPECT_FALSE(platform_impl.isReservedIPAddress(
GURL("http://[FFC0:ba98:7654:3210:FEDC:BA98:7654:3210]/")));
"[FFC0:ba98:7654:3210:FEDC:BA98:7654:3210]"));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
GURL("http://[2000:ba98:7654:2301:EFCD:BA98:7654:3210]/")));
"[2000:ba98:7654:2301:EFCD:BA98:7654:3210]"));
// Reserved IPv6 addresses.
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://[::1]/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://[::192.9.5.5]/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(GURL("http://[FEED::BEEF]/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress("[::1]"));
EXPECT_TRUE(platform_impl.isReservedIPAddress("[::192.9.5.5]"));
EXPECT_TRUE(platform_impl.isReservedIPAddress("[FEED::BEEF]"));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
GURL("http://[FEC0:ba98:7654:3210:FEDC:BA98:7654:3210]/")));
"[FEC0:ba98:7654:3210:FEDC:BA98:7654:3210]"));
// Not IP addresses at all.
EXPECT_FALSE(platform_impl.isReservedIPAddress(GURL("http://example.com/")));
EXPECT_FALSE(
platform_impl.isReservedIPAddress(GURL("http://127.0.0.1.example.com/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress("example.com"));
EXPECT_FALSE(platform_impl.isReservedIPAddress("127.0.0.1.example.com"));
// Moar IPv4
uint8 address[4] = {0, 0, 0, 1};
......@@ -111,85 +110,12 @@ TEST(BlinkPlatformTest, IsReservedIPAddress_WebURL) {
address[0] = i;
std::string addressString =
net::IPAddressToString(address, sizeof(address));
if (i == 0 || i == 10 || i == 127 || i > 223) {
EXPECT_TRUE(
platform_impl.isReservedIPAddress(GURL("http://" + addressString)));
} else {
EXPECT_FALSE(
platform_impl.isReservedIPAddress(GURL("http://" + addressString)));
}
}
}
TEST(BlinkPlatformTest, IsReservedIPAddress_WebSecurityOrigin) {
TestBlinkPlatformImpl platform_impl;
// Unreserved IPv4 addresses (in various forms).
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://8.8.8.8/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://99.64.0.0/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://212.15.0.0/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://212.15/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://212.15.0/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://3557752832/")));
// Reserved IPv4 addresses (in various forms).
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://192.168.0.0/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://192.168.0.6/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://10.0.0.5/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://10.0.0/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://10.0/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://3232235526/")));
// Unreserved IPv6 addresses.
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString(
"http://[FFC0:ba98:7654:3210:FEDC:BA98:7654:3210]/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString(
"http://[2000:ba98:7654:2301:EFCD:BA98:7654:3210]/")));
// Reserved IPv6 addresses.
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://[::1]/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://[::192.9.5.5]/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://[FEED::BEEF]/")));
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString(
"http://[FEC0:ba98:7654:3210:FEDC:BA98:7654:3210]/")));
// Not IP addresses at all.
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString("http://example.com/")));
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString(
"http://127.0.0.1.example.com/")));
// Moar IPv4
uint8 address[4] = {0, 0, 0, 1};
for (int i = 0; i < 256; i++) {
address[0] = i;
blink::WebString addressString = blink::WebString::fromUTF8(
"http://" + net::IPAddressToString(address, sizeof(address)) + "/");
if (i == 0 || i == 10 || i == 127 || i > 223) {
EXPECT_TRUE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString(addressString)));
blink::WebString::fromUTF8(addressString)));
} else {
EXPECT_FALSE(platform_impl.isReservedIPAddress(
blink::WebSecurityOrigin::createFromString(addressString)));
blink::WebString::fromUTF8(addressString)));
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment