From 30a2bcdfe80c2109aa64dca2972bca6bbdcc9f09 Mon Sep 17 00:00:00 2001 From: Aaron Gable Date: Tue, 10 Mar 2026 14:35:13 -0700 Subject: [PATCH] Remove TODOs from challenge.RecordsSane We took so long to complete these TODOs that we can't do them: we now do IP address validation, which does not require the use of a DNS resolver, and therefore leaves the ResolverAddrs field blank. --- core/objects.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/core/objects.go b/core/objects.go index 8f9ed49bc1f..31488640f60 100644 --- a/core/objects.go +++ b/core/objects.go @@ -189,10 +189,7 @@ func (ch Challenge) RecordsSane() bool { switch ch.Type { case ChallengeTypeHTTP01: for _, rec := range ch.ValidationRecord { - // TODO(#7140): Add a check for ResolverAddress == "" only after the - // core.proto change has been deployed. - if rec.URL == "" || rec.Hostname == "" || rec.Port == "" || (rec.AddressUsed == netip.Addr{}) || - len(rec.AddressesResolved) == 0 { + if rec.URL == "" || rec.Hostname == "" || rec.Port == "" || (rec.AddressUsed == netip.Addr{}) || len(rec.AddressesResolved) == 0 { return false } } @@ -203,18 +200,13 @@ func (ch Challenge) RecordsSane() bool { if ch.ValidationRecord[0].URL != "" { return false } - // TODO(#7140): Add a check for ResolverAddress == "" only after the - // core.proto change has been deployed. - if ch.ValidationRecord[0].Hostname == "" || ch.ValidationRecord[0].Port == "" || - (ch.ValidationRecord[0].AddressUsed == netip.Addr{}) || len(ch.ValidationRecord[0].AddressesResolved) == 0 { + if ch.ValidationRecord[0].Hostname == "" || ch.ValidationRecord[0].Port == "" || (ch.ValidationRecord[0].AddressUsed == netip.Addr{}) || len(ch.ValidationRecord[0].AddressesResolved) == 0 { return false } case ChallengeTypeDNS01, ChallengeTypeDNSAccount01: if len(ch.ValidationRecord) > 1 { return false } - // TODO(#7140): Add a check for ResolverAddress == "" only after the - // core.proto change has been deployed. if ch.ValidationRecord[0].Hostname == "" { return false }