c96d18859f
- runner.go: store fingerprints in local var, call formatter.SetFingerprints() instead of mutating caller's *Config; removes Fingerprints field from Config - fingerprint.go: use singleflight.Group in Query to coalesce concurrent probes for the same IP, eliminating the double-probe race - output layer: add SetFingerprints(map[string]string) to Formatter interface; textFormatter and jsonFormatter each hold their own fingerprints field - formatter_test.go: add TestTextFormatterWriteSummaryShowsVersions and TestJSONFormatterWriteSummaryShowsVersions verifying version output Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: multica-agent <github@multica.ai>
64 lines
1.6 KiB
Go
64 lines
1.6 KiB
Go
package output
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
|
|
"github.com/hits/ExploreDNS/internal/fingerprint"
|
|
"github.com/hits/ExploreDNS/internal/traverse"
|
|
)
|
|
|
|
func RunTraversal(ctx context.Context, traverser *traverse.Traverser, cfg *Config, formatter Formatter, domain string) ([]traverse.TraversalResult, error) {
|
|
if traverser == nil {
|
|
return nil, fmt.Errorf("traverser is required")
|
|
}
|
|
if cfg == nil {
|
|
cfg = DefaultConfig()
|
|
}
|
|
if formatter == nil {
|
|
formatter = NewFormatter(cfg, nil)
|
|
}
|
|
|
|
traverser.SetHooks(AttachHooks(cfg, formatter))
|
|
|
|
results, err := traverser.Traverse(ctx, domain)
|
|
if err != nil {
|
|
return results, err
|
|
}
|
|
|
|
// Fingerprint servers when both ShowVersions and ShowServers are enabled.
|
|
// Gating on ShowServers avoids unnecessary network calls when versions
|
|
// would not be displayed anyway.
|
|
if cfg.ShowVersions && cfg.ShowServers {
|
|
fps := fingerprint.New().FingerprintAll(ctx, collectUniqueServerIPs(results))
|
|
formatter.SetFingerprints(fps)
|
|
}
|
|
|
|
if err := formatter.WriteSummary(results); err != nil {
|
|
return results, err
|
|
}
|
|
if err := formatter.Flush(); err != nil {
|
|
return results, err
|
|
}
|
|
|
|
return results, nil
|
|
}
|
|
|
|
// collectUniqueServerIPs returns the set of unique server IPs seen in results.
|
|
func collectUniqueServerIPs(results []traverse.TraversalResult) []net.IP {
|
|
seen := make(map[string]bool)
|
|
var ips []net.IP
|
|
for _, r := range results {
|
|
if r.Response == nil || r.Response.Server == nil {
|
|
continue
|
|
}
|
|
key := r.Response.Server.String()
|
|
if !seen[key] {
|
|
seen[key] = true
|
|
ips = append(ips, r.Response.Server)
|
|
}
|
|
}
|
|
return ips
|
|
}
|