Resolve bootstrap addresses before connecting in manifest server (#639)

Resolve the bootstrap addresses, which may be dnsaddrs, before
connecting to them in manifest server.

Author: masih

cmd/f3/manifest.go

@@ -13,6 +13,8 @@ import (
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/multiformats/go-multiaddr"
+	madns "github.com/multiformats/go-multiaddr-dns"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/sync/errgroup"
 )
@@ -187,11 +189,18 @@ var manifestServeCmd = cli.Command{
 				}
 			}
 			for _, bootstrapper := range bootstrappers {
-				addr, err := peer.AddrInfoFromString(bootstrapper)
-				if err != nil {
+				if maddr, err := multiaddr.NewMultiaddr(bootstrapper); err != nil {
 					_, _ = fmt.Fprintf(c.App.ErrWriter, "Failed to parse to bootstrap address: %s %v\n", bootstrapper, err)
-				} else if err := host.Connect(c.Context, *addr); err != nil {
-					_, _ = fmt.Fprintf(c.App.ErrWriter, "Failed to connect to bootstrap address: %v\n", err)
+				} else if multiaddrs, err := madns.Resolve(c.Context, maddr); err != nil {
+					_, _ = fmt.Fprintf(c.App.ErrWriter, "Failed to resolve bootstrap address: %s %v\n", bootstrapper, err)
+				} else if paddrinfos, err := peer.AddrInfosFromP2pAddrs(multiaddrs...); err != nil {
+					_, _ = fmt.Fprintf(c.App.ErrWriter, "Failed to build peer.AddrInfo for bootstrap address: %s %v\n", bootstrapper, err)
+				} else {
+					for _, paddrinfo := range paddrinfos {
+						if err := host.Connect(c.Context, paddrinfo); err != nil {
+							_, _ = fmt.Fprintf(c.App.ErrWriter, "Failed to connect to bootstrap address: %v\n", err)
+						}
+					}
 				}
 			}
 		}

go.mod

@@ -15,6 +15,8 @@ require (
 	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/libp2p/go-libp2p v0.35.0
 	github.com/libp2p/go-libp2p-pubsub v0.11.0
+	github.com/multiformats/go-multiaddr v0.12.4
+	github.com/multiformats/go-multiaddr-dns v0.3.1
 	github.com/multiformats/go-multibase v0.2.0
 	github.com/multiformats/go-multihash v0.2.3
 	github.com/parquet-go/parquet-go v0.23.0
@@ -85,8 +87,6 @@ require (
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
-	github.com/multiformats/go-multiaddr v0.12.4 // indirect
-	github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
 	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
 	github.com/multiformats/go-multicodec v0.9.0 // indirect
 	github.com/multiformats/go-multistream v0.5.0 // indirect