remove ipv6

Author: arturobernalg

httpcore5/src/main/java/org/apache/hc/core5/http/HttpHost.java

@@ -310,7 +310,7 @@ public String toURI() {
         final int port = this.host.getPort();
 
         // Bracket only real IPv6 literals; decide using the address part only (ignore zone)
-        if (ZoneIdSupport.isIPv6AddressPart(hostname)) {
+        if (ZoneIdSupport.looksLikeIPv6AddressPart(hostname)) {
             ZoneIdSupport.appendBracketedIPv6(buffer, hostname);
             if (port >= 0) {
                 buffer.append(':').append(port);

httpcore5/src/main/java/org/apache/hc/core5/net/URIAuthority.java

@@ -80,30 +80,37 @@ static URIAuthority parse(final CharSequence s, final Tokenizer.Cursor cursor) t
             final int upper = cursor.getUpperBound();
             int rb = -1;
             for (int i = lb + 1; i < upper; i++) {
-                if (s.charAt(i) == ']') { rb = i; break; }
+                if (s.charAt(i) == ']') {
+                    rb = i;
+                    break;
+                }
             }
             if (rb < 0) {
                 throw URISupport.createException(s.toString(), cursor, "Expected closing bracket for IPv6 address");
             }
 
             final String literal = s.subSequence(lb + 1, rb).toString();
-            final int z = literal.indexOf("%25");
-            final String addr = z >= 0 ? literal.substring(0, z) : literal;
-
-            // validate only the IPv6 address part (zone excluded)
-            if (!InetAddressUtils.isIPv6(addr)) {
+            final int zoneMark = literal.indexOf("%25");
+            final String addrPart = zoneMark >= 0 ? literal.substring(0, zoneMark) : literal;
+
+            int colons = 0;
+            for (int i = 0; i < addrPart.length(); i++) {
+                if (addrPart.charAt(i) == ':') {
+                    if (++colons >= 2) {
+                        break;
+                    }
+                }
+            }
+            if (colons < 2) {
                 throw URISupport.createException(s.toString(), cursor, "Expected an IPv6 address");
             }
 
-            // hostName must be stored in friendly form: "...%<decoded-zone>"
-            final String hostName;
-            if (z >= 0) {
-                final String zoneEnc = literal.substring(z + 3);
+            if (zoneMark >= 0) {
+                final String zoneEnc = literal.substring(zoneMark + 3);
                 ZoneIdSupport.validateZoneIdEncoded(zoneEnc);
-                hostName = ZoneIdSupport.decodeZoneId(literal); // turns %25 + %HH into % + decoded UTF-8
-            } else {
-                hostName = addr;
             }
+            // Store host in friendly form: "...%<decoded-zone>"  (or literal as-is if no zone)
+            final String hostName = ZoneIdSupport.decodeZoneId(literal);
 
             // optional :port
             int pos = rb + 1;
@@ -113,15 +120,15 @@ static URIAuthority parse(final CharSequence s, final Tokenizer.Cursor cursor) t
                 if (pos >= upper || !Character.isDigit(s.charAt(pos))) {
                     throw URISupport.createException(s.toString(), cursor, "Invalid port");
                 }
-                long p = 0;
+                long acc = 0;
                 while (pos < upper && Character.isDigit(s.charAt(pos))) {
-                    p = p * 10 + (s.charAt(pos) - '0');
-                    if (p > 65535) {
+                    acc = acc * 10 + (s.charAt(pos) - '0');
+                    if (acc > 65535) {
                         throw URISupport.createException(s.toString(), cursor, "Port out of range");
                     }
                     pos++;
                 }
-                port = (int) p;
+                port = (int) acc;
             }
             cursor.updatePos(pos);
             return new URIAuthority(userInfo, hostName, port);
@@ -141,17 +148,14 @@ static URIAuthority parse(final CharSequence s, final Tokenizer.Cursor cursor) t
                     break; // safety
                 }
                 if (ch == ':') {
-                    colonCount++;
-                    // more than one ':' before path/query/fragment => looks like IPv6, but not bracketed
-                    if (colonCount > 1) {
+                    if (++colonCount > 1) {
                         throw URISupport.createException(s.toString(), cursor, "Expected an IPv6 address");
                     }
                 }
                 i++;
             }
         }
 
-        // ===== fallback: reg-name / IPv4 (and optional :port) =====
         final Host host = Host.parse(s, cursor);
         return new URIAuthority(userInfo, host);
     }

httpcore5/src/main/java/org/apache/hc/core5/net/ZoneIdSupport.java

@@ -138,13 +138,16 @@ public static void validateZoneIdEncoded(final CharSequence enc) {
      * <p>Rule: if the address-part (up to '%', if present) contains &gt;= 2 colons,
      * treat it as IPv6-like.</p>
      */
-    public static boolean isIPv6AddressPart(final CharSequence host) {
+    public static boolean looksLikeIPv6AddressPart(final CharSequence host) {
         if (host == null) {
             return false;
         }
         int end = host.length();
         for (int i = 0; i < end; i++) {
-            if (host.charAt(i) == '%') { end = i; break; }
+            if (host.charAt(i) == '%') {
+                end = i;
+                break;
+            }
         }
         int colons = 0;
         for (int i = 0; i < end; i++) {
@@ -164,13 +167,16 @@ public static boolean isIPv6AddressPart(final CharSequence host) {
      * RFC 6874-encoded ZoneID. Returns {@code true} iff it wrote the bracketed literal.
      */
     public static boolean appendBracketedIPv6(final StringBuilder buf, final CharSequence host) {
-        if (!isIPv6AddressPart(host)) {
+        if (!looksLikeIPv6AddressPart(host)) {
             return false;
         }
         // address part
         int zoneIdx = -1;
         for (int i = 0; i < host.length(); i++) {
-            if (host.charAt(i) == '%') { zoneIdx = i; break; }
+            if (host.charAt(i) == '%') {
+                zoneIdx = i;
+                break;
+            }
         }
         buf.append('[');
         if (zoneIdx >= 0) {
@@ -187,7 +193,9 @@ public static boolean appendBracketedIPv6(final StringBuilder buf, final CharSeq
         return true;
     }
 
-    /** RFC 3986 unreserved characters. */
+    /**
+     * RFC 3986 unreserved characters.
+     */
     private static boolean unreserved(final char ch) {
         return ch >= 'A' && ch <= 'Z'
                 || ch >= 'a' && ch <= 'z'

httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java

@@ -279,9 +279,9 @@ void zoneId_allows_unreserved_and_pct() throws URISyntaxException {
 
     @Test
     void inetAddressUtils_helper_accepts_zone() {
-        Assertions.assertTrue(ZoneIdSupport.isIPv6AddressPart("fe80::1%eth0"));
-        Assertions.assertTrue(ZoneIdSupport.isIPv6AddressPart("fe80::1234:0:0:0:0:0%en1"));
-        Assertions.assertFalse(ZoneIdSupport.isIPv6AddressPart("not-an-ip"));
+        Assertions.assertTrue(ZoneIdSupport.looksLikeIPv6AddressPart("fe80::1%eth0"));
+        Assertions.assertTrue(ZoneIdSupport.looksLikeIPv6AddressPart("fe80::1234:0:0:0:0:0%en1"));
+        Assertions.assertFalse(ZoneIdSupport.looksLikeIPv6AddressPart("not-an-ip"));
     }
 
 }