From 8c560f514515e6579600420c654942eddd025a89 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 9 Jul 2019 13:07:55 -0700 Subject: [PATCH] add plain dns support per https://github.com/multiformats/multiaddr/issues/22#issuecomment-268015055 --- dns.go | 5 +++++ go.mod | 2 +- go.sum | 34 ++++++++++++++++++---------------- resolve.go | 21 +++++++++++---------- resolve_test.go | 13 +++++++++++++ 5 files changed, 48 insertions(+), 27 deletions(-) diff --git a/dns.go b/dns.go index 6b8ccd0..4a5a934 100644 --- a/dns.go +++ b/dns.go @@ -6,6 +6,8 @@ import ( // Extracted from source of truth for multicodec codes: https://github.com/multiformats/multicodec const ( + // Deprecated: use ma.P_DNS + P_DNS = ma.P_DNS // Deprecated: use ma.P_DNS4 P_DNS4 = ma.P_DNS4 // Deprecated: use ma.P_DNS6 @@ -14,6 +16,9 @@ const ( P_DNSADDR = ma.P_DNSADDR ) +// Deprecated: use ma.ProtocolWithCode(P_DNS) +var DnsProtocol = ma.ProtocolWithCode(P_DNS) + // Deprecated: use ma.ProtocolWithCode(P_DNS4) var Dns4Protocol = ma.ProtocolWithCode(P_DNS4) diff --git a/go.mod b/go.mod index c1d394a..0824647 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module github.com/multiformats/go-multiaddr-dns -require github.com/multiformats/go-multiaddr v0.1.0 +require github.com/multiformats/go-multiaddr v0.1.1 go 1.12 diff --git a/go.sum b/go.sum index 87f7a09..0061b94 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,20 @@ -github.com/gxed/hashland/keccakpg v0.0.1 h1:wrk3uMNaMxbXiHibbPO4S0ymqJMm41WiudyFSs7UnsU= -github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU= -github.com/gxed/hashland/murmur3 v0.0.1 h1:SheiaIt0sda5K+8FLz952/1iWS9zrnKsEJaOJu4ZbSc= -github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g= github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= -github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16 h1:5W7KhL8HVF3XCFOweFD3BNESdnO8ewyYTFT2R+/b8FQ= -github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= -github.com/mr-tron/base58 v1.1.0 h1:Y51FGVJ91WBqCEabAi5OPUz38eAx8DakuAm5svLcsfQ= -github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= -github.com/multiformats/go-multiaddr v0.1.0 h1:fkISCUNDb3xIpCcI6BGlPsQE+ywcxzimOsUnHWnrE74= -github.com/multiformats/go-multiaddr v0.1.0/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44= -github.com/multiformats/go-multihash v0.0.1 h1:HHwN1K12I+XllBCrqKnhX949Orn4oawPkegHMu2vDqQ= -github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 h1:ng3VDlRp5/DHpSWl02R4rM9I+8M2rhmsuLwAMmkLQWE= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/sys v0.0.0-20190219092855-153ac476189d h1:Z0Ahzd7HltpJtjAHHxX8QFP3j1yYgiuvjbjRzDj/KH0= -golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo= +github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= +github.com/mr-tron/base58 v1.1.2 h1:ZEw4I2EgPKDJ2iEw0cNmLB3ROrEmkOtXIkaG7wZg+78= +github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/multiformats/go-multiaddr v0.1.1 h1:rVAztJYMhCQ7vEFr8FvxW3mS+HF2eY/oPbOMeS0ZDnE= +github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo= +github.com/multiformats/go-multihash v0.0.8 h1:wrYcW5yxSi3dU07n5jnuS5PrNwyHy0zRHGVoUugWvXg= +github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= +github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/resolve.go b/resolve.go index a85490c..e2f5d2e 100644 --- a/resolve.go +++ b/resolve.go @@ -8,7 +8,7 @@ import ( ma "github.com/multiformats/go-multiaddr" ) -var ResolvableProtocols = []ma.Protocol{DnsaddrProtocol, Dns4Protocol, Dns6Protocol} +var ResolvableProtocols = []ma.Protocol{DnsaddrProtocol, Dns4Protocol, Dns6Protocol, DnsProtocol} var DefaultResolver = &Resolver{Backend: net.DefaultResolver} const dnsaddrTXTPrefix = "dnsaddr=" @@ -48,7 +48,7 @@ func (r *MockBackend) LookupTXT(ctx context.Context, name string) ([]string, err func Matches(maddr ma.Multiaddr) (matches bool) { ma.ForEach(maddr, func(c ma.Component) bool { switch c.Protocol().Code { - case Dns4Protocol.Code, Dns6Protocol.Code, DnsaddrProtocol.Code: + case DnsProtocol.Code, Dns4Protocol.Code, Dns6Protocol.Code, DnsaddrProtocol.Code: matches = true } return !matches @@ -66,7 +66,7 @@ func (r *Resolver) Resolve(ctx context.Context, maddr ma.Multiaddr) ([]ma.Multia var keep ma.Multiaddr keep, maddr = ma.SplitFunc(maddr, func(c ma.Component) bool { switch c.Protocol().Code { - case Dns4Protocol.Code, Dns6Protocol.Code, DnsaddrProtocol.Code: + case DnsProtocol.Code, Dns4Protocol.Code, Dns6Protocol.Code, DnsaddrProtocol.Code: return true default: return false @@ -97,8 +97,9 @@ func (r *Resolver) Resolve(ctx context.Context, maddr ma.Multiaddr) ([]ma.Multia var resolved []ma.Multiaddr switch proto.Code { - case Dns4Protocol.Code, Dns6Protocol.Code: - v4 := proto.Code == Dns4Protocol.Code + case Dns4Protocol.Code, Dns6Protocol.Code, DnsProtocol.Code: + v4only := proto.Code == Dns4Protocol.Code + v6only := proto.Code == Dns6Protocol.Code // XXX: Unfortunately, go does a pretty terrible job of // differentiating between IPv6 and IPv4. A v4-in-v6 @@ -115,16 +116,16 @@ func (r *Resolver) Resolve(ctx context.Context, maddr ma.Multiaddr) ([]ma.Multia err error ) ip4 := r.IP.To4() - if v4 { - if ip4 == nil { + if ip4 == nil { + if v4only { continue } - rmaddr, err = ma.NewMultiaddr("/ip4/" + ip4.String()) + rmaddr, err = ma.NewMultiaddr("/ip6/" + r.IP.String()) } else { - if ip4 != nil { + if v6only { continue } - rmaddr, err = ma.NewMultiaddr("/ip6/" + r.IP.String()) + rmaddr, err = ma.NewMultiaddr("/ip4/" + ip4.String()) } if err != nil { return nil, err diff --git a/resolve_test.go b/resolve_test.go index 12066df..1334611 100644 --- a/resolve_test.go +++ b/resolve_test.go @@ -48,6 +48,9 @@ func TestMatches(t *testing.T) { // need to depend on the circuit package to parse it. t.Fatalf("expected match, didn't: /tcp/1234/dns6/example.com") } + if !Matches(ma.StringCast("/dns/example.com")) { + t.Fatalf("expected match, didn't: /dns/example.com") + } if !Matches(ma.StringCast("/dns4/example.com")) { t.Fatalf("expected match, didn't: /dns4/example.com") } @@ -81,6 +84,16 @@ func TestSimpleIPResolve(t *testing.T) { if len(addrs6) != 2 || !addrs6[0].Equal(ip6ma) || addrs6[0].Equal(ip6mb) { t.Fatalf("expected [%s %s], got %+v", ip6ma, ip6mb, addrs6) } + + addrs, err := resolver.Resolve(ctx, ma.StringCast("/dns/example.com")) + if err != nil { + t.Error(err) + } + for i, expected := range []ma.Multiaddr{ip4ma, ip4mb, ip6ma, ip6mb} { + if !expected.Equal(addrs[i]) { + t.Fatalf("%d: expected %s, got %s", i, expected, addrs[i]) + } + } } func TestResolveMultiple(t *testing.T) {