From a7163d46a6414c38c3eb4ba1e6783b3c158312db Mon Sep 17 00:00:00 2001 From: 2xsaiko Date: Thu, 4 Jun 2020 10:10:53 +0200 Subject: Move ServerAddress to enigma-server --- .../java/cuchaz/enigma/network/ServerAddress.java | 78 ++++++++++++++++++++++ .../cuchaz/enigma/network/ServerAddressTest.java | 28 ++++++++ 2 files changed, 106 insertions(+) create mode 100644 enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java create mode 100644 enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java (limited to 'enigma-server/src') diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java b/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java new file mode 100644 index 0000000..45e0750 --- /dev/null +++ b/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java @@ -0,0 +1,78 @@ +package cuchaz.enigma.network; + +import java.util.Objects; + +import javax.annotation.Nullable; + +public class ServerAddress { + + public final String address; + public final int port; + + private ServerAddress(String address, int port) { + this.address = address; + this.port = port; + } + + @Nullable + public static ServerAddress of(String address, int port) { + if (port < 0 || port > 65535) return null; + if (address == null) return null; + if (address.equals("")) return null; + if (!address.matches("[a-zA-Z0-9.:-]+")) return null; + if (address.startsWith("-") || address.endsWith("-")) return null; + return new ServerAddress(address, port); + } + + @Nullable + public static ServerAddress from(String s, int defaultPort) { + String address; + int idx = s.indexOf(']'); + if (s.startsWith("[") && idx != -1) { + address = s.substring(1, idx); + s = s.substring(idx + 1); + } else if (s.chars().filter(c -> c == ':').count() == 1) { + idx = s.indexOf(':'); + address = s.substring(0, idx); + s = s.substring(idx); + } else { + address = s; + s = ""; + } + + int port; + if (s.isEmpty()) { + port = defaultPort; + } else if (s.startsWith(":")) { + s = s.substring(1); + try { + port = Integer.parseInt(s); + } catch (NumberFormatException e) { + return null; + } + } else { + return null; + } + return ServerAddress.of(address, port); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ServerAddress that = (ServerAddress) o; + return port == that.port && + Objects.equals(address, that.address); + } + + @Override + public int hashCode() { + return Objects.hash(address, port); + } + + @Override + public String toString() { + return String.format("ServerAddress { address: '%s', port: %d }", address, port); + } + +} diff --git a/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java b/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java new file mode 100644 index 0000000..3765f7a --- /dev/null +++ b/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java @@ -0,0 +1,28 @@ +package cuchaz.enigma.network; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +public class ServerAddressTest { + + @Test + public void validAddresses() { + assertEquals(ServerAddress.of("127.0.0.1", 22), ServerAddress.from("127.0.0.1", 22)); + assertEquals(ServerAddress.of("::1", 80), ServerAddress.from("[::1]:80", 22)); + assertEquals(ServerAddress.of("dblsaiko.net", 22), ServerAddress.from("dblsaiko.net", 22)); + assertEquals(ServerAddress.of("f00f:efee::127.0.0.1", 724), ServerAddress.from("[f00f:efee::127.0.0.1]:724", 22)); + assertEquals(ServerAddress.of("aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:70", 22), ServerAddress.from("aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:70", 22)); + assertEquals(ServerAddress.of("::1", 22), ServerAddress.from("::1", 22)); + assertEquals(ServerAddress.of("0", 22), ServerAddress.from("0", 22)); + } + + @Test + public void invalidAddresses() { + assertNull(ServerAddress.from("127.0.0.1:-72", 22)); + assertNull(ServerAddress.from("127.0.0.1:100000000", 22)); + assertNull(ServerAddress.from("127.0.0.1:lmao", 22)); + } + +} -- cgit v1.2.3