Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion internal/dns/cname.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func lookupCNAME(ctx context.Context, resolver *net.Resolver, name string) (stri
return resolver.LookupCNAME(ctx, name)
}
qname, err := dnsmessage.NewName(name)
if err != nil {
if err != nil || longLabel(name) {
return "", &net.DNSError{Err: "no such host", Name: name, IsNotFound: true}
}
msg, err := cnameExchange(ctx, resolver, "udp", qname)
Expand All @@ -53,6 +53,19 @@ func lookupCNAME(ctx context.Context, resolver *net.Resolver, name string) (stri
return canonicalName(msg, name), nil
}

// longLabel reports whether name has a label over the 63 bytes DNS allows.
// dnsmessage.NewName only bounds the 255-byte total, so a single long label
// used to pass it, take a connection and a query slot, and fail when the
// message was built (#344).
func longLabel(name string) bool {
for _, label := range strings.Split(name, ".") {
if len(label) > 63 {
return true
}
}
return false
}

// canonicalName follows the CNAME records in msg's answer from name, at
// most maxCNAMEChain hops, and returns where the chain ends: name itself
// when it has no alias.
Expand Down
18 changes: 12 additions & 6 deletions internal/dns/cname_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,9 @@ func TestDNSErrorFor(t *testing.T) {
}
}

// TestCNAMEInvalidNameSendsNoQuery covers #305: a name that cannot be put in
// a DNS message is never sent. One too long for dnsmessage.NewName is
// reported as not found without a connection.
// TestCNAMEInvalidNameSendsNoQuery covers #305 and #344: a name that cannot be
// put in a DNS message is never sent. One too long for dnsmessage.NewName, or
// with a label over 63 bytes, is reported as not found without a connection.
func TestCNAMEInvalidNameSendsNoQuery(t *testing.T) {
var dials, writes atomic.Int64
srv, queries := scriptedUDP(t, func(h dnsmessage.Header, q dnsmessage.Question) [][]byte {
Expand All @@ -394,10 +394,16 @@ func TestCNAMEInvalidNameSendsNoQuery(t *testing.T) {
t.Errorf("name over 255 bytes: %d connections, want 0", n)
}

// A label over 63 bytes passes NewName and fails when the query is built.
// A label over 63 bytes passes NewName and used to dial before failing
// when the query was built; it must be caught with no connection at all
// (#344).
label := strings.Repeat("a", 64) + ".example.com."
if got, err := lookupCNAME(contextWithTimeout(t, 5*time.Second), r, label); err == nil {
t.Errorf("label over 63 bytes: lookupCNAME = %q, want an error", got)
_, err = lookupCNAME(contextWithTimeout(t, 5*time.Second), r, label)
if !errors.As(err, &de) || !de.IsNotFound || Classify(err) != OutcomeNXDomain {
t.Errorf("label over 63 bytes: %v, want a not-found error", err)
}
if n := dials.Load(); n != 0 {
t.Errorf("invalid names: %d connections, want 0", n)
}
if w, q := writes.Load(), queries.Load(); w != 0 || q != 0 {
t.Errorf("invalid names: %d writes and %d queries on the wire, want 0", w, q)
Expand Down
Loading