resolver: a reply marked recursion available from a root server's address stops the lookup (closes #300)
check / check (push) Canceled after 0s

dnswatcher never asks for recursion and a root server never offers it,
so a reply marked recursion available from a root server's address
came from a resolver on the network answering in its place. The first
such reply now stops the lookup at once with the existing "this network
intercepts DNS queries", naming the address, and no other root server
is asked, whether or not that resolver had the name cached. Before, a
cached name was checked against the resolver's second-hand answer.

On such a network dnswatcher and its tests fail with that error, by
design; nothing works around the interception. A live test passes
public resolvers as the root servers and expects the error.

Model: opus-5-5
This commit is contained in:
2026-10-16 09:15:18 +00:00
committed by sneak
parent adc8131191
commit c41349fd94
5 changed files with 92 additions and 4 deletions
+6 -3
View File
@@ -53,9 +53,12 @@ var (
"reply truncated and its retry over TCP failed",
)
// ErrIntercepted is returned when every root server refused a
// query. Root servers refuse no query, so the refusals came from
// something on the network answering in their place.
// ErrIntercepted is returned when a root server's address gave a
// reply marked recursion available, which ends the lookup at once,
// or when every root server refused a query. Root servers do
// neither, so those replies came from something on the network
// answering in their place. On such a network dnswatcher fails with
// it, by design: nothing works around the interception.
ErrIntercepted = errors.New("this network intercepts DNS queries")
// ErrCNAMEDepthExceeded is returned when a CNAME chain
+13 -1
View File
@@ -287,7 +287,11 @@ func shuffled(
// order until one gives a usable reply. A server that times out, refuses
// or gives a reply that is not usable is passed over for the next. When
// every server refused, the error says so, and when they are the root
// servers it is ErrIntercepted.
// servers it is ErrIntercepted. When they are the root servers, the
// first reply marked recursion available also ends the lookup with
// ErrIntercepted, naming the address it came from, and no other root
// server is asked: root servers offer no recursion, so that reply came
// from something on the network answering in their place.
func (r *Resolver) queryServers(
ctx context.Context,
servers []string,
@@ -305,6 +309,14 @@ func (r *Resolver) queryServers(
}
resp, err := r.queryDNS(ctx, ip, name, qtype)
if err == nil && zone == "." && resp.RecursionAvailable {
return nil, fmt.Errorf(
"query %s @%s: reply marked recursion available, "+
"so not from a root server: %w",
name, ip, ErrIntercepted,
)
}
if err == nil && !usableReply(resp, zone, name) {
err = fmt.Errorf(
"query %s @%s: %w", name, ip, ErrUnusableReply,
+57
View File
@@ -850,6 +850,63 @@ func TestQueryServers_NotEveryRootServerRefused(t *testing.T) {
require.NotContains(t, err.Error(), "refused a query for")
}
// TestQueryServers_RecursiveResolversAsRootServers passes public
// recursive resolvers of four operators to QueryServers as the servers
// of the root zone, as a network that sends every DNS query to a
// resolver would. Their replies are marked recursion available, which
// no root server's is: SERVFAIL, or an answer from a resolver's cache,
// as 1.1.1.1 gives for com., which would be used if a root server gave
// it. The first such reply ends the lookup with ErrIntercepted, naming
// the resolver that gave it. A resolver that refuses or gives no reply
// is passed over for the next, so one of them answering is enough.
func TestQueryServers_RecursiveResolversAsRootServers(t *testing.T) {
t.Parallel()
r := newTestResolver(t)
resolvers := []string{
"1.1.1.1", "8.8.8.8", "9.9.9.9", "208.67.222.222",
}
for _, name := range []string{"com.", "desec.io."} {
var err error
livednstest.Retry(
t,
"QueryServers(public recursive resolvers as root servers, "+
name+")",
func(ctx context.Context) error {
_, err = r.QueryServers(ctx, resolvers, ".", name, dns.TypeNS)
// When no resolver gave a reply marked recursion
// available, each refused or gave no reply at all, so
// the attempt is tried again.
if err != nil &&
!strings.Contains(err.Error(), "marked recursion available") {
return fmt.Errorf(
"%w: %w", livednstest.ErrNoAnswer, err,
)
}
return nil
},
)
require.ErrorIs(t, err, resolver.ErrIntercepted)
// The error names the resolver whose reply ended the lookup.
messages := make([]string, 0, len(resolvers))
for _, ip := range resolvers {
messages = append(messages,
"query "+name+" @"+ip+": reply marked recursion "+
"available, so not from a root server: "+
"this network intercepts DNS queries",
)
}
require.Contains(t, messages, err.Error())
}
}
func TestQueryNameserver_RecordsSorted(t *testing.T) {
t.Parallel()