+ * A uri without port is allowed, in which case the port will be inferred from the scheme. {@code http} is 80, and + * {@code https} is 443. + *
+ *+ * The host of the {@code uri} should not be null, or it will be treated as an illegal param, + * and an {@link IllegalArgumentException} will be thrown. + *
+ */ + public static IpPort parseIpPort(URI uri) { + return parseIpPort(uri, false); + } + + /** + * Parse a {@link URI} into an {@link IpPort} + * @param uri a uri representing {@link IpPort} + * @param ignorePortUndefined whether the port should be inferred from scheme, when the port part of {@code uri} is {@code -1}. + * If {@code true} the undefined port is ignored; + * otherwise a port will be inferred from scheme: {@code http} is 80, and {@code https} is 443. + */ + public static IpPort parseIpPort(URI uri, boolean ignorePortUndefined) { + if (null == uri.getHost()) { + // if the format of address is legal but the value is out of range, URI#create(String) will not throw exception + // but return a URI with null host. + throw new IllegalArgumentException("Illegal uri: [" + uri + "]"); } - String hostOrIp = address.substring(0, idx); - int port = Integer.parseInt(address.substring(idx + 1)); - return new IpPort(hostOrIp, port); + IpPort ipPort = new IpPort(uri.getHost(), uri.getPort()); + if (-1 != ipPort.getPort() || ignorePortUndefined) { + return ipPort; + } + + if (uri.getScheme().equals("http")) { + ipPort.setPort(80); + } + if (uri.getScheme().equals("https")) { + ipPort.setPort(443); + } + + return ipPort; } + /** + * @param uriAddress the address containing IP and port info. + * @return IpPort parsed from input param, or {@code null} if the param is null. + */ public static IpPort parseIpPortFromURI(String uriAddress) { if (uriAddress == null) { return null; } try { - URI uri = new URI(uriAddress); - String authority = uri.getAuthority(); - return parseIpPort(uri.getScheme(), authority); + return parseIpPort(new URI(uriAddress)); } catch (URISyntaxException e) { return null; } @@ -159,17 +205,7 @@ public static IpPort parseIpPort(String scheme, String authority) { if (authority == null) { return null; } - int idx = authority.indexOf(':'); - if (idx != -1) { - return parseIpPort(authority); - } - if (scheme.equals("http")) { - return new IpPort(authority, 80); - } - if (scheme.equals("https")) { - return new IpPort(authority, 443); - } - return null; + return parseIpPort(URI.create(scheme + "://" + authority)); } /** @@ -184,7 +220,7 @@ public static String getRealListenAddress(String schema, String address) { } try { URI originalURI = new URI(schema + "://" + address); - IpPort ipPort = NetUtils.parseIpPort(originalURI.getAuthority()); + IpPort ipPort = NetUtils.parseIpPort(originalURI); if (ipPort == null) { LOGGER.error("address {} is not valid.", address); return null; diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java index 15e157fc8e..a363747bc2 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java @@ -17,11 +17,14 @@ package org.apache.servicecomb.foundation.common.net; +import static org.junit.Assert.fail; + import java.io.IOException; import java.net.InetAddress; import java.net.ServerSocket; import java.util.HashMap; import java.util.Map; +import java.util.function.Consumer; import org.junit.Assert; import org.junit.Test; @@ -41,18 +44,69 @@ public void testIpPort() { } @Test - public void testNetutils() { + public void testNetUtils() { Assert.assertEquals("127.0.0.1", NetUtils.parseIpPort("127.0.0.1:8080").getHostOrIp()); Assert.assertEquals(8080, NetUtils.parseIpPort("127.0.0.1:8080").getPort()); - Assert.assertEquals(null, NetUtils.parseIpPort(null)); - Assert.assertEquals(null, NetUtils.parseIpPort("127.0.0.18080")); + Assert.assertEquals("127.0.0.1", NetUtils.parseIpPort("127.0.0.1").getHostOrIp()); + Assert.assertEquals(-1, NetUtils.parseIpPort("127.0.0.1").getPort()); + Assert.assertEquals(null, NetUtils.parseIpPort((String) null)); Assert.assertEquals(null, NetUtils.parseIpPortFromURI(null)); - Assert.assertEquals(null, NetUtils.parseIpPortFromURI("ss")); Assert.assertEquals("127.0.0.1", NetUtils.parseIpPortFromURI("rest://127.0.0.1:8080").getHostOrIp()); Assert.assertEquals(8080, NetUtils.parseIpPortFromURI("http://127.0.0.1:8080").getPort()); Assert.assertEquals(80, NetUtils.parseIpPortFromURI("http://127.0.0.1").getPort()); Assert.assertEquals(8080, NetUtils.parseIpPortFromURI("https://127.0.0.1:8080").getPort()); Assert.assertEquals(443, NetUtils.parseIpPortFromURI("https://127.0.0.1").getPort()); + + Assert.assertEquals(30000, NetUtils.parseIpPort("http", "127.0.0.1:30000").getPort()); + Assert.assertEquals("127.0.0.1", NetUtils.parseIpPort("http", "127.0.0.1:30000").getHostOrIp()); + Assert.assertEquals(30000, NetUtils.parseIpPort("https", "127.0.0.1:30000").getPort()); + Assert.assertEquals("127.0.0.1", NetUtils.parseIpPort("https", "127.0.0.1:30000").getHostOrIp()); + Assert.assertEquals(80, NetUtils.parseIpPort("http", "127.0.0.1").getPort()); + Assert.assertEquals("127.0.0.1", NetUtils.parseIpPort("http", "127.0.0.1").getHostOrIp()); + Assert.assertEquals(443, NetUtils.parseIpPort("https", "127.0.0.1").getPort()); + Assert.assertEquals("127.0.0.1", NetUtils.parseIpPort("https", "127.0.0.1").getHostOrIp()); + Assert.assertNull(NetUtils.parseIpPort("http", null)); + + checkException(v -> NetUtils.parseIpPort("127.0.0.18080")); + checkException(v -> NetUtils.parseIpPortFromURI("ss")); + } + + @Test + public void testNetUtilsIPv6() { + Assert.assertEquals("[::1]", NetUtils.parseIpPort("[::1]:8080").getHostOrIp()); + Assert.assertEquals("[::]", NetUtils.parseIpPort("[::]:8080").getHostOrIp()); + Assert.assertEquals("[fe80::f816:3eff:feda:38cd%eth0]", + NetUtils.parseIpPort("[fe80::f816:3eff:feda:38cd%eth0]:8080").getHostOrIp()); + Assert.assertEquals("[fe80::38f7:44b8:8ab1:468%16]", + NetUtils.parseIpPort("[fe80::38f7:44b8:8ab1:468%16]:8080").getHostOrIp()); + Assert.assertEquals(8080, NetUtils.parseIpPort("[::1]:8080").getPort()); + Assert.assertEquals(8080, NetUtils.parseIpPort("[::]:8080").getPort()); + Assert.assertEquals(8080, NetUtils.parseIpPort("[fe80::f816:3eff:feda:38cd%eth0]:8080").getPort()); + Assert.assertEquals(8080, NetUtils.parseIpPort("[fe80::38f7:44b8:8ab1:468%16]:8080").getPort()); + + Assert.assertEquals("[::1]", NetUtils.parseIpPortFromURI("rest://[::1]:8080").getHostOrIp()); + Assert.assertEquals("[::]", NetUtils.parseIpPortFromURI("rest://[::]:8080").getHostOrIp()); + Assert.assertEquals("[fe80::f816:3eff:feda:38cd%eth0]", + NetUtils.parseIpPortFromURI("rest://[fe80::f816:3eff:feda:38cd%eth0]:8080").getHostOrIp()); + Assert.assertEquals("[fe80::38f7:44b8:8ab1:468%16]", + NetUtils.parseIpPortFromURI("rest://[fe80::38f7:44b8:8ab1:468%16]:8080").getHostOrIp()); + Assert.assertEquals(8080, NetUtils.parseIpPortFromURI("rest://[::1]:8080").getPort()); + Assert.assertEquals(80, NetUtils.parseIpPortFromURI("http://[::1]").getPort()); + Assert.assertEquals(8080, NetUtils.parseIpPortFromURI("https://[::1]:8080").getPort()); + Assert.assertEquals(443, NetUtils.parseIpPortFromURI("https://[::1]").getPort()); + + Assert.assertEquals(30000, NetUtils.parseIpPort("http", "[fe80::f816:3eff:feda:38cd%eth0]:30000").getPort()); + Assert.assertEquals("[fe80::f816:3eff:feda:38cd%eth0]", + NetUtils.parseIpPort("http", "[fe80::f816:3eff:feda:38cd%eth0]:30000").getHostOrIp()); + Assert.assertEquals(30000, NetUtils.parseIpPort("https", "[fe80::f816:3eff:feda:38cd%eth0]:30000").getPort()); + Assert.assertEquals("[fe80::f816:3eff:feda:38cd%eth0]", + NetUtils.parseIpPort("https", "[fe80::f816:3eff:feda:38cd%eth0]:30000").getHostOrIp()); + Assert.assertEquals(80, NetUtils.parseIpPort("http", "[fe80::f816:3eff:feda:38cd%eth0]").getPort()); + Assert.assertEquals("[fe80::f816:3eff:feda:38cd%eth0]", + NetUtils.parseIpPort("http", "[fe80::f816:3eff:feda:38cd%eth0]").getHostOrIp()); + Assert.assertEquals(443, NetUtils.parseIpPort("https", "[fe80::f816:3eff:feda:38cd%eth0]").getPort()); + Assert.assertEquals("[fe80::f816:3eff:feda:38cd%eth0]", + NetUtils.parseIpPort("https", "[fe80::f816:3eff:feda:38cd%eth0]").getHostOrIp()); } @Test @@ -64,8 +118,9 @@ public void testFullOperation() { @Test public void testGetRealListenAddress() { Assert.assertNull(NetUtils.getRealListenAddress("http", null)); - Assert.assertNull(NetUtils.getRealListenAddress("http:1", "1.1.1.1:8080")); Assert.assertEquals("http://1.1.1.1:8080", NetUtils.getRealListenAddress("http", "1.1.1.1:8080")); + + checkException(v -> NetUtils.getRealListenAddress("http:1", "1.1.1.1:8080")); } @Test @@ -82,7 +137,7 @@ public void testNetworkInterface() { try { NetUtils.ensureGetInterfaceAddress("xxx"); - Assert.fail("must throw exception"); + fail("must throw exception"); } catch (IllegalArgumentException e) { Assert.assertEquals("Can not find address for interface name: xxx", e.getMessage()); } @@ -109,7 +164,7 @@ public void testCanTcpListenYes() throws IOException { } @Test - public void humanReadableBytes() throws IOException { + public void humanReadableBytes() { Assert.assertEquals("0", NetUtils.humanReadableBytes(0L)); Assert.assertEquals("1", NetUtils.humanReadableBytes(1L)); Assert.assertEquals("1023", NetUtils.humanReadableBytes(1023L)); @@ -158,4 +213,13 @@ public void testGetHostAddress() { Deencapsulation.setField(NetUtils.class, "hostAddress", null); Assert.assertNotEquals(null, NetUtils.getHostAddress()); } + + public void checkException(Consumer