Merge pull request #65 from gjeanmart/master

Support for SSL API endpoint such as Infura (https://ipfs.infura.io/)

Author: ianopolous

src/main/java/io/ipfs/api/IPFS.java

@@ -21,6 +21,7 @@ public enum PinType {all, direct, indirect, recursive}
 
     public final String host;
     public final int port;
+    public final String protocol;
     private final String version;
     public final Key key = new Key();
     public final Pin pin = new Pin();
@@ -39,22 +40,29 @@ public enum PinType {all, direct, indirect, recursive}
     public final Stats stats = new Stats();
     public final Name name = new Name();
     public final Pubsub pubsub = new Pubsub();
-
+    
     public IPFS(String host, int port) {
-        this(host, port, "/api/v0/");
+        this(host, port, "/api/v0/", false);
     }
 
     public IPFS(String multiaddr) {
         this(new MultiAddress(multiaddr));
     }
 
     public IPFS(MultiAddress addr) {
-        this(addr.getHost(), addr.getTCPPort(), "/api/v0/");
+        this(addr.getHost(), addr.getTCPPort(), "/api/v0/", detectSSL(addr));
     }
 
-    public IPFS(String host, int port, String version) {
+    public IPFS(String host, int port, String version, boolean ssl) {
         this.host = host;
         this.port = port;
+        
+        if(ssl) {
+            this.protocol = "https";
+        } else {
+            this.protocol = "http";
+        }
+        
         this.version = version;
         // Check IPFS is sufficiently recent
         try {
@@ -65,7 +73,7 @@ public IPFS(String host, int port, String version) {
             throw new RuntimeException(e);
         }
     }
-
+    
     public List<MerkleNode> add(NamedStreamable file) throws IOException {
         return add(file, false);
     }
@@ -79,7 +87,7 @@ public List<MerkleNode> add(NamedStreamable file, boolean wrap, boolean hashOnly
     }
 
     public List<MerkleNode> add(List<NamedStreamable> files, boolean wrap, boolean hashOnly) throws IOException {
-        Multipart m = new Multipart("http://" + host + ":" + port + version + "add?w="+wrap + "&n="+hashOnly, "UTF-8");
+        Multipart m = new Multipart(protocol + "://" + host + ":" + port + version + "add?w="+wrap + "&n="+hashOnly, "UTF-8");
         for (NamedStreamable file: files) {
             if (file.isDirectory()) {
                 m.addSubtree(Paths.get(""), file);
@@ -285,7 +293,7 @@ public List<MerkleNode> put(List<byte[]> data, Optional<String> format) throws I
 
         public MerkleNode put(byte[] data, Optional<String> format) {
             String fmt = format.map(f -> "&format=" + f).orElse("");
-            Multipart m = new Multipart("http://" + host + ":" + port + version+"block/put?stream-channels=true" + fmt, "UTF-8");
+            Multipart m = new Multipart(protocol +"://" + host + ":" + port + version+"block/put?stream-channels=true" + fmt, "UTF-8");
             m.addFilePart("file", Paths.get(""), new NamedStreamable.ByteArrayWrapper(data));
             String res = m.finish();
             return JSONParser.parseStream(res).stream().map(x -> MerkleNode.fromJSON((Map<String, Object>) x)).findFirst().get();
@@ -300,7 +308,7 @@ public Map stat(Multihash hash) throws IOException {
      */
     public class IPFSObject {
         public List<MerkleNode> put(List<byte[]> data) throws IOException {
-            Multipart m = new Multipart("http://" + host + ":" + port + version+"object/put?stream-channels=true", "UTF-8");
+            Multipart m = new Multipart(protocol +"://" + host + ":" + port + version+"object/put?stream-channels=true", "UTF-8");
             for (byte[] f : data)
                 m.addFilePart("file", Paths.get(""), new NamedStreamable.ByteArrayWrapper(f));
             String res = m.finish();
@@ -310,7 +318,7 @@ public List<MerkleNode> put(List<byte[]> data) throws IOException {
         public List<MerkleNode> put(String encoding, List<byte[]> data) throws IOException {
             if (!"json".equals(encoding) && !"protobuf".equals(encoding))
                 throw new IllegalArgumentException("Encoding must be json or protobuf");
-            Multipart m = new Multipart("http://" + host + ":" + port + version+"object/put?stream-channels=true&encoding="+encoding, "UTF-8");
+            Multipart m = new Multipart(protocol +"://" + host + ":" + port + version+"object/put?stream-channels=true&encoding="+encoding, "UTF-8");
             for (byte[] f : data)
                 m.addFilePart("file", Paths.get(""), new NamedStreamable.ByteArrayWrapper(f));
             String res = m.finish();
@@ -364,7 +372,7 @@ public MerkleNode patch(Multihash base, String command, Optional<byte[]> data, O
                 case "append-data":
                     if (!data.isPresent())
                         throw new IllegalStateException("set-data requires data!");
-                    Multipart m = new Multipart("http://" + host + ":" + port + version+"object/patch/"+command+"?arg="+base.toBase58()+"&stream-channels=true", "UTF-8");
+                    Multipart m = new Multipart(protocol +"://" + host + ":" + port + version+"object/patch/"+command+"?arg="+base.toBase58()+"&stream-channels=true", "UTF-8");
                     m.addFilePart("file", Paths.get(""), new NamedStreamable.ByteArrayWrapper(data.get()));
                     String res = m.finish();
                     return MerkleNode.fromJSON(JSONParser.parse(res));
@@ -502,7 +510,7 @@ public MerkleNode put(byte[] object, String outputFormat) throws IOException {
 
         public MerkleNode put(String inputFormat, byte[] object, String outputFormat) throws IOException {
             block.put(Arrays.asList(object));
-            String prefix = "http://" + host + ":" + port + version;
+            String prefix = protocol +"://" + host + ":" + port + version;
             Multipart m = new Multipart(prefix + "block/put/?stream-channels=true&input-enc=" + inputFormat + "&f=" + outputFormat, "UTF-8");
             m.addFilePart("file", Paths.get(""), new NamedStreamable.ByteArrayWrapper(object));
             String res = m.finish();
@@ -558,7 +566,7 @@ public Map show() throws IOException {
         }
 
         public void replace(NamedStreamable file) throws IOException {
-            Multipart m = new Multipart("http://" + host + ":" + port + version+"config/replace?stream-channels=true", "UTF-8");
+            Multipart m = new Multipart(protocol +"://" + host + ":" + port + version+"config/replace?stream-channels=true", "UTF-8");
             m.addFilePart("file", Paths.get(""), file);
             String res = m.finish();
         }
@@ -629,7 +637,7 @@ private void retrieveAndParseStream(String path, Consumer<Object> results, Consu
     }
 
     private byte[] retrieve(String path) throws IOException {
-        URL target = new URL("http", host, port, version + path);
+        URL target = new URL(protocol, host, port, version + path);
         return IPFS.get(target);
     }
 
@@ -688,7 +696,7 @@ private static InputStream getStream(URL target) throws IOException {
     }
 
     private Map postMap(String path, byte[] body, Map<String, String> headers) throws IOException {
-        URL target = new URL("http", host, port, version + path);
+        URL target = new URL(protocol, host, port, version + path);
         return (Map) JSONParser.parse(new String(post(target, body, headers)));
     }
 
@@ -716,4 +724,8 @@ private static final byte[] readFully(InputStream in) throws IOException {
             resp.write(buf, 0, r);
         return resp.toByteArray();
     }
+    
+    private static boolean detectSSL(MultiAddress multiaddress) {
+        return multiaddress.toString().contains("/https");
+    }
 }