autodiscovery: Drop miekg/dns

Author: foxcpp

autodiscovery/dns.go

@@ -4,34 +4,23 @@ package autodiscovery
 
 import (
 	"errors"
+	"net"
 	"strconv"
-
-	"github.com/miekg/dns"
 )
 
 var ErrNoService = errors.New("autodiscovery: no DNS SRV record")
 
 // Probe attempts to perform JMAP service autodiscovery by looking for DNS SRV
 // entry. It returns URL of JMAP session resource. ErrNoService is returned in
 // case there is no DNS SRV record for passed domain.
-//
-// Since Go standard DNS operations don't support SRV queries, custom DNS
-// library is used and you have to provide related configuration options.
-func Probe(cl *dns.Client, cfg *dns.ClientConfig, domain string) (string, error) {
-	m := new(dns.Msg)
-	m.SetQuestion("_jmap._tcp."+dns.Fqdn(domain), dns.TypeSRV)
-	resp, _, err := cl.Exchange(m, cfg.Servers[0]+":"+cfg.Port)
+func Probe(domain string) (string, error) {
+	_, addrs, err := net.LookupSRV("jmap", "tcp", domain)
 	if err != nil {
 		return "", err
 	}
 
-	for _, ans := range resp.Answer {
-		srv, ok := ans.(*dns.SRV)
-		if !ok {
-			continue
-		}
-
-		return "https://" + srv.Target + ":" + strconv.Itoa(int(srv.Port)) + "/.well-known/jmap", nil
+	for _, addr := range addrs {
+		return "https://" + addr.Target + ":" + strconv.Itoa(int(addr.Port)) + "/.well-known/jmap", nil
 	}
 	return "", ErrNoService
 }

go.mod

@@ -2,11 +2,6 @@ module github.com/foxcpp/go-jmap
 
 require (
 	github.com/google/go-cmp v0.3.0 // indirect
-	github.com/miekg/dns v1.1.9
 	github.com/pkg/errors v0.8.1 // indirect
-	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
-	golang.org/x/net v0.0.0-20190514140710-3ec191127204 // indirect
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
-	golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 // indirect
 	gotest.tools v2.2.0+incompatible
 )

go.sum

@@ -1,21 +1,6 @@
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E=
-github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190514140710-3ec191127204 h1:4yG6GqBtw9C+UrLp6s2wtSniayy/Vd/3F7ffLE427XI=
-golang.org/x/net v0.0.0-20190514140710-3ec191127204/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 h1:khxRGsvPk4n2y8I/mLLjp7e5dMTJmH75wvqS6nMwUtY=
-golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=