Skip to content

Commit 8976018

Browse files
alnralnr
committed
fix: lint
1 parent 4d6664a commit 8976018

40 files changed

Lines changed: 223 additions & 262 deletions

‎access_request_handler_test.go‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package fosite_test
55

66
import (
7-
"context"
87
"encoding/base64"
98
"fmt"
109
"net/http"
@@ -29,8 +28,6 @@ func TestNewAccessRequest(t *testing.T) {
2928
hasher := internal.NewMockHasher(ctrl)
3029
defer ctrl.Finish()
3130

32-
ctx := gomock.AssignableToTypeOf(context.WithValue(context.TODO(), ContextKey("test"), nil))
33-
3431
client := &DefaultClient{}
3532
config := &Config{ClientSecretsHasher: hasher, AudienceMatchingStrategy: DefaultAudienceMatchingStrategy}
3633
fosite := &Fosite{Store: store, Config: config}
@@ -121,7 +118,7 @@ func TestNewAccessRequest(t *testing.T) {
121118
store.EXPECT().GetClient(gomock.Any(), gomock.Eq("foo")).Return(client, nil)
122119
client.Public = false
123120
client.Secret = []byte("foo")
124-
hasher.EXPECT().Compare(ctx, gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(errors.New(""))
121+
hasher.EXPECT().Compare(gomock.Any(), gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(errors.New(""))
125122
},
126123
handlers: TokenEndpointHandlers{handler},
127124
},
@@ -138,7 +135,7 @@ func TestNewAccessRequest(t *testing.T) {
138135
store.EXPECT().GetClient(gomock.Any(), gomock.Eq("foo")).Return(client, nil)
139136
client.Public = false
140137
client.Secret = []byte("foo")
141-
hasher.EXPECT().Compare(ctx, gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(nil)
138+
hasher.EXPECT().Compare(gomock.Any(), gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(nil)
142139
handler.EXPECT().HandleTokenEndpointRequest(gomock.Any(), gomock.Any()).Return(ErrServerError)
143140
},
144141
handlers: TokenEndpointHandlers{handler},
@@ -155,7 +152,7 @@ func TestNewAccessRequest(t *testing.T) {
155152
store.EXPECT().GetClient(gomock.Any(), gomock.Eq("foo")).Return(client, nil)
156153
client.Public = false
157154
client.Secret = []byte("foo")
158-
hasher.EXPECT().Compare(ctx, gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(nil)
155+
hasher.EXPECT().Compare(gomock.Any(), gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(nil)
159156
handler.EXPECT().HandleTokenEndpointRequest(gomock.Any(), gomock.Any()).Return(nil)
160157
},
161158
handlers: TokenEndpointHandlers{handler},
@@ -355,8 +352,6 @@ func TestNewAccessRequestWithMixedClientAuth(t *testing.T) {
355352
hasher := internal.NewMockHasher(ctrl)
356353
defer ctrl.Finish()
357354

358-
ctx := gomock.AssignableToTypeOf(context.WithValue(context.TODO(), ContextKey("test"), nil))
359-
360355
client := &DefaultClient{}
361356
config := &Config{ClientSecretsHasher: hasher, AudienceMatchingStrategy: DefaultAudienceMatchingStrategy}
362357
fosite := &Fosite{Store: store, Config: config}
@@ -380,7 +375,7 @@ func TestNewAccessRequestWithMixedClientAuth(t *testing.T) {
380375
store.EXPECT().GetClient(gomock.Any(), gomock.Eq("foo")).Return(client, nil)
381376
client.Public = false
382377
client.Secret = []byte("foo")
383-
hasher.EXPECT().Compare(ctx, gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(errors.New("hash err"))
378+
hasher.EXPECT().Compare(gomock.Any(), gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(errors.New("hash err"))
384379
handlerWithoutClientAuth.EXPECT().HandleTokenEndpointRequest(gomock.Any(), gomock.Any()).Return(nil)
385380
},
386381
method: "POST",
@@ -398,7 +393,7 @@ func TestNewAccessRequestWithMixedClientAuth(t *testing.T) {
398393
store.EXPECT().GetClient(gomock.Any(), gomock.Eq("foo")).Return(client, nil)
399394
client.Public = false
400395
client.Secret = []byte("foo")
401-
hasher.EXPECT().Compare(ctx, gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(nil)
396+
hasher.EXPECT().Compare(gomock.Any(), gomock.Eq([]byte("foo")), gomock.Eq([]byte("bar"))).Return(nil)
402397
handlerWithoutClientAuth.EXPECT().HandleTokenEndpointRequest(gomock.Any(), gomock.Any()).Return(nil)
403398
handlerWithClientAuth.EXPECT().HandleTokenEndpointRequest(gomock.Any(), gomock.Any()).Return(nil)
404399
},

‎authorize_helper_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package fosite_test
66
import (
77
"bytes"
88
"context"
9-
"io/ioutil"
9+
"io"
1010
"net/url"
1111
"strings"
1212
"testing"
@@ -284,7 +284,7 @@ func TestWriteAuthorizeFormPostResponse(t *testing.T) {
284284
redirectURL := "https://localhost:8080/cb"
285285
//parameters :=
286286
fosite.WriteAuthorizeFormPostResponse(redirectURL, c.parameters, fosite.DefaultFormPostTemplate, &responseBuffer)
287-
code, state, _, _, customParams, _, err := internal.ParseFormPostResponse(redirectURL, ioutil.NopCloser(bytes.NewReader(responseBuffer.Bytes())))
287+
code, state, _, _, customParams, _, err := internal.ParseFormPostResponse(redirectURL, io.NopCloser(bytes.NewReader(responseBuffer.Bytes())))
288288
assert.NoError(t, err, "case %d", d)
289289
c.check(code, state, customParams, d)
290290

‎authorize_request_handler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package fosite
66
import (
77
"context"
88
"fmt"
9-
"io/ioutil"
9+
"io"
1010
"net/http"
1111
"strings"
1212

@@ -76,7 +76,7 @@ func (f *Fosite) authorizeRequestParametersFromOpenIDConnectRequest(ctx context.
7676
return errorsx.WithStack(ErrInvalidRequestURI.WithHintf("Unable to fetch OpenID Connect request parameters from 'request_uri' because status code '%d' was expected, but got '%d'.", http.StatusOK, response.StatusCode))
7777
}
7878

79-
body, err := ioutil.ReadAll(response.Body)
79+
body, err := io.ReadAll(response.Body)
8080
if err != nil {
8181
return errorsx.WithStack(ErrInvalidRequestURI.WithHintf("Unable to fetch OpenID Connect request parameters from 'request_uri' because body parsing failed with: %s.", err).WithWrap(err).WithDebug(err.Error()))
8282
}

‎client_authentication_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ func TestAuthenticateClient(t *testing.T) {
115115
},
116116
}
117117

118-
var h http.HandlerFunc
119-
h = func(w http.ResponseWriter, r *http.Request) {
118+
var h http.HandlerFunc = func(w http.ResponseWriter, r *http.Request) {
120119
require.NoError(t, json.NewEncoder(w).Encode(rsaJwks))
121120
}
122121
ts := httptest.NewServer(h)
@@ -586,12 +585,12 @@ func TestAuthenticateClientTwice(t *testing.T) {
586585
"aud": "token-url",
587586
}, key, "kid-foo")}, "client_assertion_type": []string{at}}
588587

589-
c, err := f.AuthenticateClient(nil, new(http.Request), formValues)
588+
c, err := f.AuthenticateClient(context.Background(), new(http.Request), formValues)
590589
require.NoError(t, err, "%#v", err)
591590
assert.Equal(t, client, c)
592591

593592
// replay the request and expect it to fail
594-
c, err = f.AuthenticateClient(nil, new(http.Request), formValues)
593+
c, err = f.AuthenticateClient(context.Background(), new(http.Request), formValues)
595594
require.Error(t, err)
596595
assert.EqualError(t, err, ErrJTIKnown.Error())
597596
assert.Nil(t, c)

‎handler/oauth2/flow_authorize_code_auth_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package oauth2
55

66
import (
7+
"context"
78
"net/url"
89
"strings"
910
"testing"
@@ -161,7 +162,7 @@ func TestAuthorizeCode_HandleAuthorizeEndpointRequest(t *testing.T) {
161162
} {
162163
t.Run("case="+c.description, func(t *testing.T) {
163164
aresp := fosite.NewAuthorizeResponse()
164-
err := c.handler.HandleAuthorizeEndpointRequest(nil, c.areq, aresp)
165+
err := c.handler.HandleAuthorizeEndpointRequest(context.Background(), c.areq, aresp)
165166
if c.expectErr != nil {
166167
require.EqualError(t, err, c.expectErr.Error())
167168
} else {

‎handler/oauth2/flow_authorize_code_token_test.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestAuthorizeCode_PopulateTokenEndpointResponse(t *testing.T) {
5959
},
6060
description: "should fail because authcode not found",
6161
setup: func(t *testing.T, areq *fosite.AccessRequest, config *fosite.Config) {
62-
code, _, err := strategy.GenerateAuthorizeCode(nil, nil)
62+
code, _, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
6363
require.NoError(t, err)
6464
areq.Form.Set("code", code)
6565
},
@@ -79,7 +79,7 @@ func TestAuthorizeCode_PopulateTokenEndpointResponse(t *testing.T) {
7979
},
8080
description: "should fail because validation failed",
8181
setup: func(t *testing.T, areq *fosite.AccessRequest, config *fosite.Config) {
82-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, "bar", areq))
82+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), "bar", areq))
8383
},
8484
expectErr: fosite.ErrInvalidRequest,
8585
},
@@ -97,11 +97,11 @@ func TestAuthorizeCode_PopulateTokenEndpointResponse(t *testing.T) {
9797
},
9898
},
9999
setup: func(t *testing.T, areq *fosite.AccessRequest, config *fosite.Config) {
100-
code, sig, err := strategy.GenerateAuthorizeCode(nil, nil)
100+
code, sig, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
101101
require.NoError(t, err)
102102
areq.Form.Add("code", code)
103103

104-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, sig, areq))
104+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), sig, areq))
105105
},
106106
description: "should pass with offline scope and refresh token",
107107
check: func(t *testing.T, aresp *fosite.AccessResponse) {
@@ -127,11 +127,11 @@ func TestAuthorizeCode_PopulateTokenEndpointResponse(t *testing.T) {
127127
},
128128
setup: func(t *testing.T, areq *fosite.AccessRequest, config *fosite.Config) {
129129
config.RefreshTokenScopes = []string{}
130-
code, sig, err := strategy.GenerateAuthorizeCode(nil, nil)
130+
code, sig, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
131131
require.NoError(t, err)
132132
areq.Form.Add("code", code)
133133

134-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, sig, areq))
134+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), sig, areq))
135135
},
136136
description: "should pass with refresh token always provided",
137137
check: func(t *testing.T, aresp *fosite.AccessResponse) {
@@ -157,11 +157,11 @@ func TestAuthorizeCode_PopulateTokenEndpointResponse(t *testing.T) {
157157
},
158158
setup: func(t *testing.T, areq *fosite.AccessRequest, config *fosite.Config) {
159159
config.RefreshTokenScopes = []string{}
160-
code, sig, err := strategy.GenerateAuthorizeCode(nil, nil)
160+
code, sig, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
161161
require.NoError(t, err)
162162
areq.Form.Add("code", code)
163163

164-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, sig, areq))
164+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), sig, areq))
165165
},
166166
description: "should pass with no refresh token",
167167
check: func(t *testing.T, aresp *fosite.AccessResponse) {
@@ -186,11 +186,11 @@ func TestAuthorizeCode_PopulateTokenEndpointResponse(t *testing.T) {
186186
},
187187
},
188188
setup: func(t *testing.T, areq *fosite.AccessRequest, config *fosite.Config) {
189-
code, sig, err := strategy.GenerateAuthorizeCode(nil, nil)
189+
code, sig, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
190190
require.NoError(t, err)
191191
areq.Form.Add("code", code)
192192

193-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, sig, areq))
193+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), sig, areq))
194194
},
195195
description: "should not have refresh token",
196196
check: func(t *testing.T, aresp *fosite.AccessResponse) {
@@ -222,7 +222,7 @@ func TestAuthorizeCode_PopulateTokenEndpointResponse(t *testing.T) {
222222
}
223223

224224
aresp := fosite.NewAccessResponse()
225-
err := h.PopulateTokenEndpointResponse(nil, c.areq, aresp)
225+
err := h.PopulateTokenEndpointResponse(context.Background(), c.areq, aresp)
226226

227227
if c.expectErr != nil {
228228
require.EqualError(t, err, c.expectErr.Error(), "%+v", err)
@@ -294,7 +294,7 @@ func TestAuthorizeCode_HandleTokenEndpointRequest(t *testing.T) {
294294
},
295295
description: "should fail because authcode could not be retrieved (1)",
296296
setup: func(t *testing.T, areq *fosite.AccessRequest, authreq *fosite.AuthorizeRequest) {
297-
token, _, err := strategy.GenerateAuthorizeCode(nil, nil)
297+
token, _, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
298298
require.NoError(t, err)
299299
areq.Form = url.Values{"code": {token}}
300300
},
@@ -330,11 +330,11 @@ func TestAuthorizeCode_HandleTokenEndpointRequest(t *testing.T) {
330330
},
331331
description: "should fail because client mismatch",
332332
setup: func(t *testing.T, areq *fosite.AccessRequest, authreq *fosite.AuthorizeRequest) {
333-
token, signature, err := strategy.GenerateAuthorizeCode(nil, nil)
333+
token, signature, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
334334
require.NoError(t, err)
335335
areq.Form = url.Values{"code": {token}}
336336

337-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, signature, authreq))
337+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), signature, authreq))
338338
},
339339
expectErr: fosite.ErrInvalidGrant,
340340
},
@@ -356,11 +356,11 @@ func TestAuthorizeCode_HandleTokenEndpointRequest(t *testing.T) {
356356
},
357357
description: "should fail because redirect uri was set during /authorize call, but not in /token call",
358358
setup: func(t *testing.T, areq *fosite.AccessRequest, authreq *fosite.AuthorizeRequest) {
359-
token, signature, err := strategy.GenerateAuthorizeCode(nil, nil)
359+
token, signature, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
360360
require.NoError(t, err)
361361
areq.Form = url.Values{"code": {token}}
362362

363-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, signature, authreq))
363+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), signature, authreq))
364364
},
365365
expectErr: fosite.ErrInvalidGrant,
366366
},
@@ -384,11 +384,11 @@ func TestAuthorizeCode_HandleTokenEndpointRequest(t *testing.T) {
384384
},
385385
description: "should pass",
386386
setup: func(t *testing.T, areq *fosite.AccessRequest, authreq *fosite.AuthorizeRequest) {
387-
token, signature, err := strategy.GenerateAuthorizeCode(nil, nil)
387+
token, signature, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
388388
require.NoError(t, err)
389389

390390
areq.Form = url.Values{"code": {token}}
391-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, signature, authreq))
391+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), signature, authreq))
392392
},
393393
},
394394
{
@@ -409,12 +409,12 @@ func TestAuthorizeCode_HandleTokenEndpointRequest(t *testing.T) {
409409
assert.Equal(t, time.Now().Add(time.Minute).UTC().Round(time.Second), areq.GetSession().GetExpiresAt(fosite.RefreshToken))
410410
},
411411
setup: func(t *testing.T, areq *fosite.AccessRequest, authreq *fosite.AuthorizeRequest) {
412-
code, sig, err := strategy.GenerateAuthorizeCode(nil, nil)
412+
code, sig, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
413413
require.NoError(t, err)
414414
areq.Form.Add("code", code)
415415

416-
require.NoError(t, store.CreateAuthorizeCodeSession(nil, sig, areq))
417-
require.NoError(t, store.InvalidateAuthorizeCodeSession(nil, sig))
416+
require.NoError(t, store.CreateAuthorizeCodeSession(context.Background(), sig, areq))
417+
require.NoError(t, store.InvalidateAuthorizeCodeSession(context.Background(), sig))
418418
},
419419
description: "should fail because code has been used already",
420420
expectErr: fosite.ErrInvalidGrant,
@@ -457,7 +457,7 @@ func TestAuthorizeCodeTransactional_HandleTokenEndpointRequest(t *testing.T) {
457457
RequestedAt: time.Now().UTC(),
458458
},
459459
}
460-
token, _, err := strategy.GenerateAuthorizeCode(nil, nil)
460+
token, _, err := strategy.GenerateAuthorizeCode(context.Background(), nil)
461461
require.NoError(t, err)
462462
request.Form = url.Values{"code": {token}}
463463
response := fosite.NewAccessResponse()

‎handler/oauth2/flow_authorize_implicit_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package oauth2
55

66
import (
7+
"context"
78
"fmt"
89
"testing"
910
"time"
@@ -45,7 +46,7 @@ func TestAuthorizeImplicit_EndpointHandler(t *testing.T) {
4546
GrantTypes: fosite.Arguments{"implicit"},
4647
ResponseTypes: fosite.Arguments{"token"},
4748
}
48-
chgen.EXPECT().GenerateAccessToken(nil, areq).Return("", "", errors.New(""))
49+
chgen.EXPECT().GenerateAccessToken(gomock.Any(), areq).Return("", "", errors.New(""))
4950
},
5051
expectErr: fosite.ErrServerError,
5152
},
@@ -80,8 +81,8 @@ func TestAuthorizeImplicit_EndpointHandler(t *testing.T) {
8081
description: "should fail because persistence failed",
8182
setup: func() {
8283
areq.RequestedAudience = fosite.Arguments{"https://www.ory.sh/api"}
83-
chgen.EXPECT().GenerateAccessToken(nil, areq).AnyTimes().Return("access.ats", "ats", nil)
84-
store.EXPECT().CreateAccessTokenSession(nil, "ats", gomock.Eq(areq.Sanitize([]string{}))).Return(errors.New(""))
84+
chgen.EXPECT().GenerateAccessToken(gomock.Any(), areq).AnyTimes().Return("access.ats", "ats", nil)
85+
store.EXPECT().CreateAccessTokenSession(gomock.Any(), "ats", gomock.Eq(areq.Sanitize([]string{}))).Return(errors.New(""))
8586
},
8687
expectErr: fosite.ErrServerError,
8788
},
@@ -91,7 +92,7 @@ func TestAuthorizeImplicit_EndpointHandler(t *testing.T) {
9192
areq.State = "state"
9293
areq.GrantedScope = fosite.Arguments{"scope"}
9394

94-
store.EXPECT().CreateAccessTokenSession(nil, "ats", gomock.Eq(areq.Sanitize([]string{}))).AnyTimes().Return(nil)
95+
store.EXPECT().CreateAccessTokenSession(gomock.Any(), "ats", gomock.Eq(areq.Sanitize([]string{}))).AnyTimes().Return(nil)
9596

9697
aresp.EXPECT().AddParameter("access_token", "access.ats")
9798
aresp.EXPECT().AddParameter("expires_in", gomock.Any())
@@ -104,7 +105,7 @@ func TestAuthorizeImplicit_EndpointHandler(t *testing.T) {
104105
} {
105106
t.Run(fmt.Sprintf("case=%d", k), func(t *testing.T) {
106107
c.setup()
107-
err := h.HandleAuthorizeEndpointRequest(nil, areq, aresp)
108+
err := h.HandleAuthorizeEndpointRequest(context.Background(), areq, aresp)
108109
if c.expectErr != nil {
109110
require.EqualError(t, err, c.expectErr.Error())
110111
} else {
@@ -151,16 +152,16 @@ func TestDefaultResponseMode_AuthorizeImplicit_EndpointHandler(t *testing.T) {
151152
TokenLifespans: &internal.TestLifespans,
152153
}
153154

154-
store.EXPECT().CreateAccessTokenSession(nil, "ats", gomock.Eq(areq.Sanitize([]string{}))).AnyTimes().Return(nil)
155+
store.EXPECT().CreateAccessTokenSession(gomock.Any(), "ats", gomock.Eq(areq.Sanitize([]string{}))).AnyTimes().Return(nil)
155156

156157
aresp.EXPECT().AddParameter("access_token", "access.ats")
157158
aresp.EXPECT().AddParameter("expires_in", gomock.Any())
158159
aresp.EXPECT().AddParameter("token_type", "bearer")
159160
aresp.EXPECT().AddParameter("state", "state")
160161
aresp.EXPECT().AddParameter("scope", "scope")
161-
chgen.EXPECT().GenerateAccessToken(nil, areq).AnyTimes().Return("access.ats", "ats", nil)
162+
chgen.EXPECT().GenerateAccessToken(gomock.Any(), areq).AnyTimes().Return("access.ats", "ats", nil)
162163

163-
err := h.HandleAuthorizeEndpointRequest(nil, areq, aresp)
164+
err := h.HandleAuthorizeEndpointRequest(context.Background(), areq, aresp)
164165
assert.NoError(t, err)
165166
assert.Equal(t, fosite.ResponseModeFragment, areq.GetResponseMode())
166167

0 commit comments

Comments
 (0)