From f221232a80c8616f565b8a9c6e5920c1cecc0375 Mon Sep 17 00:00:00 2001 From: Herman Slatman Date: Wed, 17 Jan 2024 11:38:54 +0100 Subject: [PATCH] Fix ACME `Validate` test for Wire DPoP challenge --- acme/challenge_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/acme/challenge_test.go b/acme/challenge_test.go index db737758..5bddfa13 100644 --- a/acme/challenge_test.go +++ b/acme/challenge_test.go @@ -1007,14 +1007,16 @@ MCowBQYDK2VwAyEA5c+4NKZSNQcR1T8qN6SjwgdPZQ0Ge12Ylx/YeGAJ35k= jose.Claims Challenge string `json:"chal,omitempty"` Handle string `json:"handle,omitempty"` - ClientID string `json:"client_id,omitempty"` + Nonce string `json:"nonce,omitempty"` + HTU string `json:"htu,omitempty"` }{ Claims: jose.Claims{ Subject: "wireapp://CzbfFjDOQrenCbDxVmgnFw!594930e9d50bb175@wire.com", }, Challenge: "token", Handle: "wireapp://%40alice_wire@wire.com", - ClientID: "wireapp://CzbfFjDOQrenCbDxVmgnFw!594930e9d50bb175@wire.com", + Nonce: "nonce", + HTU: "http://issuer.example.com", }) require.NoError(t, err) dpop, err := dpopSigner.Sign(dpopBytes) @@ -1024,6 +1026,7 @@ MCowBQYDK2VwAyEA5c+4NKZSNQcR1T8qN6SjwgdPZQ0Ge12Ylx/YeGAJ35k= tokenBytes, err := json.Marshal(struct { jose.Claims Challenge string `json:"chal,omitempty"` + Nonce string `json:"nonce,omitempty"` Cnf struct { Kid string `json:"kid,omitempty"` } `json:"cnf"` @@ -1038,6 +1041,7 @@ MCowBQYDK2VwAyEA5c+4NKZSNQcR1T8qN6SjwgdPZQ0Ge12Ylx/YeGAJ35k= Expiry: jose.NewNumericDate(time.Now().Add(1 * time.Minute)), }, Challenge: "token", + Nonce: "nonce", Cnf: struct { Kid string `json:"kid,omitempty"` }{ @@ -1089,6 +1093,7 @@ MCowBQYDK2VwAyEA5c+4NKZSNQcR1T8qN6SjwgdPZQ0Ge12Ylx/YeGAJ35k= TransformTemplate: "", }, DPOP: &wireprovisioner.DPOPOptions{ + Target: "http://issuer.example.com", SigningKey: signerPEMBytes, }, },