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
+44
-87
@@ -19,7 +19,6 @@ var (
|
||||
ErrInvalidRetries = errors.New("retries must be between 0 and 10")
|
||||
ErrMissingDomain = errors.New("domain is required")
|
||||
ErrAlwaysTCPRequiresTCP = errors.New("--always-tcp requires --allow-tcp")
|
||||
ErrInvalidRootServer = errors.New("invalid root server IP address")
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
@@ -76,39 +75,6 @@ func ParseQueryType(s string) (uint16, error) {
|
||||
}
|
||||
}
|
||||
|
||||
func ParseUDPSize(s string) (int, error) {
|
||||
var size int
|
||||
if _, err := fmt.Sscanf(s, "%d", &size); err != nil {
|
||||
return 0, fmt.Errorf("%w: %s", ErrInvalidUDPSize, s)
|
||||
}
|
||||
if size < 512 || size > 4096 {
|
||||
return 0, fmt.Errorf("%w: %d (must be 512-4096)", ErrInvalidUDPSize, size)
|
||||
}
|
||||
return size, nil
|
||||
}
|
||||
|
||||
func ParseMaxDepth(s string) (int, error) {
|
||||
var depth int
|
||||
if _, err := fmt.Sscanf(s, "%d", &depth); err != nil {
|
||||
return 0, fmt.Errorf("%w: %s", ErrInvalidMaxDepth, s)
|
||||
}
|
||||
if depth < 1 || depth > 100 {
|
||||
return 0, fmt.Errorf("%w: %d (must be 1-100)", ErrInvalidMaxDepth, depth)
|
||||
}
|
||||
return depth, nil
|
||||
}
|
||||
|
||||
func ParseRetries(s string) (int, error) {
|
||||
var retries int
|
||||
if _, err := fmt.Sscanf(s, "%d", &retries); err != nil {
|
||||
return 0, fmt.Errorf("%w: %s", ErrInvalidRetries, s)
|
||||
}
|
||||
if retries < 0 || retries > 10 {
|
||||
return 0, fmt.Errorf("%w: %d (must be 0-10)", ErrInvalidRetries, retries)
|
||||
}
|
||||
return retries, nil
|
||||
}
|
||||
|
||||
func (c *Config) Validate() error {
|
||||
if _, err := ParseQueryType(c.QueryType); err != nil {
|
||||
return err
|
||||
@@ -146,17 +112,6 @@ func (c *Config) GetDomain(args []string) (string, error) {
|
||||
return args[0], nil
|
||||
}
|
||||
|
||||
func (c *Config) ParseRootServer() (net.IP, error) {
|
||||
if c.RootServer == "" {
|
||||
return nil, nil
|
||||
}
|
||||
ip := net.ParseIP(c.RootServer)
|
||||
if ip == nil {
|
||||
return nil, fmt.Errorf("%w: %s", ErrInvalidRootServer, c.RootServer)
|
||||
}
|
||||
return ip, nil
|
||||
}
|
||||
|
||||
// ParseDebugLevel returns the debug verbosity level from the -d and -dd flag values.
|
||||
// dd=true → 2 (library debug), d=true → 1 (application debug), neither → 0.
|
||||
func ParseDebugLevel(d, dd bool) int {
|
||||
@@ -175,57 +130,59 @@ func PrintUsage() {
|
||||
fmt.Fprintf(os.Stderr, " exploredns [flags] <domain>\n\n")
|
||||
fmt.Fprintf(os.Stderr, "Flags:\n")
|
||||
|
||||
flagGroups := map[string][][2]string{
|
||||
"Query Options": {
|
||||
{"--type", "Record type (default A)"},
|
||||
{"--root-server", "Override root server"},
|
||||
{"--all-root-servers", "Use all 13 root servers"},
|
||||
{"--root-aaaa", "Include IPv6 root addresses"},
|
||||
{"--follow-aaaa", "Only follow AAAA for referrals"},
|
||||
// Ordered slice, not a map: --help output must be stable.
|
||||
flagGroups := []struct {
|
||||
name string
|
||||
flags [][2]string
|
||||
}{
|
||||
{"Query Options", [][2]string{
|
||||
{"--type", "Record type (default a)"},
|
||||
{"--root-server", "Initial root server, hostname or IP (default: ask upstream)"},
|
||||
{"--all-root-servers", "Traverse from all root servers (default false)"},
|
||||
{"--root-aaaa", "Include IPv6 root addresses (not implemented yet)"},
|
||||
{"--follow-aaaa", "Only follow AAAA for referrals (not implemented yet)"},
|
||||
{"--dns-upstream", "Upstream resolver for root discovery (default: system)"},
|
||||
},
|
||||
"Transport Options": {
|
||||
{"--udp-size", "EDNS0 buffer size (default 2048)"},
|
||||
}},
|
||||
{"Transport Options", [][2]string{
|
||||
{"--udp-size", "EDNS0 buffer size; 512 turns EDNS0 off (default 2048)"},
|
||||
{"--allow-tcp", "TCP fallback on truncation (default true)"},
|
||||
{"--always-tcp", "Always use TCP"},
|
||||
{"--retries", "Retry count (default 2)"},
|
||||
},
|
||||
"Traversal Options": {
|
||||
{"--always-tcp", "Always use TCP (default false)"},
|
||||
{"--retries", "Number of 2s retries before timing out (default 2)"},
|
||||
}},
|
||||
{"Traversal Options", [][2]string{
|
||||
{"--max-depth", "Max traversal depth (default 20)"},
|
||||
{"--fast", "Fast mode: reuse earlier branch cache (default true)"},
|
||||
},
|
||||
"Output Options": {
|
||||
{"--verbose, -v", "Verbose output"},
|
||||
{"--debug, -d", "Debug mode (stackable: -dd for library debug)"},
|
||||
{"--quiet, -q", "Suppress supplementary info"},
|
||||
{"--show-progress", "Show traversal progress"},
|
||||
{"--no-show-progress", "Hide traversal progress"},
|
||||
{"--show-resolves", "Show glue resolution details"},
|
||||
{"--no-show-resolves", "Hide glue resolution details"},
|
||||
{"--show-servers", "Show servers queried"},
|
||||
{"--no-show-servers", "Hide servers queried"},
|
||||
{"--show-versions", "Show server versions"},
|
||||
{"--no-show-versions", "Hide server versions"},
|
||||
{"--show-all-stats", "Show all statistics"},
|
||||
{"--no-show-all-stats", "Hide all statistics"},
|
||||
{"--show-results", "Show query results"},
|
||||
{"--no-show-results", "Hide query results"},
|
||||
{"--show-summary-results", "Show summary of results"},
|
||||
{"--no-show-summary-results", "Hide summary of results"},
|
||||
},
|
||||
{"--fast", "Fast mode; turn off to be more accurate (default true)"},
|
||||
}},
|
||||
{"Output Options", [][2]string{
|
||||
{"--json", "Emit a single JSON document instead of text"},
|
||||
{"--verbose, -v", "Verbose progress ([qname] and <bailiwick> shown)"},
|
||||
{"-d, --debug", "Print debug diagnostics to stderr"},
|
||||
{"-dd", "Like -d plus library-level debug"},
|
||||
{"--quiet, -q", "Suppress the header block"},
|
||||
{"--show-progress", "Show traversal progress (default true)"},
|
||||
{"--show-resolves", "Show glue resolution progress (default false)"},
|
||||
{"--show-servers", "Show servers encountered (default false)"},
|
||||
{"--show-versions", "Show server version fingerprints (default true)"},
|
||||
{"--show-all-stats", "Show statistics after every node (default false)"},
|
||||
{"--show-results", "Show the results (default true)"},
|
||||
{"--show-summary-results", "Show the summary results (default true)"},
|
||||
}},
|
||||
}
|
||||
|
||||
for group, flags := range flagGroups {
|
||||
fmt.Fprintf(os.Stderr, "\n%s:\n", group)
|
||||
for _, f := range flags {
|
||||
for _, group := range flagGroups {
|
||||
fmt.Fprintf(os.Stderr, "\n%s:\n", group.name)
|
||||
for _, f := range group.flags {
|
||||
fmt.Fprintf(os.Stderr, " %-25s %s\n", f[0], f[1])
|
||||
}
|
||||
}
|
||||
fmt.Fprintf(os.Stderr, "\nEvery --show-X flag can be negated with --show-X=false or --no-show-X.\n")
|
||||
}
|
||||
|
||||
func DefaultConfig() *Config {
|
||||
return &Config{
|
||||
QueryType: "A",
|
||||
// Lowercase like the reference default (:a); explicit --type values
|
||||
// keep the user's case in the "Running query" line.
|
||||
QueryType: "a",
|
||||
RootServer: "",
|
||||
AllRootServers: false,
|
||||
RootAAAA: false,
|
||||
@@ -241,10 +198,10 @@ func DefaultConfig() *Config {
|
||||
Debug: 0,
|
||||
Quiet: false,
|
||||
ShowProgress: true,
|
||||
ShowResolves: true,
|
||||
ShowServers: true,
|
||||
ShowResolves: false,
|
||||
ShowServers: false,
|
||||
ShowVersions: true,
|
||||
ShowAllStats: true,
|
||||
ShowAllStats: false,
|
||||
ShowResults: true,
|
||||
ShowSummaryResults: true,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user