Skip to content

Commit 6f90d39

Browse files
gbrlsnchsgbrlsnchs
committed
Fix Verify signature
1 parent a6c2004 commit 6f90d39

File tree

3 files changed

+3
-26
lines changed

3 files changed

+3
-26
lines changed

‎bench_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func BenchmarkVerify(b *testing.B) {
7272
b.ReportAllocs()
7373
for n := 0; n < b.N; n++ {
7474
var pl jwt.Payload
75-
if _, err = jwt.Verify(token, &pl, benchHS256); err != nil {
75+
if _, err = jwt.Verify(token, benchHS256, &pl); err != nil {
7676
b.Fatal(err)
7777
}
7878
}

‎sign_test.go

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ var (
3434
func TestSign(t *testing.T) {
3535
type testCase struct {
3636
alg jwt.Algorithm
37-
hd jwt.Header
3837
payload interface{}
3938

4039
verifyAlg jwt.Algorithm
@@ -49,7 +48,6 @@ func TestSign(t *testing.T) {
4948
"HMAC": []testCase{
5049
{
5150
alg: jwt.NewHS256(hmacKey1),
52-
hd: jwt.Header{},
5351
payload: tp,
5452
verifyAlg: jwt.NewHS256(hmacKey1),
5553
wantHeader: jwt.Header{
@@ -62,7 +60,6 @@ func TestSign(t *testing.T) {
6260
},
6361
{
6462
alg: jwt.NewHS384(hmacKey1),
65-
hd: jwt.Header{},
6663
payload: tp,
6764
verifyAlg: jwt.NewHS384(hmacKey1),
6865
wantHeader: jwt.Header{
@@ -75,7 +72,6 @@ func TestSign(t *testing.T) {
7572
},
7673
{
7774
alg: jwt.NewHS512(hmacKey1),
78-
hd: jwt.Header{},
7975
payload: tp,
8076
verifyAlg: jwt.NewHS512(hmacKey1),
8177
wantHeader: jwt.Header{
@@ -90,7 +86,6 @@ func TestSign(t *testing.T) {
9086
"RSA": []testCase{
9187
{
9288
alg: jwt.NewRS256(rsaPrivateKey1, nil),
93-
hd: jwt.Header{},
9489
payload: tp,
9590
verifyAlg: jwt.NewRS256(rsaPrivateKey1, nil),
9691
wantHeader: jwt.Header{
@@ -103,7 +98,6 @@ func TestSign(t *testing.T) {
10398
},
10499
{
105100
alg: jwt.NewRS256(rsaPrivateKey1, nil),
106-
hd: jwt.Header{},
107101
payload: tp,
108102
verifyAlg: jwt.NewRS256(nil, rsaPublicKey1),
109103
wantHeader: jwt.Header{
@@ -116,7 +110,6 @@ func TestSign(t *testing.T) {
116110
},
117111
{
118112
alg: jwt.NewRS384(rsaPrivateKey1, nil),
119-
hd: jwt.Header{},
120113
payload: tp,
121114
verifyAlg: jwt.NewRS384(rsaPrivateKey1, nil),
122115
wantHeader: jwt.Header{
@@ -129,7 +122,6 @@ func TestSign(t *testing.T) {
129122
},
130123
{
131124
alg: jwt.NewRS384(rsaPrivateKey1, nil),
132-
hd: jwt.Header{},
133125
payload: tp,
134126
verifyAlg: jwt.NewRS384(nil, rsaPublicKey1),
135127
wantHeader: jwt.Header{
@@ -142,7 +134,6 @@ func TestSign(t *testing.T) {
142134
},
143135
{
144136
alg: jwt.NewRS512(rsaPrivateKey1, nil),
145-
hd: jwt.Header{},
146137
payload: tp,
147138
verifyAlg: jwt.NewRS512(rsaPrivateKey1, nil),
148139
wantHeader: jwt.Header{
@@ -155,7 +146,6 @@ func TestSign(t *testing.T) {
155146
},
156147
{
157148
alg: jwt.NewRS512(rsaPrivateKey1, nil),
158-
hd: jwt.Header{},
159149
payload: tp,
160150
verifyAlg: jwt.NewRS512(nil, rsaPublicKey1),
161151
wantHeader: jwt.Header{
@@ -170,7 +160,6 @@ func TestSign(t *testing.T) {
170160
"RSA-PSS": []testCase{
171161
{
172162
alg: jwt.NewPS256(rsaPrivateKey1, nil),
173-
hd: jwt.Header{},
174163
payload: tp,
175164
verifyAlg: jwt.NewPS256(rsaPrivateKey1, nil),
176165
wantHeader: jwt.Header{
@@ -183,7 +172,6 @@ func TestSign(t *testing.T) {
183172
},
184173
{
185174
alg: jwt.NewPS256(rsaPrivateKey1, nil),
186-
hd: jwt.Header{},
187175
payload: tp,
188176
verifyAlg: jwt.NewPS256(nil, rsaPublicKey1),
189177
wantHeader: jwt.Header{
@@ -196,7 +184,6 @@ func TestSign(t *testing.T) {
196184
},
197185
{
198186
alg: jwt.NewPS384(rsaPrivateKey1, nil),
199-
hd: jwt.Header{},
200187
payload: tp,
201188
verifyAlg: jwt.NewPS384(rsaPrivateKey1, nil),
202189
wantHeader: jwt.Header{
@@ -209,7 +196,6 @@ func TestSign(t *testing.T) {
209196
},
210197
{
211198
alg: jwt.NewPS384(rsaPrivateKey1, nil),
212-
hd: jwt.Header{},
213199
payload: tp,
214200
verifyAlg: jwt.NewPS384(nil, rsaPublicKey1),
215201
wantHeader: jwt.Header{
@@ -222,7 +208,6 @@ func TestSign(t *testing.T) {
222208
},
223209
{
224210
alg: jwt.NewPS512(rsaPrivateKey1, nil),
225-
hd: jwt.Header{},
226211
payload: tp,
227212
verifyAlg: jwt.NewPS512(rsaPrivateKey1, nil),
228213
wantHeader: jwt.Header{
@@ -235,7 +220,6 @@ func TestSign(t *testing.T) {
235220
},
236221
{
237222
alg: jwt.NewPS512(rsaPrivateKey1, nil),
238-
hd: jwt.Header{},
239223
payload: tp,
240224
verifyAlg: jwt.NewPS512(nil, rsaPublicKey1),
241225
wantHeader: jwt.Header{
@@ -250,7 +234,6 @@ func TestSign(t *testing.T) {
250234
"ECDSA": []testCase{
251235
{
252236
alg: jwt.NewES256(es256PrivateKey1, nil),
253-
hd: jwt.Header{},
254237
payload: tp,
255238
verifyAlg: jwt.NewES256(nil, es256PublicKey1),
256239
wantHeader: jwt.Header{
@@ -263,7 +246,6 @@ func TestSign(t *testing.T) {
263246
},
264247
{
265248
alg: jwt.NewES256(es256PrivateKey1, nil),
266-
hd: jwt.Header{},
267249
payload: tp,
268250
verifyAlg: jwt.NewES256(es256PrivateKey1, nil),
269251
wantHeader: jwt.Header{
@@ -276,7 +258,6 @@ func TestSign(t *testing.T) {
276258
},
277259
{
278260
alg: jwt.NewES384(es384PrivateKey1, nil),
279-
hd: jwt.Header{},
280261
payload: tp,
281262
verifyAlg: jwt.NewES384(nil, es384PublicKey1),
282263
wantHeader: jwt.Header{
@@ -289,7 +270,6 @@ func TestSign(t *testing.T) {
289270
},
290271
{
291272
alg: jwt.NewES384(es384PrivateKey1, nil),
292-
hd: jwt.Header{},
293273
payload: tp,
294274
verifyAlg: jwt.NewES384(es384PrivateKey1, nil),
295275
wantHeader: jwt.Header{
@@ -302,7 +282,6 @@ func TestSign(t *testing.T) {
302282
},
303283
{
304284
alg: jwt.NewES512(es512PrivateKey1, nil),
305-
hd: jwt.Header{},
306285
payload: tp,
307286
verifyAlg: jwt.NewES512(nil, es512PublicKey1),
308287
wantHeader: jwt.Header{
@@ -315,7 +294,6 @@ func TestSign(t *testing.T) {
315294
},
316295
{
317296
alg: jwt.NewES512(es512PrivateKey1, nil),
318-
hd: jwt.Header{},
319297
payload: tp,
320298
verifyAlg: jwt.NewES512(es512PrivateKey1, nil),
321299
wantHeader: jwt.Header{
@@ -330,7 +308,6 @@ func TestSign(t *testing.T) {
330308
"Ed25519": []testCase{
331309
{
332310
alg: jwt.NewEd25519(ed25519PrivateKey1, nil),
333-
hd: jwt.Header{},
334311
payload: tp,
335312
verifyAlg: jwt.NewEd25519(ed25519PrivateKey1, nil),
336313
wantHeader: jwt.Header{
@@ -359,7 +336,7 @@ func TestSign(t *testing.T) {
359336
hd jwt.Header
360337
payload testPayload
361338
)
362-
hd, err = jwt.Verify(token, &payload, tc.verifyAlg)
339+
hd, err = jwt.Verify(token, tc.verifyAlg, &payload)
363340
if want, got := tc.verifyErr, err; got != want {
364341
t.Fatalf("want %v, got %v", want, got)
365342
}

‎verify.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type VerifyOption func(*RawToken) error
1313

1414
// Verify verifies a token's signature using alg. Before verification, opts is iterated and
1515
// each option in it is run.
16-
func Verify(token []byte, payload interface{}, alg Algorithm, opts ...VerifyOption) (Header, error) {
16+
func Verify(token []byte, alg Algorithm, payload interface{}, opts ...VerifyOption) (Header, error) {
1717
rt := &RawToken{
1818
alg: alg,
1919
}

0 commit comments

Comments
 (0)