Skip to content

Commit 66c2caf

Browse files
test: Update challtestsrv for dns-persist-01 (#8653)
Update github.com/letsencrypt/challtestsrv to v1.4.2, which adds support for dns-persist-01: https://github.com/letsencrypt/challtestsrv/releases/tag/v1.4.2 Part of #8527
1 parent 1c34e3e commit 66c2caf

24 files changed

Lines changed: 520 additions & 427 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ require (
1616
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
1717
github.com/jmhodges/clock v1.2.0
1818
github.com/letsencrypt/borp v0.0.0-20251118150929-89c6927051ae
19-
github.com/letsencrypt/challtestsrv v1.3.3
19+
github.com/letsencrypt/challtestsrv v1.4.2
2020
github.com/letsencrypt/pkcs11key/v4 v4.0.0
2121
github.com/letsencrypt/validator/v10 v10.0.0-20230215210743-a0c7dfc17158
22-
github.com/miekg/dns v1.1.61
22+
github.com/miekg/dns v1.1.62
2323
github.com/miekg/pkcs11 v1.1.1
2424
github.com/nxadm/tail v1.4.11
2525
github.com/prometheus/client_golang v1.22.0

go.sum

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
153153
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
154154
github.com/letsencrypt/borp v0.0.0-20251118150929-89c6927051ae h1:yFuF5yRIwaandcuNMi1A4he4FMWJsGRv38rsizIaxJA=
155155
github.com/letsencrypt/borp v0.0.0-20251118150929-89c6927051ae/go.mod h1:gMSMCNKhxox/ccR923EJsIvHeVVYfCABGbirqa0EwuM=
156-
github.com/letsencrypt/challtestsrv v1.3.3 h1:ki02PH84fo6IOe/A+zt1/kfRBp2JrtauEaa5xwjg4/Q=
157-
github.com/letsencrypt/challtestsrv v1.3.3/go.mod h1:Ur4e4FvELUXLGhkMztHOsPIsvGxD/kzSJninOrkM+zc=
156+
github.com/letsencrypt/challtestsrv v1.4.2 h1:0ON3ldMhZyWlfVNYYpFuWRTmZNnyfiL9Hh5YzC3JVwU=
157+
github.com/letsencrypt/challtestsrv v1.4.2/go.mod h1:GhqMqcSoeGpYd5zX5TgwA6er/1MbWzx/o7yuuVya+Wk=
158158
github.com/letsencrypt/pkcs11key/v4 v4.0.0 h1:qLc/OznH7xMr5ARJgkZCCWk+EomQkiNTOoOF5LAgagc=
159159
github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag=
160160
github.com/letsencrypt/validator/v10 v10.0.0-20230215210743-a0c7dfc17158 h1:HGFsIltYMUiB5eoFSowFzSoXkocM2k9ctmJ57QMGjys=
@@ -168,9 +168,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
168168
github.com/mattn/go-sqlite3 v1.14.26 h1:h72fc7d3zXGhHpwjWw+fPOBxYUupuKlbhUAQi5n6t58=
169169
github.com/mattn/go-sqlite3 v1.14.26/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
170170
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
171-
github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
172-
github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
173-
github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
171+
github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
172+
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
174173
github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
175174
github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
176175
github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
@@ -355,7 +354,6 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
355354
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
356355
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
357356
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
358-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
359357
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
360358
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
361359
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
@@ -375,7 +373,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
375373
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
376374
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
377375
golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
378-
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
379376
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
380377
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
381378
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

test/chall-test-srv/dnsone.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (srv *managementServer) addDNS01(w http.ResponseWriter, r *http.Request) {
2828
}
2929

3030
// Add the DNS-01 challenge response TXT to the challenge server
31-
srv.challSrv.AddDNSOneChallenge(request.Host, request.Value)
31+
srv.challSrv.AddDNSTXTRecord(request.Host, request.Value)
3232
srv.log.Printf("Added DNS-01 TXT challenge for Host %q - Value %q\n",
3333
request.Host, request.Value)
3434
w.WriteHeader(http.StatusOK)
@@ -59,7 +59,7 @@ func (srv *managementServer) delDNS01(w http.ResponseWriter, r *http.Request) {
5959

6060
// Delete the DNS-01 challenge response TXT for the given host from the
6161
// challenge server
62-
srv.challSrv.DeleteDNSOneChallenge(request.Host)
62+
srv.challSrv.DeleteDNSTXTRecord(request.Host)
6363
srv.log.Printf("Removed DNS-01 TXT challenge for Host %q\n", request.Host)
6464
w.WriteHeader(http.StatusOK)
6565
}

test/chall-test-srv/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func main() {
8484
httpOneAddresses := filterEmpty(strings.Split(*httpOneBind, ","))
8585
httpsOneAddresses := filterEmpty(strings.Split(*httpsOneBind, ","))
8686
dohAddresses := filterEmpty(strings.Split(*dohBind, ","))
87-
dnsOneAddresses := filterEmpty(strings.Split(*dnsOneBind, ","))
87+
dnsAddresses := filterEmpty(strings.Split(*dnsOneBind, ","))
8888
tlsAlpnOneAddresses := filterEmpty(strings.Split(*tlsAlpnOneBind, ","))
8989

9090
logger := log.New(os.Stdout, "chall-test-srv - ", log.Ldate|log.Ltime)
@@ -96,7 +96,7 @@ func main() {
9696
DOHAddrs: dohAddresses,
9797
DOHCert: *dohCert,
9898
DOHCertKey: *dohCertKey,
99-
DNSOneAddrs: dnsOneAddresses,
99+
DNSAddrs: dnsAddresses,
100100
TLSALPNOneAddrs: tlsAlpnOneAddresses,
101101
Log: logger,
102102
})

test/chall-test-srv/mockdns.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (srv *managementServer) delDNSAAAARecord(w http.ResponseWriter, r *http.Req
194194
func (srv *managementServer) addDNSCAARecord(w http.ResponseWriter, r *http.Request) {
195195
var request struct {
196196
Host string
197-
Policies []challtestsrv.MockCAAPolicy
197+
Policies []challtestsrv.CAAPolicy
198198
}
199199
if err := mustParsePOST(&request, r); err != nil {
200200
http.Error(w, err.Error(), http.StatusBadRequest)

test/load-generator/boulder-calls.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ func completeAuthorization(authz *core.Authorization, s *State, c *acmeCache) er
296296
h.Write([]byte(authStr))
297297
authorizedKeysDigest := base64.RawURLEncoding.EncodeToString(h.Sum(nil))
298298
domain := "_acme-challenge." + authz.Identifier.Value + "."
299-
s.challSrv.AddDNSOneChallenge(domain, authorizedKeysDigest)
300-
defer s.challSrv.DeleteDNSOneChallenge(domain)
299+
s.challSrv.AddDNSTXTRecord(domain, authorizedKeysDigest)
300+
defer s.challSrv.DeleteDNSTXTRecord(domain)
301301
case core.ChallengeTypeTLSALPN01:
302302
s.challSrv.AddTLSALPNChallenge(authz.Identifier.Value, authStr)
303303
defer s.challSrv.DeleteTLSALPNChallenge(authz.Identifier.Value)

test/load-generator/state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func (s *State) Run(
355355
challSrv, err := challtestsrv.New(challtestsrv.Config{
356356
HTTPOneAddrs: httpOneAddrs,
357357
TLSALPNOneAddrs: tlsALPNOneAddrs,
358-
DNSOneAddrs: dnsAddrs,
358+
DNSAddrs: dnsAddrs,
359359
// Use a logger that has a load-generator prefix
360360
Log: log.New(os.Stdout, "load-generator challsrv - ", log.LstdFlags),
361361
})

vendor/github.com/letsencrypt/challtestsrv/.golangci.yaml

Lines changed: 72 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/letsencrypt/challtestsrv/README.md

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)