CI / test (pull_request) Failing after 2m14s
- Register -v/-q short flag aliases sharing the same bool variable as --verbose/--quiet so both forms work identically - Register -d and -dd flags; use ParseDebugLevel() helper so -d sets Debug=1 and -dd sets Debug=2; remove the broken strings.Count approach - Add AllowTCP field to dns.QueryConfig; guard TCP truncation fallback in QueryWithExchange and IterativeQueryWithExchange behind cfg.AllowTCP; wire cfg.AllowTCP from CLI config into QueryConfig in main.go - ParseRootServer() now returns ErrInvalidRootServer instead of (nil,nil) when the string is non-empty but net.ParseIP fails - Add internal/config/config_test.go covering ParseQueryType, ParseUDPSize, Validate, GetDomain, ParseRootServer, ParseDebugLevel, and the --always-tcp/--allow-tcp cross-check - Add TestQueryNoTCPFallbackWhenDisabled to dns/query_test.go - Update existing truncation tests to set AllowTCP:true - Add TODO comments on display flags not yet wired to output layer Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: multica-agent <github@multica.ai>
205 lines
4.4 KiB
Go
205 lines
4.4 KiB
Go
package dns
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"time"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
type QueryConfig struct {
|
|
UDPSize int
|
|
Timeout time.Duration
|
|
Retries int
|
|
UseTCP bool
|
|
AllowTCP bool
|
|
}
|
|
|
|
func DefaultQueryConfig() *QueryConfig {
|
|
return &QueryConfig{
|
|
UDPSize: DefaultEDNS0UDPSize(),
|
|
Timeout: 5 * time.Second,
|
|
Retries: 3,
|
|
UseTCP: false,
|
|
AllowTCP: true,
|
|
}
|
|
}
|
|
|
|
type ExchangeFunc func(ctx context.Context, server string, msg *dns.Msg, useTCP bool) (*dns.Msg, error)
|
|
|
|
func Query(ctx context.Context, server net.IP, name string, qtype uint16, cfg *QueryConfig) (*dns.Msg, error) {
|
|
if cfg == nil {
|
|
cfg = DefaultQueryConfig()
|
|
}
|
|
|
|
if cfg.UDPSize <= 0 {
|
|
cfg.UDPSize = DefaultEDNS0UDPSize()
|
|
}
|
|
if cfg.Timeout <= 0 {
|
|
cfg.Timeout = 5 * time.Second
|
|
}
|
|
|
|
return QueryWithExchange(ctx, server, name, qtype, cfg, realExchange)
|
|
}
|
|
|
|
func realExchange(ctx context.Context, server string, msg *dns.Msg, useTCP bool) (*dns.Msg, error) {
|
|
addr := net.JoinHostPort(server, "53")
|
|
|
|
var c *dns.Client
|
|
if useTCP {
|
|
c = &dns.Client{
|
|
Net: "tcp",
|
|
ReadTimeout: 5 * time.Second,
|
|
WriteTimeout: 5 * time.Second,
|
|
}
|
|
} else {
|
|
c = &dns.Client{
|
|
Net: "udp",
|
|
ReadTimeout: 5 * time.Second,
|
|
WriteTimeout: 5 * time.Second,
|
|
}
|
|
}
|
|
|
|
if deadline, ok := ctx.Deadline(); ok {
|
|
c.ReadTimeout = time.Until(deadline)
|
|
c.WriteTimeout = time.Until(deadline)
|
|
}
|
|
|
|
r, _, err := c.ExchangeContext(ctx, msg, addr)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("dns exchange (%s) with %s: %w", c.Net, addr, err)
|
|
}
|
|
|
|
return r, nil
|
|
}
|
|
|
|
func QueryWithExchange(ctx context.Context, server net.IP, name string, qtype uint16, cfg *QueryConfig, exchangeFn ExchangeFunc) (*dns.Msg, error) {
|
|
if cfg == nil {
|
|
cfg = DefaultQueryConfig()
|
|
}
|
|
if cfg.UDPSize <= 0 {
|
|
cfg.UDPSize = DefaultEDNS0UDPSize()
|
|
}
|
|
|
|
msg := buildQuery(name, qtype, cfg.UDPSize)
|
|
serverStr := server.String()
|
|
|
|
var lastErr error
|
|
|
|
for attempt := 0; attempt < cfg.Retries; attempt++ {
|
|
if attempt > 0 {
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil, fmt.Errorf("query retries cancelled: %w", ctx.Err())
|
|
case <-time.After(100 * time.Millisecond):
|
|
}
|
|
}
|
|
|
|
if cfg.UseTCP {
|
|
resp, err := exchangeFn(ctx, serverStr, msg, true)
|
|
if err != nil {
|
|
lastErr = err
|
|
continue
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
resp, err := exchangeFn(ctx, serverStr, msg, false)
|
|
if err != nil {
|
|
lastErr = err
|
|
continue
|
|
}
|
|
|
|
if resp.Truncated && cfg.AllowTCP {
|
|
resp, err = exchangeFn(ctx, serverStr, msg, true)
|
|
if err != nil {
|
|
lastErr = err
|
|
continue
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
return resp, nil
|
|
}
|
|
|
|
return nil, fmt.Errorf("query %s %s failed after %d retries: %w", name, QNameType(qtype), cfg.Retries, lastErr)
|
|
}
|
|
|
|
func IterativeQuery(ctx context.Context, server net.IP, name string, qtype uint16, cfg *QueryConfig) (*dns.Msg, error) {
|
|
if cfg == nil {
|
|
cfg = DefaultQueryConfig()
|
|
}
|
|
if cfg.UDPSize <= 0 {
|
|
cfg.UDPSize = DefaultEDNS0UDPSize()
|
|
}
|
|
return IterativeQueryWithExchange(ctx, server, name, qtype, cfg, realExchange)
|
|
}
|
|
|
|
func IterativeQueryWithExchange(ctx context.Context, server net.IP, name string, qtype uint16, cfg *QueryConfig, exchangeFn ExchangeFunc) (*dns.Msg, error) {
|
|
if cfg == nil {
|
|
cfg = DefaultQueryConfig()
|
|
}
|
|
if cfg.UDPSize <= 0 {
|
|
cfg.UDPSize = DefaultEDNS0UDPSize()
|
|
}
|
|
|
|
msg := buildQuery(name, qtype, cfg.UDPSize)
|
|
msg.RecursionDesired = false
|
|
serverStr := server.String()
|
|
|
|
var lastErr error
|
|
|
|
for attempt := 0; attempt < cfg.Retries; attempt++ {
|
|
if attempt > 0 {
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil, fmt.Errorf("query retries cancelled: %w", ctx.Err())
|
|
case <-time.After(100 * time.Millisecond):
|
|
}
|
|
}
|
|
|
|
if cfg.UseTCP {
|
|
resp, err := exchangeFn(ctx, serverStr, msg, true)
|
|
if err != nil {
|
|
lastErr = err
|
|
continue
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
resp, err := exchangeFn(ctx, serverStr, msg, false)
|
|
if err != nil {
|
|
lastErr = err
|
|
continue
|
|
}
|
|
|
|
if resp == nil {
|
|
lastErr = fmt.Errorf("nil response")
|
|
continue
|
|
}
|
|
|
|
if resp.Truncated && cfg.AllowTCP {
|
|
resp, err = exchangeFn(ctx, serverStr, msg, true)
|
|
if err != nil {
|
|
lastErr = err
|
|
continue
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
return resp, nil
|
|
}
|
|
|
|
return nil, fmt.Errorf("iterative query %s %s failed after %d retries: %w", name, QNameType(qtype), cfg.Retries, lastErr)
|
|
}
|
|
|
|
func buildQuery(name string, qtype uint16, udpSize int) *dns.Msg {
|
|
m := new(dns.Msg)
|
|
m.SetQuestion(dns.Fqdn(name), qtype)
|
|
m.RecursionDesired = true
|
|
m.SetEdns0(uint16(udpSize), false)
|
|
return m
|
|
}
|