feat: rework engine and CLI for dnstraverse parity
Port the traversal engine to the Ruby dnstraverse model so behaviour and output match dns.squish.net: - dns: single RD=0 query path (RD=1 only for upstream root discovery), per-run packet cache, EDNS0 512-fallback with warnings, UDP->TCP on truncation; fix --retries 0 and --root-server IP-literal handling; drop all hardcoded 127.0.0.1:53 resolvers - traverse: hierarchical per-branch InfoCache, 7-step response classification with the full 10-status vocabulary, bailiwick partitioning, strictly-deeper lame-referral rule, refid grammar with .0 resolve subtrees and childset digits, per-IP branching at 1/n weight, cache-based glue resolution with noglue/loop dead ends, CNAME restarts from the deepest cached zone, fast-mode memoization, probability aggregation with Ruby-identical stats keys (sums to 1.0) - output: byte-for-byte reference text format pinned by a golden test, reference CLI defaults, working --quiet/--show-X=false, TTY-aware colour, deduplicated deterministic JSON - web: adapt API/SPA to the new engine, SSE events carry refid/status, fix subscribe/snapshot duplicate-event race and a statusCls TDZ bug, align SPA type list with the backend - delete the old engine and dead code (net -4,350 lines) Verified against live runs of the reference Ruby engine across five domains (answers, NXDOMAIN, null MX, CNAME restart, glueless resolve) with no divergences beyond the documented typo fixes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Gary Hansen
co-authored by
Claude Fable 5
Claude Fable 5
parent
af15c9c2d4
commit
d71c7fbef2
+366
-315
@@ -7,369 +7,420 @@ import (
|
||||
"net"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"gitea.hansenits.com.au/hits/ExploreDNS/internal/dns"
|
||||
idns "gitea.hansenits.com.au/hits/ExploreDNS/internal/dns"
|
||||
"gitea.hansenits.com.au/hits/ExploreDNS/internal/traverse"
|
||||
miekgdns "github.com/miekg/dns"
|
||||
"github.com/miekg/dns"
|
||||
)
|
||||
|
||||
// mockDelegation wires root → com → example.com (2 NS, one glueless answer
|
||||
// path) through the single injected exchange.
|
||||
func mockDelegation() idns.ExchangeFunc {
|
||||
responses := map[string]*dns.Msg{}
|
||||
set := func(server, qname string, msg *dns.Msg) {
|
||||
responses[server+"/"+dns.Fqdn(qname)] = msg
|
||||
}
|
||||
a := func(name, ip string) dns.RR {
|
||||
return &dns.A{
|
||||
Hdr: dns.RR_Header{Name: dns.Fqdn(name), Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 300},
|
||||
A: net.ParseIP(ip).To4(),
|
||||
}
|
||||
}
|
||||
ns := func(zone, target string) dns.RR {
|
||||
return &dns.NS{
|
||||
Hdr: dns.RR_Header{Name: dns.Fqdn(zone), Rrtype: dns.TypeNS, Class: dns.ClassINET, Ttl: 300},
|
||||
Ns: dns.Fqdn(target),
|
||||
}
|
||||
}
|
||||
|
||||
rootMsg := new(dns.Msg)
|
||||
rootMsg.Ns = []dns.RR{ns("com", "a.gtld-servers.net")}
|
||||
rootMsg.Extra = []dns.RR{a("a.gtld-servers.net", "192.5.6.30")}
|
||||
set("198.41.0.4", "www.example.com", rootMsg)
|
||||
|
||||
comMsg := new(dns.Msg)
|
||||
comMsg.Ns = []dns.RR{ns("example.com", "ns1.example.com"), ns("example.com", "ns2.example.com")}
|
||||
comMsg.Extra = []dns.RR{a("ns1.example.com", "1.1.1.1"), a("ns2.example.com", "2.2.2.2")}
|
||||
set("192.5.6.30", "www.example.com", comMsg)
|
||||
|
||||
answer := new(dns.Msg)
|
||||
answer.Answer = []dns.RR{a("www.example.com", "9.9.9.9")}
|
||||
set("1.1.1.1", "www.example.com", answer)
|
||||
set("2.2.2.2", "www.example.com", answer)
|
||||
|
||||
return func(_ context.Context, server string, msg *dns.Msg, _ bool) (*dns.Msg, error) {
|
||||
host := server
|
||||
if h, _, err := net.SplitHostPort(server); err == nil {
|
||||
host = h
|
||||
}
|
||||
resp, ok := responses[host+"/"+msg.Question[0].Name]
|
||||
if !ok {
|
||||
return nil, &net.DNSError{Err: "no mock", Name: msg.Question[0].Name}
|
||||
}
|
||||
out := resp.Copy()
|
||||
out.SetReply(msg)
|
||||
out.Answer, out.Ns, out.Extra = resp.Answer, resp.Ns, resp.Extra
|
||||
return out, nil
|
||||
}
|
||||
}
|
||||
|
||||
func newMockTraverser() *traverse.Traverser {
|
||||
tr := traverse.NewTraverser(&traverse.TraverserConfig{
|
||||
MaxDepth: traverse.DefaultMaxDepth,
|
||||
QueryType: dns.TypeA,
|
||||
RootAddrs: []net.IP{net.ParseIP("198.41.0.4")},
|
||||
QueryConfig: &idns.QueryConfig{
|
||||
Retries: 1,
|
||||
Timeout: time.Second,
|
||||
RetryDelay: time.Millisecond,
|
||||
},
|
||||
})
|
||||
tr.SetExchange(mockDelegation())
|
||||
return tr
|
||||
}
|
||||
|
||||
func TestDefaultConfig(t *testing.T) {
|
||||
cfg := DefaultConfig()
|
||||
if !cfg.ShowProgress {
|
||||
t.Fatal("expected ShowProgress default true")
|
||||
}
|
||||
if cfg.Format != FormatText {
|
||||
t.Fatalf("Format = %v, want text", cfg.Format)
|
||||
if cfg.Format != FormatText || !cfg.ShowProgress || !cfg.ShowResults {
|
||||
t.Errorf("unexpected defaults: %+v", cfg)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNewFormatterSelectsImplementation(t *testing.T) {
|
||||
text := NewFormatter(DefaultConfig(), &bytes.Buffer{})
|
||||
if _, ok := text.(*textFormatter); !ok {
|
||||
t.Fatalf("expected text formatter, got %T", text)
|
||||
if _, ok := NewFormatter(&Config{Format: FormatJSON}, &bytes.Buffer{}).(*jsonFormatter); !ok {
|
||||
t.Error("FormatJSON should select the JSON formatter")
|
||||
}
|
||||
|
||||
jsonCfg := DefaultConfig()
|
||||
jsonCfg.Format = FormatJSON
|
||||
jsonFmt := NewFormatter(jsonCfg, &bytes.Buffer{})
|
||||
if _, ok := jsonFmt.(*jsonFormatter); !ok {
|
||||
t.Fatalf("expected json formatter, got %T", jsonFmt)
|
||||
if _, ok := NewFormatter(&Config{Format: FormatText}, &bytes.Buffer{}).(*textFormatter); !ok {
|
||||
t.Error("FormatText should select the text formatter")
|
||||
}
|
||||
if NewFormatter(nil, &bytes.Buffer{}) == nil {
|
||||
t.Error("nil config should still produce a formatter")
|
||||
}
|
||||
}
|
||||
|
||||
func TestComputeSummaryAggregatesAnswers(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, ".", 0, 1.0, nil)
|
||||
resp := &traverse.Response{
|
||||
Referral: ref,
|
||||
Type: traverse.RespAnswer,
|
||||
Decoded: &dns.DecodedResponse{
|
||||
Answers: []miekgdns.RR{
|
||||
&miekgdns.A{
|
||||
Hdr: miekgdns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Class: miekgdns.ClassINET},
|
||||
A: net.ParseIP("93.184.216.34"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
stats := ComputeSummary([]traverse.TraversalResult{{Referral: ref, Response: resp}})
|
||||
if len(stats.Answers) != 1 {
|
||||
t.Fatalf("answers = %d, want 1", len(stats.Answers))
|
||||
}
|
||||
if stats.Answers[0].Prob != 1.0 {
|
||||
t.Fatalf("prob = %v, want 1.0", stats.Answers[0].Prob)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTextFormatterSummaryOutput(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, ".", 0, 1.0, nil)
|
||||
resp := &traverse.Response{
|
||||
Referral: ref,
|
||||
Type: traverse.RespAnswer,
|
||||
Decoded: &dns.DecodedResponse{
|
||||
Answers: []miekgdns.RR{
|
||||
&miekgdns.A{
|
||||
Hdr: miekgdns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Class: miekgdns.ClassINET},
|
||||
A: net.ParseIP("93.184.216.34"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
func TestRunTraversalTextOutput(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Domain = "www.example.com"
|
||||
cfg.QueryType = "a"
|
||||
cfg.ShowServers = true
|
||||
cfg.ShowVersions = false // no fingerprint network calls in tests
|
||||
cfg.Color = false
|
||||
cfg.ShowServers = false
|
||||
cfg.ShowResults = false
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
|
||||
if err := formatter.WriteSummary([]traverse.TraversalResult{{Referral: ref, Response: resp}}); err != nil {
|
||||
t.Fatalf("WriteSummary: %v", err)
|
||||
}
|
||||
|
||||
out := buf.String()
|
||||
if !strings.Contains(out, "Summary:") {
|
||||
t.Fatalf("expected summary header, got %q", out)
|
||||
}
|
||||
if !strings.Contains(out, "100%") {
|
||||
t.Fatalf("expected probability in summary, got %q", out)
|
||||
}
|
||||
if !strings.Contains(out, "93.184.216.34") {
|
||||
t.Fatalf("expected answer IP in summary, got %q", out)
|
||||
}
|
||||
}
|
||||
|
||||
func TestJSONFormatterProducesValidOutput(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, ".", 0, 1.0, nil)
|
||||
resp := &traverse.Response{
|
||||
Referral: ref,
|
||||
Server: net.ParseIP("198.41.0.4"),
|
||||
Type: traverse.RespAnswer,
|
||||
Decoded: &dns.DecodedResponse{
|
||||
Answers: []miekgdns.RR{
|
||||
&miekgdns.A{
|
||||
Hdr: miekgdns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Class: miekgdns.ClassINET},
|
||||
A: net.ParseIP("93.184.216.34"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Format = FormatJSON
|
||||
cfg.Domain = "example.com"
|
||||
cfg.QueryType = "A"
|
||||
cfg.ShowServers = false
|
||||
cfg.ShowResults = true
|
||||
cfg.ShowSummaryResults = true
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
|
||||
if err := formatter.WriteProgress(traverse.TraversalEvent{
|
||||
Stage: traverse.EventStart,
|
||||
Result: traverse.TraversalResult{Referral: ref},
|
||||
}); err != nil {
|
||||
t.Fatalf("WriteProgress: %v", err)
|
||||
}
|
||||
if err := formatter.WriteSummary([]traverse.TraversalResult{{Referral: ref, Response: resp}}); err != nil {
|
||||
t.Fatalf("WriteSummary: %v", err)
|
||||
}
|
||||
if err := formatter.Flush(); err != nil {
|
||||
t.Fatalf("Flush: %v", err)
|
||||
}
|
||||
|
||||
var payload map[string]any
|
||||
if err := json.Unmarshal(buf.Bytes(), &payload); err != nil {
|
||||
t.Fatalf("invalid json: %v\n%s", err, buf.String())
|
||||
}
|
||||
if payload["domain"] != "example.com" {
|
||||
t.Fatalf("domain = %v", payload["domain"])
|
||||
}
|
||||
if _, ok := payload["summary"]; !ok {
|
||||
t.Fatalf("expected summary in json output")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunTraversalUsesHooks(t *testing.T) {
|
||||
answerResp := func() *miekgdns.Msg {
|
||||
m := new(miekgdns.Msg)
|
||||
m.SetReply(new(miekgdns.Msg))
|
||||
m.Answer = append(m.Answer, &miekgdns.A{
|
||||
Hdr: miekgdns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Class: miekgdns.ClassINET, Ttl: 300},
|
||||
A: net.ParseIP("93.184.216.34"),
|
||||
})
|
||||
return m
|
||||
}()
|
||||
|
||||
tr := traverse.NewTraverser(&traverse.TraverserConfig{
|
||||
MaxDepth: 5,
|
||||
QueryType: dns.TypeA,
|
||||
RootAddrs: []net.IP{net.ParseIP("198.41.0.4")},
|
||||
})
|
||||
tr.SetExchange(func(ctx context.Context, server string, msg *miekgdns.Msg, useTCP bool) (*miekgdns.Msg, error) {
|
||||
return answerResp.Copy(), nil
|
||||
})
|
||||
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Color = false
|
||||
cfg.ShowServers = false
|
||||
cfg.ShowResults = false
|
||||
cfg.ShowSummaryResults = true
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
|
||||
_, err := RunTraversal(context.Background(), tr, cfg, formatter, "example.com")
|
||||
root, err := RunTraversal(context.Background(), newMockTraverser(), cfg, formatter, "www.example.com")
|
||||
if err != nil {
|
||||
t.Fatalf("RunTraversal: %v", err)
|
||||
}
|
||||
if !strings.Contains(buf.String(), "Summary:") {
|
||||
t.Fatalf("expected formatted summary output, got %q", buf.String())
|
||||
if root == nil || len(root.Stats) == 0 {
|
||||
t.Fatal("expected aggregated stats on the root referral")
|
||||
}
|
||||
|
||||
out := buf.String()
|
||||
for _, want := range []string{
|
||||
"# Using fast mode",
|
||||
"Using 198.41.0.4 (198.41.0.4) as initial root",
|
||||
"Running query www.example.com type a",
|
||||
"1 198.41.0.4 (198.41.0.4)",
|
||||
"1.1 a.gtld-servers.net (192.5.6.30)",
|
||||
"1.1.1 ns1.example.com (1.1.1.1)",
|
||||
"Results:",
|
||||
" 50.0%: Answer from ns1.example.com (1.1.1.1)",
|
||||
" 50.0%: Answer from ns2.example.com (2.2.2.2)",
|
||||
"Summary Results:",
|
||||
" 100% answered with www.example.com. 300 IN A 9.9.9.9",
|
||||
"The following servers were encountered:",
|
||||
} {
|
||||
if !strings.Contains(out, want) {
|
||||
t.Errorf("output missing %q\n---\n%s", want, out)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestJSONFormatterWriteResolveAndResult(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, ".", 0, 1.0, nil)
|
||||
server := net.ParseIP("198.41.0.4")
|
||||
resp := &traverse.Response{
|
||||
Referral: ref,
|
||||
Server: server,
|
||||
Type: traverse.RespAnswer,
|
||||
Decoded: &dns.DecodedResponse{
|
||||
Answers: []miekgdns.RR{
|
||||
&miekgdns.A{
|
||||
Hdr: miekgdns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Class: miekgdns.ClassINET},
|
||||
A: net.ParseIP("1.2.3.4"),
|
||||
},
|
||||
},
|
||||
},
|
||||
func TestVerboseProgressFormat(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Domain = "www.example.com"
|
||||
cfg.QueryType = "a"
|
||||
cfg.ShowVersions = false
|
||||
cfg.Verbose = true
|
||||
cfg.Color = false
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
|
||||
if _, err := RunTraversal(context.Background(), newMockTraverser(), cfg, formatter, "www.example.com"); err != nil {
|
||||
t.Fatalf("RunTraversal: %v", err)
|
||||
}
|
||||
out := buf.String()
|
||||
// Verbose rows are "<refid> [qname] <server> (<ips>) <bailiwick>"; the
|
||||
// root bailiwick renders as "<>".
|
||||
for _, want := range []string{
|
||||
"1 [www.example.com] 198.41.0.4 (198.41.0.4) <>",
|
||||
"1.1 [www.example.com] a.gtld-servers.net (192.5.6.30) <com>",
|
||||
"1.1.1 [www.example.com] ns1.example.com (1.1.1.1) <example.com>",
|
||||
} {
|
||||
if !strings.Contains(out, want) {
|
||||
t.Errorf("output missing %q\n---\n%s", want, out)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Format = FormatJSON
|
||||
cfg.Domain = "example.com"
|
||||
cfg.QueryType = "A"
|
||||
cfg.ShowResolves = true
|
||||
cfg.ShowAllStats = true
|
||||
cfg.ShowProgress = true
|
||||
f := NewFormatter(cfg, &buf).(*jsonFormatter)
|
||||
func TestRunTraversalQuietSuppressesHeader(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Domain = "www.example.com"
|
||||
cfg.QueryType = "a"
|
||||
cfg.ShowVersions = false
|
||||
cfg.Quiet = true
|
||||
cfg.Color = false
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
|
||||
// WriteResolve
|
||||
if err := f.WriteResolve(traverse.TraversalEvent{
|
||||
Stage: traverse.EventStart,
|
||||
Result: traverse.TraversalResult{Referral: ref, Response: resp},
|
||||
}); err != nil {
|
||||
t.Fatalf("WriteResolve: %v", err)
|
||||
if _, err := RunTraversal(context.Background(), newMockTraverser(), cfg, formatter, "www.example.com"); err != nil {
|
||||
t.Fatalf("RunTraversal: %v", err)
|
||||
}
|
||||
out := buf.String()
|
||||
for _, banned := range []string{"# Using fast mode", "as initial root", "Running query"} {
|
||||
if strings.Contains(out, banned) {
|
||||
t.Errorf("quiet output must not contain %q\n---\n%s", banned, out)
|
||||
}
|
||||
}
|
||||
if !strings.Contains(out, "Results:") {
|
||||
t.Errorf("quiet must still print results\n---\n%s", out)
|
||||
}
|
||||
}
|
||||
|
||||
// WriteResult
|
||||
if err := f.WriteResult(traverse.TraversalResult{Referral: ref, Response: resp}); err != nil {
|
||||
t.Fatalf("WriteResult: %v", err)
|
||||
func TestRunTraversalJSONOutput(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Format = FormatJSON
|
||||
cfg.Domain = "www.example.com"
|
||||
cfg.QueryType = "A"
|
||||
cfg.ShowVersions = false
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
|
||||
if _, err := RunTraversal(context.Background(), newMockTraverser(), cfg, formatter, "www.example.com"); err != nil {
|
||||
t.Fatalf("RunTraversal: %v", err)
|
||||
}
|
||||
|
||||
var doc map[string]any
|
||||
if err := json.Unmarshal(buf.Bytes(), &doc); err != nil {
|
||||
t.Fatalf("invalid JSON: %v\n%s", err, buf.String())
|
||||
}
|
||||
if doc["domain"] != "www.example.com" {
|
||||
t.Errorf("domain = %v", doc["domain"])
|
||||
}
|
||||
if doc["qtype"] != "A" {
|
||||
t.Errorf("qtype = %v", doc["qtype"])
|
||||
}
|
||||
root, ok := doc["root"].(map[string]any)
|
||||
if !ok || root["ip"] != "198.41.0.4" {
|
||||
t.Errorf("root = %v", doc["root"])
|
||||
}
|
||||
for _, banned := range []string{"progress", "resolves"} {
|
||||
if _, present := doc[banned]; present {
|
||||
t.Errorf("JSON document must not contain %q", banned)
|
||||
}
|
||||
}
|
||||
results, ok := doc["results"].([]any)
|
||||
if !ok || len(results) != 2 {
|
||||
t.Fatalf("results = %v", doc["results"])
|
||||
}
|
||||
summary, ok := doc["summary"].(map[string]any)
|
||||
if !ok {
|
||||
t.Fatalf("summary missing: %v", doc)
|
||||
}
|
||||
byStatus := summary["by_status"].(map[string]any)
|
||||
if prob := byStatus["answered"].(float64); prob < 0.999 || prob > 1.001 {
|
||||
t.Errorf("answered summary prob = %v", prob)
|
||||
}
|
||||
}
|
||||
|
||||
// WriteProgress with EventComplete to cover stageName "complete"
|
||||
if err := f.WriteProgress(traverse.TraversalEvent{
|
||||
Stage: traverse.EventComplete,
|
||||
Result: traverse.TraversalResult{Referral: ref, Response: resp},
|
||||
}); err != nil {
|
||||
t.Fatalf("WriteProgress EventComplete: %v", err)
|
||||
// mockGluelessDelegation wires root → com → example.com where the single NS
|
||||
// (ns1.example.net) comes without glue, forcing a resolve subtree that walks
|
||||
// root → net → answer.
|
||||
func mockGluelessDelegation() idns.ExchangeFunc {
|
||||
responses := map[string]*dns.Msg{}
|
||||
set := func(server, qname string, msg *dns.Msg) {
|
||||
responses[server+"/"+dns.Fqdn(qname)] = msg
|
||||
}
|
||||
a := func(name, ip string) dns.RR {
|
||||
return &dns.A{
|
||||
Hdr: dns.RR_Header{Name: dns.Fqdn(name), Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 300},
|
||||
A: net.ParseIP(ip).To4(),
|
||||
}
|
||||
}
|
||||
ns := func(zone, target string) dns.RR {
|
||||
return &dns.NS{
|
||||
Hdr: dns.RR_Header{Name: dns.Fqdn(zone), Rrtype: dns.TypeNS, Class: dns.ClassINET, Ttl: 300},
|
||||
Ns: dns.Fqdn(target),
|
||||
}
|
||||
}
|
||||
|
||||
comRef := new(dns.Msg)
|
||||
comRef.Ns = []dns.RR{ns("com", "a.gtld-servers.net")}
|
||||
comRef.Extra = []dns.RR{a("a.gtld-servers.net", "192.5.6.30")}
|
||||
set("198.41.0.4", "www.example.com", comRef)
|
||||
|
||||
glueless := new(dns.Msg)
|
||||
glueless.Ns = []dns.RR{ns("example.com", "ns1.example.net")}
|
||||
set("192.5.6.30", "www.example.com", glueless)
|
||||
|
||||
netRef := new(dns.Msg)
|
||||
netRef.Ns = []dns.RR{ns("net", "b.gtld-servers.net")}
|
||||
netRef.Extra = []dns.RR{a("b.gtld-servers.net", "192.33.14.31")}
|
||||
set("198.41.0.4", "ns1.example.net", netRef)
|
||||
|
||||
nsAnswer := new(dns.Msg)
|
||||
nsAnswer.Answer = []dns.RR{a("ns1.example.net", "3.3.3.3")}
|
||||
set("192.33.14.31", "ns1.example.net", nsAnswer)
|
||||
|
||||
answer := new(dns.Msg)
|
||||
answer.Answer = []dns.RR{a("www.example.com", "9.9.9.9")}
|
||||
set("3.3.3.3", "www.example.com", answer)
|
||||
|
||||
return func(_ context.Context, server string, msg *dns.Msg, _ bool) (*dns.Msg, error) {
|
||||
host := server
|
||||
if h, _, err := net.SplitHostPort(server); err == nil {
|
||||
host = h
|
||||
}
|
||||
resp, ok := responses[host+"/"+msg.Question[0].Name]
|
||||
if !ok {
|
||||
return nil, &net.DNSError{Err: "no mock", Name: msg.Question[0].Name}
|
||||
}
|
||||
out := resp.Copy()
|
||||
out.SetReply(msg)
|
||||
out.Answer, out.Ns, out.Extra = resp.Answer, resp.Ns, resp.Extra
|
||||
return out, nil
|
||||
}
|
||||
}
|
||||
|
||||
if err := f.Flush(); err != nil {
|
||||
t.Fatalf("Flush: %v", err)
|
||||
}
|
||||
func runGlueless(t *testing.T, cfg *Config) string {
|
||||
t.Helper()
|
||||
tr := traverse.NewTraverser(&traverse.TraverserConfig{
|
||||
MaxDepth: traverse.DefaultMaxDepth,
|
||||
QueryType: dns.TypeA,
|
||||
RootAddrs: []net.IP{net.ParseIP("198.41.0.4")},
|
||||
QueryConfig: &idns.QueryConfig{
|
||||
Retries: 1,
|
||||
Timeout: time.Second,
|
||||
RetryDelay: time.Millisecond,
|
||||
},
|
||||
})
|
||||
tr.SetExchange(mockGluelessDelegation())
|
||||
|
||||
var buf bytes.Buffer
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
if _, err := RunTraversal(context.Background(), tr, cfg, formatter, "www.example.com"); err != nil {
|
||||
t.Fatalf("RunTraversal: %v", err)
|
||||
}
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
func TestJSONFormatterWriteResolveFlagOff(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, ".", 0, 1.0, nil)
|
||||
func TestResolveProgressHiddenByDefault(t *testing.T) {
|
||||
cfg := DefaultConfig()
|
||||
cfg.Domain = "www.example.com"
|
||||
cfg.QueryType = "a"
|
||||
cfg.ShowVersions = false
|
||||
cfg.Color = false
|
||||
out := runGlueless(t, cfg)
|
||||
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Format = FormatJSON
|
||||
cfg.ShowResolves = false
|
||||
cfg.ShowAllStats = false
|
||||
f := NewFormatter(cfg, &buf).(*jsonFormatter)
|
||||
|
||||
if err := f.WriteResolve(traverse.TraversalEvent{
|
||||
Stage: traverse.EventStart,
|
||||
Result: traverse.TraversalResult{Referral: ref},
|
||||
}); err != nil {
|
||||
t.Fatalf("WriteResolve: %v", err)
|
||||
}
|
||||
if err := f.WriteResult(traverse.TraversalResult{Referral: ref}); err != nil {
|
||||
t.Fatalf("WriteResult: %v", err)
|
||||
}
|
||||
for _, want := range []string{
|
||||
"1.1.1 ns1.example.net -- resolving",
|
||||
"1.1.1 ns1.example.net (3.3.3.3)",
|
||||
"100.0%: Answer from ns1.example.net (3.3.3.3)",
|
||||
} {
|
||||
if !strings.Contains(out, want) {
|
||||
t.Errorf("output missing %q\n---\n%s", want, out)
|
||||
}
|
||||
}
|
||||
// Resolve subtree nodes (".0." refids) render only under --show-resolves,
|
||||
// and resolve outcomes never appear as separate Results entries.
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
if strings.HasPrefix(line, "1.1.1.0") {
|
||||
t.Errorf("resolve subtree must be hidden by default: %q", line)
|
||||
}
|
||||
}
|
||||
if strings.Contains(out, "ns1.example.net./IN/A") {
|
||||
t.Errorf("resolve leaves must not pollute Results\n---\n%s", out)
|
||||
}
|
||||
}
|
||||
|
||||
func TestJSONFormatterWriteSummaryWithServers(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, "com.", 1, 1.0, nil)
|
||||
server := net.ParseIP("1.2.3.4")
|
||||
resp := &traverse.Response{
|
||||
Referral: ref,
|
||||
Server: server,
|
||||
Type: traverse.RespAnswer,
|
||||
Decoded: &dns.DecodedResponse{
|
||||
Answers: []miekgdns.RR{
|
||||
&miekgdns.A{
|
||||
Hdr: miekgdns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Class: miekgdns.ClassINET},
|
||||
A: net.ParseIP("1.2.3.4"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
results := []traverse.TraversalResult{{Referral: ref, Response: resp}}
|
||||
func TestResolveProgressShownWithShowResolves(t *testing.T) {
|
||||
cfg := DefaultConfig()
|
||||
cfg.Domain = "www.example.com"
|
||||
cfg.QueryType = "a"
|
||||
cfg.ShowVersions = false
|
||||
cfg.ShowResolves = true
|
||||
cfg.Color = false
|
||||
out := runGlueless(t, cfg)
|
||||
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.Format = FormatJSON
|
||||
cfg.Domain = "example.com"
|
||||
cfg.QueryType = "A"
|
||||
cfg.ShowServers = true
|
||||
cfg.ShowVersions = false
|
||||
cfg.ShowResults = true
|
||||
cfg.ShowSummaryResults = true
|
||||
f := NewFormatter(cfg, &buf).(*jsonFormatter)
|
||||
|
||||
if err := f.WriteSummary(results); err != nil {
|
||||
t.Fatalf("WriteSummary: %v", err)
|
||||
}
|
||||
if err := f.Flush(); err != nil {
|
||||
t.Fatalf("Flush: %v", err)
|
||||
for _, want := range []string{
|
||||
"1.1.1 ns1.example.net -- resolving",
|
||||
"1.1.1.0.1 198.41.0.4 (198.41.0.4)",
|
||||
"1.1.1.0.1.1 b.gtld-servers.net (192.33.14.31)",
|
||||
"1.1.1 ns1.example.net (3.3.3.3)",
|
||||
} {
|
||||
if !strings.Contains(out, want) {
|
||||
t.Errorf("output missing %q\n---\n%s", want, out)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var payload map[string]any
|
||||
if err := json.Unmarshal(buf.Bytes(), &payload); err != nil {
|
||||
t.Fatalf("invalid JSON: %v\n%s", err, buf.String())
|
||||
}
|
||||
if _, ok := payload["servers"]; !ok {
|
||||
t.Error("expected 'servers' field in JSON output")
|
||||
}
|
||||
func TestRunTraversalRequiresTraverser(t *testing.T) {
|
||||
if _, err := RunTraversal(context.Background(), nil, DefaultConfig(), nil, "example.com"); err == nil {
|
||||
t.Fatal("expected error for nil traverser")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNewFormatterNilWriter(t *testing.T) {
|
||||
// Should not panic with nil writer
|
||||
cfg := DefaultConfig()
|
||||
f := NewFormatter(cfg, nil)
|
||||
if f == nil {
|
||||
t.Error("NewFormatter should not return nil")
|
||||
}
|
||||
func TestFormatProbability(t *testing.T) {
|
||||
tests := []struct {
|
||||
prob float64
|
||||
want string
|
||||
}{
|
||||
{1.0, " 100%"},
|
||||
{0.5, " 50%"},
|
||||
{0.933, "93.3%"},
|
||||
{0.067, " 6.7%"},
|
||||
{1.0 / 3, "33.3%"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := formatProbability(tt.prob); got != tt.want {
|
||||
t.Errorf("formatProbability(%v) = %q, want %q", tt.prob, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestAttachHooksShowResolves(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, ".", 0, 1.0, nil)
|
||||
server := net.ParseIP("1.2.3.4")
|
||||
resp := &traverse.Response{
|
||||
Referral: ref,
|
||||
Server: server,
|
||||
Type: traverse.RespAnswer,
|
||||
func TestSummaryStatusLabels(t *testing.T) {
|
||||
tests := map[traverse.Status]string{
|
||||
traverse.StatusNoData: "found no such record",
|
||||
traverse.StatusReferralLame: "resulted in a lame referral",
|
||||
traverse.StatusException: "resulted in an exception",
|
||||
traverse.StatusError: "resulted in an error",
|
||||
traverse.StatusNoGlue: "found no glue",
|
||||
traverse.StatusLoop: "resulted in a loop",
|
||||
traverse.StatusCNAMELoop: "resulted in a CNAME loop",
|
||||
traverse.Status("odd"): "odd",
|
||||
}
|
||||
for status, want := range tests {
|
||||
if got := summaryStatusLabel(status); got != want {
|
||||
t.Errorf("summaryStatusLabel(%q) = %q, want %q", status, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.ShowProgress = false
|
||||
cfg.ShowResolves = true
|
||||
cfg.ShowAllStats = true
|
||||
cfg.Color = false
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
hooks := AttachHooks(cfg, formatter)
|
||||
|
||||
// Trigger a resolve event
|
||||
hooks.OnEvent(traverse.TraversalEvent{
|
||||
Stage: traverse.EventStart,
|
||||
IsResolve: true,
|
||||
Result: traverse.TraversalResult{Referral: ref, Response: resp},
|
||||
})
|
||||
|
||||
if buf.Len() == 0 {
|
||||
t.Error("expected resolve output when ShowResolves is true")
|
||||
}
|
||||
func TestCollectUniqueServerIPs(t *testing.T) {
|
||||
servers := map[string][]string{
|
||||
"ns1.example.com": {"1.1.1.1", "2.2.2.2"},
|
||||
"ns2.example.com": {"1.1.1.1"},
|
||||
}
|
||||
ips := collectUniqueServerIPs(servers)
|
||||
if len(ips) != 2 {
|
||||
t.Errorf("unique IPs = %v", ips)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAttachHooksShowAllStats(t *testing.T) {
|
||||
ref := traverse.NewReferral("example.com.", dns.TypeA, ".", 0, 1.0, nil)
|
||||
server := net.ParseIP("1.2.3.4")
|
||||
resp := &traverse.Response{
|
||||
Referral: ref,
|
||||
Server: server,
|
||||
Type: traverse.RespAnswer,
|
||||
Decoded: &dns.DecodedResponse{
|
||||
Answers: []miekgdns.RR{
|
||||
&miekgdns.A{Hdr: miekgdns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Class: miekgdns.ClassINET}, A: net.ParseIP("1.2.3.4")},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
cfg := DefaultConfig()
|
||||
cfg.ShowProgress = false
|
||||
cfg.ShowResolves = false
|
||||
cfg.ShowAllStats = true
|
||||
cfg.Color = false
|
||||
formatter := NewFormatter(cfg, &buf)
|
||||
hooks := AttachHooks(cfg, formatter)
|
||||
|
||||
hooks.OnEvent(traverse.TraversalEvent{
|
||||
Stage: traverse.EventComplete,
|
||||
Result: traverse.TraversalResult{Referral: ref, Response: resp},
|
||||
})
|
||||
func TestReverseString(t *testing.T) {
|
||||
if got := reverseString("abc"); got != "cba" {
|
||||
t.Errorf("reverseString = %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user