@@ -211,13 +211,6 @@ func TestNewSigner(t *testing.T) {
211211}
212212
213213func TestSignerSign (t * testing.T ) {
214- // used by RFC9421 in test vectors
215- currentTime = func () time.Time { return time .Unix (1618884473 , 0 ) }
216-
217- t .Cleanup (func () {
218- currentTime = time .Now
219- })
220-
221214 pkp384 , err := ecdsa .GenerateKey (elliptic .P384 (), rand .Reader )
222215 require .NoError (t , err )
223216
@@ -789,58 +782,74 @@ func TestSignerSign(t *testing.T) {
789782 },
790783 } {
791784 t .Run (tc .uc , func (t * testing.T ) {
792- s , err := NewSigner (tc .key , tc .opts ... )
793- require .NoError (t , err )
785+ withRFC9421Time (t , func (t * testing.T ) {
786+ t .Helper ()
787+
788+ s , err := NewSigner (tc .key , tc .opts ... )
789+ require .NoError (t , err )
794790
795- res , err := s .Sign (tc .msg , tc .signOpts ... )
791+ res , err := s .Sign (tc .msg , tc .signOpts ... )
796792
797- tc .assert (t , err , res )
793+ tc .assert (t , err , res )
794+ })
798795 })
799796 }
800797
801798 t .Run ("per-call label does not persist" , func (t * testing.T ) {
802- s , err := NewSigner (Key {Algorithm : HmacSha256 , Material : []byte ("secret" )},
803- WithTTL (0 ),
804- WithLabel ("static" ),
805- )
806- require .NoError (t , err )
807-
808- first , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true }, WithLabel ("dynamic" ))
809- require .NoError (t , err )
810- assert .Equal (t , `dynamic=();created=1618884473` , first .Get ("Signature-Input" ))
811-
812- second , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true })
813- require .NoError (t , err )
814- assert .Equal (t , `static=();created=1618884473` , second .Get ("Signature-Input" ))
799+ withRFC9421Time (t , func (t * testing.T ) {
800+ t .Helper ()
801+
802+ s , err := NewSigner (Key {Algorithm : HmacSha256 , Material : []byte ("secret" )},
803+ WithTTL (0 ),
804+ WithLabel ("static" ),
805+ )
806+ require .NoError (t , err )
807+
808+ first , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true }, WithLabel ("dynamic" ))
809+ require .NoError (t , err )
810+ assert .Equal (t , `dynamic=();created=1618884473` , first .Get ("Signature-Input" ))
811+
812+ second , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true })
813+ require .NoError (t , err )
814+ assert .Equal (t , `static=();created=1618884473` , second .Get ("Signature-Input" ))
815+ })
815816 })
816817
817818 t .Run ("per-call nonce does not persist" , func (t * testing.T ) {
818- s , err := NewSigner (Key {Algorithm : HmacSha256 , Material : []byte ("secret" )}, WithTTL (0 ))
819- require .NoError (t , err )
819+ withRFC9421Time (t , func (t * testing.T ) {
820+ t .Helper ()
821+
822+ s , err := NewSigner (Key {Algorithm : HmacSha256 , Material : []byte ("secret" )}, WithTTL (0 ))
823+ require .NoError (t , err )
820824
821- first , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true },
822- WithParameter ("nonce" , "requested-nonce" ))
823- require .NoError (t , err )
824- assert .Equal (t , `sig=();created=1618884473;nonce="requested-nonce"` , first .Get ("Signature-Input" ))
825+ first , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true },
826+ WithParameter ("nonce" , "requested-nonce" ))
827+ require .NoError (t , err )
828+ assert .Equal (t , `sig=();created=1618884473;nonce="requested-nonce"` , first .Get ("Signature-Input" ))
825829
826- second , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true })
827- require .NoError (t , err )
828- assert .Equal (t , `sig=();created=1618884473` , second .Get ("Signature-Input" ))
830+ second , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true })
831+ require .NoError (t , err )
832+ assert .Equal (t , `sig=();created=1618884473` , second .Get ("Signature-Input" ))
833+ })
829834 })
830835
831836 t .Run ("per-call parameters do not persist" , func (t * testing.T ) {
832- s , err := NewSigner (Key {Algorithm : HmacSha256 , Material : []byte ("secret" )},
833- WithTTL (0 ),
834- )
835- require .NoError (t , err )
836-
837- first , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true },
838- WithParameter ("wimse-req-nonce" , "request-nonce" ))
839- require .NoError (t , err )
840- assert .Contains (t , first .Get ("Signature-Input" ), `;wimse-req-nonce="request-nonce"` )
841-
842- second , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true })
843- require .NoError (t , err )
844- assert .Equal (t , `sig=();created=1618884473` , second .Get ("Signature-Input" ))
837+ withRFC9421Time (t , func (t * testing.T ) {
838+ t .Helper ()
839+
840+ s , err := NewSigner (Key {Algorithm : HmacSha256 , Material : []byte ("secret" )},
841+ WithTTL (0 ),
842+ )
843+ require .NoError (t , err )
844+
845+ first , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true },
846+ WithParameter ("wimse-req-nonce" , "request-nonce" ))
847+ require .NoError (t , err )
848+ assert .Contains (t , first .Get ("Signature-Input" ), `;wimse-req-nonce="request-nonce"` )
849+
850+ second , err := s .Sign (& Message {Header : http.Header {}, IsRequest : true })
851+ require .NoError (t , err )
852+ assert .Equal (t , `sig=();created=1618884473` , second .Get ("Signature-Input" ))
853+ })
845854 })
846855}
0 commit comments