From 07ce3a999d5c13dc4e4c9d26af0aa3ed5a1de143 Mon Sep 17 00:00:00 2001 From: Dimitrij Drus Date: Thu, 5 Nov 2026 16:20:11 +0100 Subject: [PATCH 1/2] chore: global test clock replaced with testing/synctest --- patch.go | 8 ---- rfc_vectors_test.go | 16 ++++++++ signer.go | 2 +- signer_test.go | 93 +++++++++++++++++++++--------------------- verification_policy.go | 2 +- verifier_test.go | 17 ++++---- 6 files changed, 73 insertions(+), 65 deletions(-) delete mode 100644 patch.go diff --git a/patch.go b/patch.go deleted file mode 100644 index b4290dc..0000000 --- a/patch.go +++ /dev/null @@ -1,8 +0,0 @@ -package httpsig - -import "time" - -// replaced in tests to use the timestamps from the RFC 9421 test vectors. -// -//nolint:gochecknoglobals -var currentTime = time.Now diff --git a/rfc_vectors_test.go b/rfc_vectors_test.go index c3e5d5e..102fcf4 100644 --- a/rfc_vectors_test.go +++ b/rfc_vectors_test.go @@ -1,5 +1,21 @@ package httpsig +import ( + "testing" + "testing/synctest" + "time" +) + +// withRFC9421Time runs an assertion at the timestamp used by RFC 9421 test vectors. +func withRFC9421Time(t *testing.T, run func(*testing.T)) { + t.Helper() + + synctest.Test(t, func(t *testing.T) { + time.Sleep(time.Until(time.Unix(1618884473, 0))) + run(t) + }) +} + // from https://www.rfc-editor.org/rfc/rfc9421.html#name-example-rsa-pss-key // nolint: gochecknoglobals var ( diff --git a/signer.go b/signer.go index ed8ac20..2ef35c8 100644 --- a/signer.go +++ b/signer.go @@ -153,7 +153,7 @@ func (s *signer) Sign(msg *Message, opts ...SignOption) (http.Header, error) { } func (s *signer) signatureInput(opts signOptions) *signatureInput { - created := currentTime().UTC() + created := time.Now().UTC() params := httpsfv.NewParams() params.Add(string(Created), created.Unix()) diff --git a/signer_test.go b/signer_test.go index c0ce3b9..cf4f67f 100644 --- a/signer_test.go +++ b/signer_test.go @@ -211,13 +211,6 @@ func TestNewSigner(t *testing.T) { } func TestSignerSign(t *testing.T) { - // used by RFC9421 in test vectors - currentTime = func() time.Time { return time.Unix(1618884473, 0) } - - t.Cleanup(func() { - currentTime = time.Now - }) - pkp384, err := ecdsa.GenerateKey(elliptic.P384(), rand.Reader) require.NoError(t, err) @@ -789,58 +782,66 @@ func TestSignerSign(t *testing.T) { }, } { t.Run(tc.uc, func(t *testing.T) { - s, err := NewSigner(tc.key, tc.opts...) - require.NoError(t, err) + withRFC9421Time(t, func(t *testing.T) { + s, err := NewSigner(tc.key, tc.opts...) + require.NoError(t, err) - res, err := s.Sign(tc.msg, tc.signOpts...) + res, err := s.Sign(tc.msg, tc.signOpts...) - tc.assert(t, err, res) + tc.assert(t, err, res) + }) }) } t.Run("per-call label does not persist", func(t *testing.T) { - s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, - WithTTL(0), - WithLabel("static"), - ) - require.NoError(t, err) - - first, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}, WithLabel("dynamic")) - require.NoError(t, err) - assert.Equal(t, `dynamic=();created=1618884473`, first.Get("Signature-Input")) - - second, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}) - require.NoError(t, err) - assert.Equal(t, `static=();created=1618884473`, second.Get("Signature-Input")) + withRFC9421Time(t, func(t *testing.T) { + s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, + WithTTL(0), + WithLabel("static"), + ) + require.NoError(t, err) + + first, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}, WithLabel("dynamic")) + require.NoError(t, err) + assert.Equal(t, `dynamic=();created=1618884473`, first.Get("Signature-Input")) + + second, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}) + require.NoError(t, err) + assert.Equal(t, `static=();created=1618884473`, second.Get("Signature-Input")) + }) }) t.Run("per-call nonce does not persist", func(t *testing.T) { - s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, WithTTL(0)) - require.NoError(t, err) + withRFC9421Time(t, func(t *testing.T) { + s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, WithTTL(0)) + require.NoError(t, err) - first, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}, - WithParameter("nonce", "requested-nonce")) - require.NoError(t, err) - assert.Equal(t, `sig=();created=1618884473;nonce="requested-nonce"`, first.Get("Signature-Input")) + first, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}, + WithParameter("nonce", "requested-nonce")) + require.NoError(t, err) + assert.Equal(t, `sig=();created=1618884473;nonce="requested-nonce"`, first.Get("Signature-Input")) - second, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}) - require.NoError(t, err) - assert.Equal(t, `sig=();created=1618884473`, second.Get("Signature-Input")) + second, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}) + require.NoError(t, err) + assert.Equal(t, `sig=();created=1618884473`, second.Get("Signature-Input")) + }) }) t.Run("per-call parameters do not persist", func(t *testing.T) { - s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, - WithTTL(0), - ) - require.NoError(t, err) - - first, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}, - WithParameter("wimse-req-nonce", "request-nonce")) - require.NoError(t, err) - assert.Contains(t, first.Get("Signature-Input"), `;wimse-req-nonce="request-nonce"`) - - second, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}) - require.NoError(t, err) - assert.Equal(t, `sig=();created=1618884473`, second.Get("Signature-Input")) + withRFC9421Time(t, func(t *testing.T) { + s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, + WithTTL(0), + ) + require.NoError(t, err) + + first, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}, + WithParameter("wimse-req-nonce", "request-nonce")) + require.NoError(t, err) + assert.Contains(t, first.Get("Signature-Input"), `;wimse-req-nonce="request-nonce"`) + + second, err := s.Sign(&Message{Header: http.Header{}, IsRequest: true}) + require.NoError(t, err) + assert.Equal(t, `sig=();created=1618884473`, second.Get("Signature-Input")) + }) }) } diff --git a/verification_policy.go b/verification_policy.go index 5ee8956..7e588f0 100644 --- a/verification_policy.go +++ b/verification_policy.go @@ -254,7 +254,7 @@ func (e *verificationPolicy) assertMetadata(si *signatureInput, msg *Message) er mv messageVerifier ) - now := currentTime().UTC() + now := time.Now().UTC() expires, expiresPresent := si.expires() if !expiresPresent { diff --git a/verifier_test.go b/verifier_test.go index 05649a7..0b5a1ee 100644 --- a/verifier_test.go +++ b/verifier_test.go @@ -465,9 +465,6 @@ func TestNewVerifier(t *testing.T) { } func TestVerifierVerify(t *testing.T) { - // used by RFC9421 in test vectors - currentTime = func() time.Time { return time.Unix(1618884473, 0) } - testURL, err := url.Parse("http://example.com/foo?param=Value&Pet=dog") require.NoError(t, err) @@ -1889,14 +1886,16 @@ func TestVerifierVerify(t *testing.T) { }, } { t.Run(uc, func(t *testing.T) { - kr := NewKeyResolverMock(t) - tc.configureResolver(t, kr) + withRFC9421Time(t, func(t *testing.T) { + kr := NewKeyResolverMock(t) + tc.configureResolver(t, kr) - v, err := NewVerifier(kr, tc.opts...) - require.NoError(t, err) + v, err := NewVerifier(kr, tc.opts...) + require.NoError(t, err) - results, err := v.Verify(tc.msg, tc.verifyOpts...) - tc.assert(t, err, results) + results, err := v.Verify(tc.msg, tc.verifyOpts...) + tc.assert(t, err, results) + }) }) } From f058af70c61cafd770424f813f0ad208150aa8b6 Mon Sep 17 00:00:00 2001 From: Dimitrij Drus Date: Thu, 5 Nov 2026 16:32:09 +0100 Subject: [PATCH 2/2] linter warnings resolved --- signer_test.go | 8 ++++++++ verifier_test.go | 2 ++ 2 files changed, 10 insertions(+) diff --git a/signer_test.go b/signer_test.go index cf4f67f..fc3a76d 100644 --- a/signer_test.go +++ b/signer_test.go @@ -783,6 +783,8 @@ func TestSignerSign(t *testing.T) { } { t.Run(tc.uc, func(t *testing.T) { withRFC9421Time(t, func(t *testing.T) { + t.Helper() + s, err := NewSigner(tc.key, tc.opts...) require.NoError(t, err) @@ -795,6 +797,8 @@ func TestSignerSign(t *testing.T) { t.Run("per-call label does not persist", func(t *testing.T) { withRFC9421Time(t, func(t *testing.T) { + t.Helper() + s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, WithTTL(0), WithLabel("static"), @@ -813,6 +817,8 @@ func TestSignerSign(t *testing.T) { t.Run("per-call nonce does not persist", func(t *testing.T) { withRFC9421Time(t, func(t *testing.T) { + t.Helper() + s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, WithTTL(0)) require.NoError(t, err) @@ -829,6 +835,8 @@ func TestSignerSign(t *testing.T) { t.Run("per-call parameters do not persist", func(t *testing.T) { withRFC9421Time(t, func(t *testing.T) { + t.Helper() + s, err := NewSigner(Key{Algorithm: HmacSha256, Material: []byte("secret")}, WithTTL(0), ) diff --git a/verifier_test.go b/verifier_test.go index 0b5a1ee..64660a9 100644 --- a/verifier_test.go +++ b/verifier_test.go @@ -1887,6 +1887,8 @@ func TestVerifierVerify(t *testing.T) { } { t.Run(uc, func(t *testing.T) { withRFC9421Time(t, func(t *testing.T) { + t.Helper() + kr := NewKeyResolverMock(t) tc.configureResolver(t, kr)