Skip to content

Commit e30bf45

Browse files
authored
Remove TODOs from challenge.RecordsSane (#8670)
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.
1 parent a838861 commit e30bf45

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

core/objects.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,7 @@ func (ch Challenge) RecordsSane() bool {
189189
switch ch.Type {
190190
case ChallengeTypeHTTP01:
191191
for _, rec := range ch.ValidationRecord {
192-
// TODO(#7140): Add a check for ResolverAddress == "" only after the
193-
// core.proto change has been deployed.
194-
if rec.URL == "" || rec.Hostname == "" || rec.Port == "" || (rec.AddressUsed == netip.Addr{}) ||
195-
len(rec.AddressesResolved) == 0 {
192+
if rec.URL == "" || rec.Hostname == "" || rec.Port == "" || (rec.AddressUsed == netip.Addr{}) || len(rec.AddressesResolved) == 0 {
196193
return false
197194
}
198195
}
@@ -203,18 +200,13 @@ func (ch Challenge) RecordsSane() bool {
203200
if ch.ValidationRecord[0].URL != "" {
204201
return false
205202
}
206-
// TODO(#7140): Add a check for ResolverAddress == "" only after the
207-
// core.proto change has been deployed.
208-
if ch.ValidationRecord[0].Hostname == "" || ch.ValidationRecord[0].Port == "" ||
209-
(ch.ValidationRecord[0].AddressUsed == netip.Addr{}) || len(ch.ValidationRecord[0].AddressesResolved) == 0 {
203+
if ch.ValidationRecord[0].Hostname == "" || ch.ValidationRecord[0].Port == "" || (ch.ValidationRecord[0].AddressUsed == netip.Addr{}) || len(ch.ValidationRecord[0].AddressesResolved) == 0 {
210204
return false
211205
}
212206
case ChallengeTypeDNS01, ChallengeTypeDNSAccount01:
213207
if len(ch.ValidationRecord) > 1 {
214208
return false
215209
}
216-
// TODO(#7140): Add a check for ResolverAddress == "" only after the
217-
// core.proto change has been deployed.
218210
if ch.ValidationRecord[0].Hostname == "" {
219211
return false
220212
}

0 commit comments

Comments
 (0)