Apply CAA exchange timeout per label

A single dnsExchangeTimeout around CheckCAA let slow empty
answers at child names consume the budget before parent
policy was queried. Give each label its own exchange timeout
inside the climb instead.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
Cursor Agent
2026-07-24 20:28:23 +00:00
committed by Bryan Frimin
parent 6a1f6d9273
commit 3948f47354
4 changed files with 70 additions and 8 deletions

View File

@@ -23,6 +23,7 @@ package dnsclient
import (
"context"
"testing"
"time"
"codeberg.org/miekg/dns"
"github.com/stretchr/testify/assert"
@@ -484,6 +485,43 @@ func TestCheckCAA(t *testing.T) {
require.Error(t, err)
assert.ErrorIs(t, err, ErrCAADenied)
})
t.Run("applies exchange timeout per label", func(t *testing.T) {
t.Parallel()
var deadlines []time.Time
client := &Client{
ExchangeTimeout: 2 * time.Second,
exchange: func(ctx context.Context, msg *dns.Msg, _ string) (*dns.Msg, error) {
deadline, ok := ctx.Deadline()
require.True(t, ok)
deadlines = append(deadlines, deadline)
name := msg.Question[0].Header().Name
if name != "example.com." {
return &dns.Msg{MsgHeader: dns.MsgHeader{Rcode: dns.RcodeSuccess}}, nil
}
caa := caaRecord("issue", "letsencrypt.org", 0)
caa.Hdr.Name = name
return &dns.Msg{
MsgHeader: dns.MsgHeader{Rcode: dns.RcodeSuccess},
Answer: []dns.RR{caa},
}, nil
},
}
err := client.CheckCAA(context.Background(), "trust.example.com", "letsencrypt.org")
require.NoError(t, err)
require.GreaterOrEqual(t, len(deadlines), 2)
assert.True(
t,
deadlines[1].After(deadlines[0]),
"expected a fresh per-label deadline, got shared climb deadline",
)
})
}
func caaRecord(tag, value string, flag uint8) *dns.CAA {