From 56a09d31c3c4fd87dcfcb620f0cb123d264eb912 Mon Sep 17 00:00:00 2001 From: vishalmohanty Date: Thu, 28 Apr 2022 10:27:45 -0700 Subject: [PATCH 1/3] Convert name to lowercase in TargetedLookup --- pkg/miekg/miekg.go | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkg/miekg/miekg.go b/pkg/miekg/miekg.go index d7554596..d0e8e475 100644 --- a/pkg/miekg/miekg.go +++ b/pkg/miekg/miekg.go @@ -214,14 +214,14 @@ func (s *RoutineLookupFactory) Initialize(c *zdns.GlobalConf) { LocalAddr: &net.UDPAddr{IP: s.LocalAddr}, } if c.RecycleSockets { - // create PacketConn for use throughout thread's life - conn, err := net.ListenUDP("udp", &net.UDPAddr{s.LocalAddr, 0, ""}) - if err != nil { - log.Fatal("unable to create socket", err) - } - s.Conn = new(dns.Conn) - s.Conn.Conn = conn - } + // create PacketConn for use throughout thread's life + conn, err := net.ListenUDP("udp", &net.UDPAddr{s.LocalAddr, 0, ""}) + if err != nil { + log.Fatal("unable to create socket", err) + } + s.Conn = new(dns.Conn) + s.Conn.Conn = conn + } } if !c.UDPOnly { s.TCPClient = new(dns.Client) @@ -320,10 +320,10 @@ func DoLookupWorker(udp *dns.Client, tcp *dns.Client, conn *dns.Conn, q Question if udp != nil { res.Protocol = "udp" if conn != nil { - dst, _ := net.ResolveUDPAddr("udp", nameServer) - r, _, err = udp.ExchangeWithConnTo(m, conn, dst) + dst, _ := net.ResolveUDPAddr("udp", nameServer) + r, _, err = udp.ExchangeWithConnTo(m, conn, dst) } else { - r, _, err = udp.Exchange(m, nameServer) + r, _, err = udp.Exchange(m, nameServer) } // if record comes back truncated, but we have a TCP connection, try again with that if r != nil && (r.Truncated || r.Rcode == dns.RcodeBadTrunc) { @@ -809,6 +809,7 @@ func (s *Lookup) DoIpsLookup(lc LookupClient, name string, nameServer string, dn } func (s *Lookup) DoTargetedLookup(l LookupClient, name, nameServer string, lookupIpv4 bool, lookupIpv6 bool) (interface{}, []interface{}, zdns.Status, error) { + name = strings.ToLower(name) res := IpResult{} candidateSet := map[string][]Answer{} cnameSet := map[string][]Answer{} From fac1290f0022dc3ff22fa959620db430d054b75a Mon Sep 17 00:00:00 2001 From: vishalmohanty Date: Thu, 28 Apr 2022 11:39:12 -0700 Subject: [PATCH 2/3] Update all-nameservers mode to lookup via IPv4 NS only --- pkg/miekg/miekg.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/miekg/miekg.go b/pkg/miekg/miekg.go index d0e8e475..11ab78e9 100644 --- a/pkg/miekg/miekg.go +++ b/pkg/miekg/miekg.go @@ -945,7 +945,8 @@ func (s *Lookup) DoLookupAllNameservers(l LookupClient, name, nameServer string) for _, nserver := range nsResults.Servers { // Use all the ipv4 and ipv6 addresses of each nameserver nameserver := nserver.Name - ips := append(nserver.IPv4Addresses, nserver.IPv6Addresses...) + // TODO(#304): Figure out how to lookup via IPv6 addresses as well + ips := nserver.IPv4Addresses for _, ip := range ips { curServer = net.JoinHostPort(ip, "53") res, trace, status, _ := l.ProtocolLookup(s, Question{Name: name, Type: s.DNSType, Class: s.DNSClass}, curServer) From 62425e5b495421d322e60260531bf7de1610c126 Mon Sep 17 00:00:00 2001 From: vishalmohanty Date: Thu, 28 Apr 2022 11:48:05 -0700 Subject: [PATCH 3/3] Fix UT --- pkg/miekg/miekg_test.go | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/pkg/miekg/miekg_test.go b/pkg/miekg/miekg_test.go index e2090358..cb6b9b3f 100644 --- a/pkg/miekg/miekg_test.go +++ b/pkg/miekg/miekg_test.go @@ -940,7 +940,9 @@ func TestErrorInTargetedLookup(t *testing.T) { assert.Equal(t, status, protocolStatus[domain_ns_1]) } -// Test One NS with one IP with only ipv4-lookup +// Test One NS with one IP with only ipv4-lookup. Note that +// currently we do lookup only via IPv4 NS addresses and hence +// IPv6 NS addresses are ignored. func TestAllNsLookupOneNs(t *testing.T) { gc, a, mc := InitTest(t) @@ -1001,36 +1003,12 @@ func TestAllNsLookupOneNs(t *testing.T) { Flags: DNSFlags{}, } - ns3 := net.JoinHostPort(ipv6_1, "53") - domain_ns_3 := domain_ns{domain: domain1, ns: ns3} - ipv4_3 := "192.0.2.2" - mockResults[domain_ns_3] = Result{ - Answers: []interface{}{ - Answer{ - Ttl: 3600, - Type: "A", - Class: "IN", - Name: "example.com.", - Answer: ipv4_3, - }, - }, - Additional: nil, - Authorities: nil, - Protocol: "", - Flags: DNSFlags{}, - } - expectedRes := []ExtendedResult{ { Nameserver: ns_domain1, Status: zdns.STATUS_NOERROR, Res: mockResults[domain_ns_2], }, - { - Nameserver: ns_domain1, - Status: zdns.STATUS_NOERROR, - Res: mockResults[domain_ns_3], - }, } res, _, _, _ := a.DoLookupAllNameservers(mc, "example.com", ns1)