Implement garlic 32

Author: ianopolous

src/main/java/io/ipfs/multiaddr/Protocol.java

@@ -165,8 +165,26 @@ public byte[] addressToBytes(String addr) {
                     dout.writeShort(port);
                     dout.flush();
                     return b.toByteArray();
-                }
-                case UNIX: {
+                } case GARLIC32: {
+                    // an i2p base32 address with a length of greater than 55 characters is
+                    // using an Encrypted Leaseset v2. all other base32 addresses will always be
+                    // exactly 52 characters
+                    if (addr.length() < 55 && addr.length() != 52 || addr.contains(":")) {
+                        throw new IllegalStateException(String.format("Invalid garlic addr: %s not a i2p base32 address. len: %d", addr, addr.length()));
+                    }
+
+                    while (addr.length() % 8 != 0) {
+                        addr += "=";
+                    }
+
+                    ByteArrayOutputStream bout = new ByteArrayOutputStream();
+                    byte[] hashBytes =  Multibase.decode(Multibase.Base.Base32.prefix + addr);;
+                    byte[] varint = new byte[(32 - Integer.numberOfLeadingZeros(hashBytes.length) + 6) / 7];
+                    putUvarint(varint, hashBytes.length);
+                    bout.write(varint);
+                    bout.write(hashBytes);
+                    return bout.toByteArray();
+                } case UNIX: {
                     if (addr.startsWith("/"))
                         addr = addr.substring(1);
                     byte[] path = addr.getBytes();
@@ -229,6 +247,15 @@ public String readAddress(InputStream in) throws IOException {
                 read(in, host);
                 String port = Integer.toString((in.read() << 8) | (in.read()));
                 return Multibase.encode(Multibase.Base.Base32, host).substring(1) + ":" + port;
+            } case GARLIC32: {
+                buf = new byte[sizeForAddress];
+                read(in, buf);
+                // an i2p base64 for an Encrypted Leaseset v2 will be at least 35 bytes
+                // long other than that, they will be exactly 32 bytes
+                if (buf.length < 35 && buf.length != 32) {
+                    throw new IllegalStateException("Invalid garlic addr length: " + buf.length);
+                }
+                return Multibase.encode(Multibase.Base.Base32, buf).substring(1);
             } case UNIX:
                 buf = new byte[sizeForAddress];
                 read(in, buf);

src/test/java/io/ipfs/api/MultiAddressTest.java

@@ -45,11 +45,11 @@ public void fails() {
 //                "/garlic64/jT~IyXaoauTni6N4517EG8mrFUKpy0IlgZh-EY9csMAk82Odatmzr~YTZy8Hv7u~wvkg75EFNOyqb~nAPg-khyp2TS~ObUz8WlqYAM2VlEzJ7wJB91P-cUlKF18zSzVoJFmsrcQHZCirSbWoOknS6iNmsGRh5KVZsBEfp1Dg3gwTipTRIx7Vl5Vy~1OSKQVjYiGZS9q8RL0MF~7xFiKxZDLbPxk0AK9TzGGqm~wMTI2HS0Gm4Ycy8LYPVmLvGonIBYndg2bJC7WLuF6tVjVquiokSVDKFwq70BCUU5AU-EvdOD5KEOAM7mPfw-gJUG4tm1TtvcobrObqoRnmhXPTBTN5H7qDD12AvlwFGnfAlBXjuP4xOUAISL5SRLiulrsMSiT4GcugSI80mF6sdB0zWRgL1yyvoVWeTBn1TqjO27alr95DGTluuSqrNAxgpQzCKEWAyzrQkBfo2avGAmmz2NaHaAvYbOg0QSJz1PLjv2jdPW~ofiQmrGWM1cd~1cCqAAAA:0",
 //                "/garlic64/jT~IyXaoauTni6N4517EG8mrFUKpy0IlgZh-EY9csMAk82Odatmzr~YTZy8Hv7u~wvkg75EFNOyqb~nAPg-khyp2TS~ObUz8WlqYAM2VlEzJ7wJB91P-cUlKF18zSzVoJFmsrcQHZCirSbWoOknS6iNmsGRh5KVZsBEfp1Dg3gwTipTRIx7Vl5Vy~1OSKQVjYiGZS9q8RL0MF~7xFiKxZDLbPxk0AK9TzGGqm~wMTI2HS0Gm4Ycy8LYPVmLvGonIBYndg2bJC7WLuF6tVjVquiokSVDKFwq70BCUU5AU-EvdOD5KEOAM7mPfw-gJUG4tm1TtvcobrObqoRnmhXPTBTN5H7qDD12AvlwFGnfAlBXjuP4xOUAISL5SRLiulrsMSiT4GcugSI80mF6sdB0zWRgL1yyvoVWeTBn1TqjO27alr95DGTluuSqrNAxgpQzCKEWAyzrQkBfo2avGAmmz2NaHaAvYbOg0QSJz1PLjv2jdPW~ofiQmrGWM1cd~1cCqAAAA:-1",
 //                "/garlic64/jT~IyXaoauTni6N4517EG8mrFUKpy0IlgZh-EY9csMAk82Odatmzr~YTZy8Hv7u~wvkg75EFNOyqb~nAPg-khyp2TS~ObUz8WlqYAM2VlEzJ7wJB91P-cUlKF18zSzVoJFmsrcQHZCirSbWoOknS6iNmsGRh5KVZsBEfp1Dg3gwTipTRIx7Vl5Vy~1OSKQVjYiGZS9q8RL0MF~7xFiKxZDLbPxk0AK9TzGGqm~wMTI2HS0Gm4Ycy8LYPVmLvGonIBYndg2bJC7WLuF6tVjVquiokSVDKFwq70BCUU5AU-EvdOD5KEOAM7mPfw-gJUG4tm1TtvcobrObqoRnmhXPTBTN5H7qDD12AvlwFGnfAlBXjuP4xOUAISL5SRLiulrsMSiT4GcugSI80mF6sdB0zWRgL1yyvoVWeTBn1TqjO27alr95DGTluuSqrNAxgpQzCKEWAyzrQkBfo2avGAmmz2NaHaAvYbOg0QSJz1PLjv2jdPW~ofiQmrGWM1cd~1cCqAAAA@:666",
-//                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu",
-//                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu77",
-//                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu:80",
-//                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzuq:-1",
-//                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu@",
+                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu",
+                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu77",
+                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu:80",
+                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzuq:-1",
+                "/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzu@",
                 "/udp/1234/sctp",
                 "/udp/1234/udt/1234",
                 "/udp/1234/utp/1234",
@@ -162,7 +162,7 @@ public void conversion() {
             if (!s.equals(new MultiAddress(fromHex(h)).toString()))
                 throw new IllegalStateException(s + " != " + new MultiAddress(fromHex(h)));
             if (! Arrays.equals(new MultiAddress(s).getBytes(), fromHex(h)))
-                throw new IllegalStateException("bytes for " + s + " != " + new MultiAddress(fromHex(h)));
+                throw new IllegalStateException("bytes for " + s + " != " + fromHex(h));
         };
 
         test.accept("/ip4/159.89.141.29/udp/5491/quic", "049f598d1d91021573cc03");
@@ -186,8 +186,8 @@ public void conversion() {
 //                        "e3139400848be5244b8ae96bb0c4a24f819cba0488f34985eac741d3359180bd72cafa1559e4c19f54ea8cedbb6a" +
 //                        "5afde4319396eb92aab340c60a50cc2284580cb3ad09017e8d9abc60269b3d8d687680bd86ce834412273d4f2e3b" +
 //                        "f68dd3d6fe87e2426ac658cd5c77fd5c0aa000000");
-//        test.accept("/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzuq",
-//                "bf0320efbcd45d0c5dc79781ac6f20ea5055a036afb48d45a52e7d68ec7d4338919e69");
+        test.accept("/garlic32/566niximlxdzpanmn4qouucvua3k7neniwss47li5r6ugoertzuq",
+                "bf0320efbcd45d0c5dc79781ac6f20ea5055a036afb48d45a52e7d68ec7d4338919e69");
     }
 
    @Test