Fix #462: Support DNS multiaddresses for node_multiaddress

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.9-stretch AS builder
+FROM golang:1.10-stretch AS builder
 MAINTAINER Hector Sanjuan <hector@protocol.ai>
 
 # This dockerfile builds and runs ipfs-cluster-service.

Dockerfile-test

@@ -1,4 +1,4 @@
-FROM golang:1.9-stretch AS builder
+FROM golang:1.10-stretch AS builder
 MAINTAINER Hector Sanjuan <hector@protocol.ai>
 
 # This build state just builds the cluster binaries

ipfsconn/ipfshttp/ipfshttp.go

@@ -25,9 +25,13 @@ import (
 	logging "github.com/ipfs/go-log"
 	peer "github.com/libp2p/go-libp2p-peer"
 	ma "github.com/multiformats/go-multiaddr"
+	madns "github.com/multiformats/go-multiaddr-dns"
 	manet "github.com/multiformats/go-multiaddr-net"
 )
 
+// DNSTimeout is used when resolving DNS multiaddresses in this module
+var DNSTimeout = 5 * time.Second
+
 var logger = logging.Logger("ipfshttp")
 
 // Connector implements the IPFSConnector interface
@@ -112,7 +116,20 @@ func NewConnector(cfg *Config) (*Connector, error) {
 		return nil, err
 	}
 
-	_, nodeAddr, err := manet.DialArgs(cfg.NodeAddr)
+	nodeMAddr := cfg.NodeAddr
+	// dns multiaddresses need to be resolved first
+	if madns.Matches(nodeMAddr) {
+		ctx, cancel := context.WithTimeout(context.Background(), DNSTimeout)
+		defer cancel()
+		resolvedAddrs, err := madns.Resolve(ctx, cfg.NodeAddr)
+		if err != nil {
+			logger.Error(err)
+			return nil, err
+		}
+		nodeMAddr = resolvedAddrs[0]
+	}
+
+	_, nodeAddr, err := manet.DialArgs(nodeMAddr)
 	if err != nil {
 		return nil, err
 	}

pstoremgr/pstoremgr.go

@@ -27,7 +27,7 @@ var logger = logging.Logger("pstoremgr")
 
 // Timeouts for network operations triggered by the Manager
 var (
-	DNSTimeout     = 2 * time.Second
+	DNSTimeout     = 5 * time.Second
 	ConnectTimeout = 10 * time.Second
 )