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

Issue 459363002: Revert of Wire 'blink::Platform::isHostnameReservedIPAddress()' to 'net::IsReservedIPAddress()'. (Closed)

Created:
6 years, 4 months ago by Mike West
Modified:
6 years, 4 months ago
Reviewers:
jam, Ryan Sleevi
CC:
chromium-reviews, darin-cc_chromium.org, jam
Project:
chromium
Visibility:
Public.

Description

Revert of Wire 'blink::Platform::isHostnameReservedIPAddress()' to 'net::IsReservedIPAddress()'. (https://codereview.chromium.org/430193002/) Reason for revert: Suspected of breaking Chrome builds: https://crbug.com/402037 Original issue's description: > Wire 'blink::Platform::isHostnameReservedIPAddress()' to 'net::IsReservedIPAddress()'. > > This is a fairly straightforward patch which wires up the Blink platform > API over to the network stack. > > BUG=378566 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288327 TBR=rsleevi@chromium.org,jam@chromium.org NOTREECHECKS=true NOTRY=true BUG=378566

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+0 lines, -203 lines) Patch
M content/child/blink_platform_impl.h View 1 chunk +0 lines, -3 lines 0 comments Download
M content/child/blink_platform_impl.cc View 3 chunks +0 lines, -19 lines 0 comments Download
M content/child/blink_platform_unittest.cc View 2 chunks +0 lines, -129 lines 0 comments Download
M net/base/net_util.h View 1 chunk +0 lines, -5 lines 0 comments Download
M net/base/net_util.cc View 1 chunk +0 lines, -22 lines 0 comments Download
M net/base/net_util_unittest.cc View 1 chunk +0 lines, -25 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
Mike West
Created Revert of Wire 'blink::Platform::isHostnameReservedIPAddress()' to 'net::IsReservedIPAddress()'.
6 years, 4 months ago (2014-08-12 04:36:51 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mkwst@chromium.org/459363002/1
6 years, 4 months ago (2014-08-12 04:38:42 UTC) #2
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 4 months ago (2014-08-12 04:40:30 UTC) #3
commit-bot: I haz the power
6 years, 4 months ago (2014-08-12 04:40:30 UTC) #4
Failed to apply patch for content/child/blink_platform_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: content/child/blink_platform_unittest.cc
  |diff --git a/content/child/blink_platform_unittest.cc
b/content/child/blink_platform_unittest.cc
  |index
9bf333645fc86de3503a446c247a505926dc5f4b..88a3c0dc518ac59b0b313d7e6be96d6f741845e6
100644
  |--- a/content/child/blink_platform_unittest.cc
  |+++ b/content/child/blink_platform_unittest.cc
  --------------------------
  No file to patch.  Skipping patch.
  2 out of 2 hunks ignored

Patch:       content/child/blink_platform_unittest.cc
Index: content/child/blink_platform_unittest.cc
diff --git a/content/child/blink_platform_unittest.cc
b/content/child/blink_platform_unittest.cc
index
9bf333645fc86de3503a446c247a505926dc5f4b..88a3c0dc518ac59b0b313d7e6be96d6f741845e6
100644
--- a/content/child/blink_platform_unittest.cc
+++ b/content/child/blink_platform_unittest.cc
@@ -5,10 +5,7 @@
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "content/child/blink_platform_impl.h"
-#include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 
 namespace content {
 
@@ -67,130 +64,4 @@
   EXPECT_TRUE(base::TimeDelta() == platform_impl.shared_timer_delay());
 }
 
-TEST(BlinkPlatformTest, IsReservedIPAddress_WebURL) {
-  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/")));
-
-  // 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/")));
-
-  // Unreserved IPv6 addresses.
-  EXPECT_FALSE(platform_impl.isReservedIPAddress(
-      GURL("http://[FFC0:ba98:7654:3210:FEDC:BA98:7654:3210]/")));
-  EXPECT_FALSE(platform_impl.isReservedIPAddress(
-      GURL("http://[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(
-      GURL("http://[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/")));
-
-  // Moar IPv4
-  uint8 address[4] = {0, 0, 0, 1};
-  for (int i = 0; i < 256; i++) {
-    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)));
-    } else {
-      EXPECT_FALSE(platform_impl.isReservedIPAddress(
-          blink::WebSecurityOrigin::createFromString(addressString)));
-    }
-  }
-}
-
 }  // namespace content

Powered by Google App Engine
This is Rietveld 408576698