Skip to content

Agent Mesh

Filter DNS resolution to dnsaddr multiaddresses to allow private IP relays locally

Antonio Ojea720a20b3861c
diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.go
index 2b72c720..3899cabb 100644
--- a/cmd/sam-node/node.go
+++ b/cmd/sam-node/node.go
@@ -143,7 +143,7 @@ func (n *SamNode) UpdateRelays(addrs []multiaddr.Multiaddr) {
defer n.mu.Unlock()
var newRelays []peer.AddrInfo
for _, addr := range addrs {
- resolvedAddrs, err := madns.DefaultResolver.Resolve(context.Background(), stripP2pFromDnsaddr(addr))
+ resolvedAddrs, err := resolveAddrIfNeeded(context.Background(), addr)
if err != nil {
resolvedAddrs = []multiaddr.Multiaddr{addr}
}
@@ -176,6 +176,14 @@ func stripP2pFromDnsaddr(addr multiaddr.Multiaddr) multiaddr.Multiaddr {
return addr
}
+func resolveAddrIfNeeded(ctx context.Context, addr multiaddr.Multiaddr) ([]multiaddr.Multiaddr, error) {
+ _, err := addr.ValueForProtocol(multiaddr.P_DNSADDR)
+ if err != nil {
+ return []multiaddr.Multiaddr{addr}, nil
+ }
+ return madns.DefaultResolver.Resolve(ctx, stripP2pFromDnsaddr(addr))
+}
+
// SamNodeConfig holds all configuration options for a SamNode.
type SamNodeConfig struct {
PrivKey crypto.PrivKey
@@ -241,7 +249,7 @@ func NewSamNode(ctx context.Context, cfg SamNodeConfig) (*SamNode, error) {
// Convert Hub multiaddrs to peer.AddrInfo to use as static relays
var staticRelays []peer.AddrInfo
for _, addr := range cfg.HubAddrs {
- resolvedAddrs, err := madns.DefaultResolver.Resolve(ctx, stripP2pFromDnsaddr(addr))
+ resolvedAddrs, err := resolveAddrIfNeeded(ctx, addr)
if err != nil {
resolvedAddrs = []multiaddr.Multiaddr{addr}
}
@@ -620,7 +628,7 @@ dhtLoop:
}
func (n *SamNode) ConnectAndAuthWithHub(ctx context.Context, addr multiaddr.Multiaddr) error {
- resolvedAddrs, err := madns.DefaultResolver.Resolve(ctx, stripP2pFromDnsaddr(addr))
+ resolvedAddrs, err := resolveAddrIfNeeded(ctx, addr)
if err != nil {
resolvedAddrs = []multiaddr.Multiaddr{addr}
}