CI / test (pull_request) Failing after 2m31s
Three bugs fixed: 1. processReferral was calling ResolveNS with ref.Name (the query domain, e.g. '800adventures.com.au.') instead of ref.Bailiwick (the NS hostname, e.g. 'ns-a.hansenits.com.'). This caused the sub-traversal to look up the wrong name and always fail to find the nameserver's IP address. 2. In ResolveNS (and Referral.Resolve), child referrals whose name matched the visited set were unconditionally skipped. When the .com TLD returns glue A records for the target NS alongside its delegation, the child referral has addresses and should be queried directly rather than skipped. 3. FormatRecord was prepending the DNS header fields and then appending rr.String() which already includes those same fields, producing doubled output like 'example.com. 300 IN A example.com. 300 IN A 1.2.3.4'. Now simply returns rr.String(). Additional improvements: - Results section deduplicates terminal results: same NS failure or same (NS, answer) pair is merged with summed probability, avoiding the same nameserver appearing 15 times with 6.7% each. - Result lines now include the NS hostname (from Bailiwick) and use the compact rdata format, e.g. '33% ns-a.hansenits.com answered with 13.54.63.231'. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: multica-agent <github@multica.ai>
300 lines
7.5 KiB
Go
300 lines
7.5 KiB
Go
package output
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/hits/ExploreDNS/internal/dns"
|
|
"github.com/hits/ExploreDNS/internal/traverse"
|
|
)
|
|
|
|
type textFormatter struct {
|
|
cfg *Config
|
|
w io.Writer
|
|
}
|
|
|
|
func newTextFormatter(cfg *Config, w io.Writer) *textFormatter {
|
|
return &textFormatter{cfg: cfg, w: w}
|
|
}
|
|
|
|
func (f *textFormatter) WriteProgress(event traverse.TraversalEvent) error {
|
|
if event.Stage != traverse.EventStart {
|
|
return nil
|
|
}
|
|
line := f.formatReferralLine(event.Result, false)
|
|
if !event.Result.Referral.HasAddresses() {
|
|
line += " -- resolving"
|
|
}
|
|
return f.writeLine(line)
|
|
}
|
|
|
|
func (f *textFormatter) WriteResolve(event traverse.TraversalEvent) error {
|
|
if event.Stage != traverse.EventStart {
|
|
return nil
|
|
}
|
|
return f.writeLine(f.formatReferralLine(event.Result, true))
|
|
}
|
|
|
|
func (f *textFormatter) WriteResult(result traverse.TraversalResult) error {
|
|
if result.Response == nil || result.Referral == nil {
|
|
return nil
|
|
}
|
|
prefix := strings.Repeat(" ", result.Referral.Depth+1)
|
|
line := prefix + f.formatResultLine(result)
|
|
return f.writeLine(line)
|
|
}
|
|
|
|
func (f *textFormatter) WriteSummary(results []traverse.TraversalResult) error {
|
|
if f.cfg.ShowServers {
|
|
if err := f.writeServers(results); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if f.cfg.ShowResults {
|
|
if err := f.writeResults(results); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if f.cfg.ShowSummaryResults {
|
|
if err := f.writeSummaryResults(results); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (f *textFormatter) Flush() error {
|
|
return nil
|
|
}
|
|
|
|
func (f *textFormatter) writeServers(results []traverse.TraversalResult) error {
|
|
servers := collectServers(results)
|
|
if len(servers) == 0 {
|
|
return nil
|
|
}
|
|
|
|
if _, err := fmt.Fprintln(f.w, "The following servers were encountered:"); err != nil {
|
|
return err
|
|
}
|
|
|
|
names := make([]string, 0, len(servers))
|
|
for name := range servers {
|
|
names = append(names, name)
|
|
}
|
|
sort.Slice(names, func(i, j int) bool {
|
|
return strings.ToLower(names[i]) > strings.ToLower(names[j])
|
|
})
|
|
|
|
width := 16
|
|
for _, name := range names {
|
|
if len(name) > width {
|
|
width = len(name)
|
|
}
|
|
}
|
|
|
|
for _, name := range names {
|
|
for _, ip := range servers[name] {
|
|
line := fmt.Sprintf("%*s: %-15s", width, name, ip)
|
|
if f.cfg.ShowVersions {
|
|
if version, ok := f.cfg.Fingerprints[ip]; ok && version != "" {
|
|
line += " " + version
|
|
}
|
|
}
|
|
if _, err := fmt.Fprintln(f.w, line); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
_, err := fmt.Fprintln(f.w)
|
|
return err
|
|
}
|
|
|
|
func (f *textFormatter) writeResults(results []traverse.TraversalResult) error {
|
|
if _, err := fmt.Fprintln(f.w, "Results:"); err != nil {
|
|
return err
|
|
}
|
|
|
|
terminal := terminalResults(results)
|
|
deduped := DeduplicateResults(terminal)
|
|
for _, result := range deduped {
|
|
prefix := strings.Repeat(" ", result.Referral.Depth+1)
|
|
line := prefix + f.formatResultLine(result)
|
|
if _, err := fmt.Fprintln(f.w, line); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
_, err := fmt.Fprintln(f.w)
|
|
return err
|
|
}
|
|
|
|
func (f *textFormatter) writeSummaryResults(results []traverse.TraversalResult) error {
|
|
stats := ComputeSummary(results)
|
|
if stats == nil {
|
|
return nil
|
|
}
|
|
|
|
if _, err := fmt.Fprintln(f.w, "Summary:"); err != nil {
|
|
return err
|
|
}
|
|
|
|
prefix := " "
|
|
for _, answer := range stats.Answers {
|
|
line := fmt.Sprintf("%s%s answered with %s", prefix, formatProbability(answer.Prob), answer.RData)
|
|
if _, err := fmt.Fprintln(f.w, f.colorize(line, colorGreen)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
types := make([]string, 0, len(stats.ByType))
|
|
for respType := range stats.ByType {
|
|
types = append(types, respType)
|
|
}
|
|
sort.Strings(types)
|
|
|
|
for _, respType := range types {
|
|
line := fmt.Sprintf("%s%s %s", prefix, formatProbability(stats.ByType[respType]), summaryTypeLabel(respType))
|
|
if _, err := fmt.Fprintln(f.w, line); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
_, err := fmt.Fprintln(f.w)
|
|
return err
|
|
}
|
|
|
|
func (f *textFormatter) formatReferralLine(result traverse.TraversalResult, isResolve bool) string {
|
|
ref := result.Referral
|
|
if ref == nil {
|
|
return ""
|
|
}
|
|
|
|
indent := strings.Repeat(" ", ref.Depth)
|
|
refID := referralID(ref)
|
|
server := referralServerLabel(ref, result.Response)
|
|
qtype := dns.QNameType(ref.Qtype)
|
|
qname := trimDomain(ref.Name)
|
|
|
|
if f.cfg.Verbose {
|
|
bailiwick := trimDomain(ref.Bailiwick)
|
|
if isResolve {
|
|
return fmt.Sprintf("%s%s [%s] %s <%s>", indent, refID, qname, server, bailiwick)
|
|
}
|
|
return fmt.Sprintf("%s%s [%s] %s <%s> (%s)", indent, refID, qname, server, bailiwick, qtype)
|
|
}
|
|
|
|
if isResolve {
|
|
return fmt.Sprintf("%s%s %s", indent, refID, server)
|
|
}
|
|
return fmt.Sprintf("%s%s %s (%s)", indent, refID, server, qtype)
|
|
}
|
|
|
|
func (f *textFormatter) formatResultLine(result traverse.TraversalResult) string {
|
|
prob := formatProbability(result.Referral.Prob)
|
|
switch result.Response.Type {
|
|
case traverse.RespAnswer:
|
|
key, _ := answerKey(result.Response)
|
|
if key == "" {
|
|
return fmt.Sprintf("%s resulted in answer", prob)
|
|
}
|
|
nsLabel := ""
|
|
if result.Referral.Bailiwick != "" && result.Referral.Bailiwick != "." {
|
|
nsLabel = trimDomain(result.Referral.Bailiwick) + " "
|
|
}
|
|
return f.colorize(fmt.Sprintf("%s %sanswered with %s", prob, nsLabel, key), colorGreen)
|
|
case traverse.RespNODATA:
|
|
return fmt.Sprintf("%s found no such record", prob)
|
|
case traverse.RespNXDOMAIN:
|
|
return f.colorize(fmt.Sprintf("%s name does not exist", prob), colorYellow)
|
|
case traverse.RespSERVFAIL:
|
|
return f.colorize(fmt.Sprintf("%s resulted in SERVFAIL", prob), colorRed)
|
|
case traverse.RespREFUSED:
|
|
return f.colorize(fmt.Sprintf("%s query refused by server", prob), colorRed)
|
|
case traverse.RespNOTIMPL:
|
|
return f.colorize(fmt.Sprintf("%s query type not implemented by server", prob), colorRed)
|
|
case traverse.RespCNAMELoop:
|
|
msg := "CNAME loop detected"
|
|
if result.Response.ErrorMessage != "" {
|
|
msg = result.Response.ErrorMessage
|
|
}
|
|
return f.colorize(fmt.Sprintf("%s %s", prob, msg), colorRed)
|
|
case traverse.RespNSResolutionFailed:
|
|
msg := "nameserver lookup failed"
|
|
if result.Response.ErrorMessage != "" {
|
|
msg = result.Response.ErrorMessage
|
|
}
|
|
return f.colorize(fmt.Sprintf("%s %s", prob, msg), colorYellow)
|
|
case traverse.RespError:
|
|
msg := "resulted in an error"
|
|
if result.Response.ErrorMessage != "" {
|
|
msg = result.Response.ErrorMessage
|
|
}
|
|
return f.colorize(fmt.Sprintf("%s %s", prob, msg), colorRed)
|
|
default:
|
|
return fmt.Sprintf("%s %s", prob, result.Response.Type)
|
|
}
|
|
}
|
|
|
|
func (f *textFormatter) writeLine(line string) error {
|
|
if line == "" {
|
|
return nil
|
|
}
|
|
_, err := fmt.Fprintln(f.w, line)
|
|
return err
|
|
}
|
|
|
|
func (f *textFormatter) colorize(text, color string) string {
|
|
if !f.cfg.Color || color == "" {
|
|
return text
|
|
}
|
|
return color + text + colorReset
|
|
}
|
|
|
|
func referralID(ref *traverse.Referral) string {
|
|
if ref == nil {
|
|
return ""
|
|
}
|
|
return fmt.Sprintf("%d", ref.Depth+1)
|
|
}
|
|
|
|
func referralServerLabel(ref *traverse.Referral, resp *traverse.Response) string {
|
|
if resp != nil && resp.Server != nil {
|
|
return resp.Server.String()
|
|
}
|
|
if ref.HasAddresses() {
|
|
ips := make([]string, 0, len(ref.Addresses))
|
|
for _, addr := range ref.Addresses {
|
|
ips = append(ips, addr.String())
|
|
}
|
|
return strings.Join(ips, ", ")
|
|
}
|
|
if ref.NSName != "" {
|
|
return ref.NSName
|
|
}
|
|
if ref.Bailiwick != "" && ref.Bailiwick != "." {
|
|
return trimDomain(ref.Bailiwick)
|
|
}
|
|
return "unknown"
|
|
}
|
|
|
|
func terminalResults(results []traverse.TraversalResult) []traverse.TraversalResult {
|
|
var terminal []traverse.TraversalResult
|
|
for _, result := range results {
|
|
if result.Response != nil && result.Response.IsTerminal() {
|
|
terminal = append(terminal, result)
|
|
}
|
|
}
|
|
return terminal
|
|
}
|
|
|
|
const (
|
|
colorReset = "\033[0m"
|
|
colorGreen = "\033[32m"
|
|
colorYellow = "\033[33m"
|
|
colorRed = "\033[31m"
|
|
)
|