Update multiaddr to support Cid.

Fix bug in IPv4 tolerance
multiformats · May 24, 2017 · 4ac125c · 4ac125c
1 parent 913173f
commit 4ac125c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/lib/cid.jar b/lib/cid.jar
diff --git a/lib/multibase.jar b/lib/multibase.jar
diff --git a/lib/multihash.jar b/lib/multihash.jar
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>io.ipfs</groupId>
 	<artifactId>multiaddr</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
 	<name>multiaddr</name>
@@ -58,9 +58,19 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.multiformats</groupId>
-			<artifactId>java-multihash</artifactId>
+			<artifactId>java-multibase</artifactId>
 			<version>v1.0.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.multiformats</groupId>
+			<artifactId>java-multihash</artifactId>
+			<version>v1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.ipld</groupId>
+			<artifactId>java-cid</artifactId>
+			<version>v1.1.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/src/main/java/io/ipfs/multiaddr/Protocol.java b/src/main/java/io/ipfs/multiaddr/Protocol.java
@@ -1,12 +1,14 @@
 package io.ipfs.multiaddr;
 
 import io.ipfs.multihash.Multihash;
+import io.ipfs.cid.Cid;
 import java.io.*;
 import java.net.*;
 import java.util.*;
 
 public class Protocol {
     public static int LENGTH_PREFIXED_VAR_SIZE = -1;
+    private static final String IPV4_REGEX = "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z";
 
     enum Type {
         IP4(4, 32, "ip4"),
@@ -71,6 +73,8 @@ public byte[] addressToBytes(String addr) {
         try {
             switch (type) {
                 case IP4:
+                    if (! addr.matches(IPV4_REGEX))
+                        throw new IllegalStateException("Invalid IPv4 address: " + addr);
                     return Inet4Address.getByName(addr).getAddress();
                 case IP6:
                     return Inet6Address.getByName(addr).getAddress();
@@ -83,7 +87,7 @@ public byte[] addressToBytes(String addr) {
                         throw new IllegalStateException("Failed to parse "+type.name+" address "+addr + " (> 65535");
                     return new byte[]{(byte)(x >>8), (byte)x};
                 case IPFS:
-                    Multihash hash = Multihash.fromBase58(addr);
+                    Multihash hash = Cid.decode(addr);
                     ByteArrayOutputStream bout = new ByteArrayOutputStream();
                     byte[] hashBytes = hash.toBytes();
                     byte[] varint = new byte[(32 - Integer.numberOfLeadingZeros(hashBytes.length)+6)/7];
@@ -141,7 +145,7 @@ public String readAddress(InputStream in) throws IOException {
             case IPFS:
                 buf = new byte[sizeForAddress];
                 in.read(buf);
-                return new Multihash(buf).toBase58();
+                return Cid.cast(buf).toString();
             case ONION:
                 byte[] host = new byte[10];
                 in.read(host);

diff --git a/...t/java/org/ipfs/api/MultiAddressTest.java → ...st/java/io/ipfs/api/MultiAddressTest.java b/...t/java/org/ipfs/api/MultiAddressTest.java → ...st/java/io/ipfs/api/MultiAddressTest.java
@@ -1,5 +1,6 @@
-package io.ipfs.multiaddr;
+package io.ipfs.api;
 
+import io.ipfs.multiaddr.*;
 import org.junit.*;
 
 import java.io.*;
@@ -66,6 +67,7 @@ public void succeeds() {
                 "/udp/65535",
                 "/tcp/65535",
                 "/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC",
+                "/ipfs/zdpuAnNyxJR8tigBDe5FM2PfMq1u7fKSCsTmb4m3iJZcCq8yB",
                 "/udp/1234/sctp/1234",
                 "/udp/1234/udt",
                 "/udp/1234/utp",