Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions patch.go

This file was deleted.

16 changes: 16 additions & 0 deletions rfc_vectors_test.go
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion signer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
101 changes: 55 additions & 46 deletions signer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -789,58 +782,74 @@ 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) {
t.Helper()

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) {
t.Helper()

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) {
t.Helper()

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) {
t.Helper()

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"))
})
})
}
2 changes: 1 addition & 1 deletion verification_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
19 changes: 10 additions & 9 deletions verifier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -1889,14 +1886,18 @@ 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) {
t.Helper()

v, err := NewVerifier(kr, tc.opts...)
require.NoError(t, err)
kr := NewKeyResolverMock(t)
tc.configureResolver(t, kr)

results, err := v.Verify(tc.msg, tc.verifyOpts...)
tc.assert(t, err, results)
v, err := NewVerifier(kr, tc.opts...)
require.NoError(t, err)

results, err := v.Verify(tc.msg, tc.verifyOpts...)
tc.assert(t, err, results)
})
})
}

Expand Down
Loading