okhttp: canonicalizeHost test doesn't need to differentiate IP addres…

…ses and hostnames. Test exactly one pair of '[' + ']' is removed from host
grpc · Apr 2, 2018 · c0b7381 · c0b7381
1 parent ba6a4f3
commit c0b7381
Showing 1 changed file with 7 additions and 37 deletions.
diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpTlsUpgraderTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpTlsUpgraderTest.java
@@ -35,43 +35,13 @@ public class OkHttpTlsUpgraderTest {
                 < OkHttpTlsUpgrader.TLS_PROTOCOLS.indexOf(Protocol.HTTP_2));
   }
 
-  @Test public void upgrade_canonicalizeHost() {
-    // IPv4
-    assertEquals(canonicalizeHost("127.0.0.1"), "127.0.0.1");
-    assertEquals(canonicalizeHost("1.2.3.4"), "1.2.3.4");
+  @Test public void canonicalizeHosts() {
+    assertEquals("::1", canonicalizeHost("::1"));
+    assertEquals("::1", canonicalizeHost("[::1]"));
+    assertEquals("127.0.0.1", canonicalizeHost("127.0.0.1"));
+    assertEquals("some.long.url.com", canonicalizeHost("some.long.url.com"));
 
-    // IPv6
-    assertEquals(canonicalizeHost("::1"), "::1");
-    assertEquals(canonicalizeHost("[::1]"), "::1");
-    assertEquals(canonicalizeHost("2001:db8::1"), "2001:db8::1");
-    assertEquals(canonicalizeHost("[2001:db8::1]"), "2001:db8::1");
-    assertEquals(canonicalizeHost("::192.168.0.1"), "::192.168.0.1");
-    assertEquals(canonicalizeHost("[::192.168.0.1]"), "::192.168.0.1");
-    assertEquals(canonicalizeHost("::ffff:192.168.0.1"), "::ffff:192.168.0.1");
-    assertEquals(canonicalizeHost("[::ffff:192.168.0.1]"), "::ffff:192.168.0.1");
-    assertEquals(canonicalizeHost("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210"),
-            "FEDC:BA98:7654:3210:FEDC:BA98:7654:3210");
-    assertEquals(canonicalizeHost("[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]"),
-            "FEDC:BA98:7654:3210:FEDC:BA98:7654:3210");
-    assertEquals(canonicalizeHost("1080:0:0:0:8:800:200C:417A"), "1080:0:0:0:8:800:200C:417A");
-    assertEquals(canonicalizeHost("[1080:0:0:0:8:800:200C:417A]"), "1080:0:0:0:8:800:200C:417A");
-    assertEquals(canonicalizeHost("1080::8:800:200C:417A"), "1080::8:800:200C:417A");
-    assertEquals(canonicalizeHost("[1080::8:800:200C:417A]"), "1080::8:800:200C:417A");
-    assertEquals(canonicalizeHost("FF01::101"), "FF01::101");
-    assertEquals(canonicalizeHost("[FF01::101]"), "FF01::101");
-    assertEquals(canonicalizeHost("0:0:0:0:0:0:13.1.68.3"), "0:0:0:0:0:0:13.1.68.3");
-    assertEquals(canonicalizeHost("[0:0:0:0:0:0:13.1.68.3]"), "0:0:0:0:0:0:13.1.68.3");
-    assertEquals(canonicalizeHost("0:0:0:0:0:FFFF:129.144.52.38"), "0:0:0:0:0:FFFF:129.144.52.38");
-    assertEquals(canonicalizeHost("[0:0:0:0:0:FFFF:129.144.52.38]"), "0:0:0:0:0:FFFF:129.144.52.38");
-    assertEquals(canonicalizeHost("::13.1.68.3"), "::13.1.68.3");
-    assertEquals(canonicalizeHost("[::13.1.68.3]"), "::13.1.68.3");
-    assertEquals(canonicalizeHost("::FFFF:129.144.52.38"), "::FFFF:129.144.52.38");
-    assertEquals(canonicalizeHost("[::FFFF:129.144.52.38]"), "::FFFF:129.144.52.38");
-
-    // Hostnames
-    assertEquals(canonicalizeHost("go"), "go");
-    assertEquals(canonicalizeHost("localhost"), "localhost");
-    assertEquals(canonicalizeHost("squareup.com"), "squareup.com");
-    assertEquals(canonicalizeHost("www.nintendo.co.jp"), "www.nintendo.co.jp");
+    // Extra square brackets in a malformed URI are retained
+    assertEquals("[::1]", canonicalizeHost("[[::1]]"));
   }
 }