Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Undo breaking change to test helpers #82

Merged
merged 1 commit into from
Feb 14, 2023
Merged

Undo breaking change to test helpers #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ginauth/multitokenmiddleware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ func TestMultitokenMiddlewareValidatesTokens(t *testing.T) {

for _, tt := range testCases {
t.Run(tt.testName, func(t *testing.T) {
jwksURI1 := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI2 := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey3ID, ginjwt.TestPrivRSAKey4ID)
jwksURI1 := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI2 := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey3ID, ginjwt.TestPrivRSAKey4ID)

cfg1 := ginjwt.AuthConfig{Enabled: true, Audience: tt.middlewareAud, Issuer: tt.middlewareIss, JWKSURI: jwksURI1}
cfg2 := ginjwt.AuthConfig{Enabled: true, Audience: tt.middlewareAud, Issuer: tt.middlewareIss, JWKSURI: jwksURI2}
Expand Down Expand Up @@ -258,7 +258,7 @@ func TestMultitokenInvalidAuthHeader(t *testing.T) {

for _, tt := range testCases {
t.Run(tt.testName, func(t *testing.T) {
jwksURI := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
cfg := ginjwt.AuthConfig{Enabled: true, Audience: "aud", Issuer: "iss", JWKSURI: jwksURI}
authMW, err := ginjwt.NewMultiTokenMiddlewareFromConfigs(cfg)
require.NoError(t, err)
Expand Down
16 changes: 8 additions & 8 deletions ginjwt/jwt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ func TestMiddlewareValidatesTokensWithScopes(t *testing.T) {
var jwksURI string
var jwks jose.JSONWebKeySet
if tt.jwksFromURI {
jwksURI = ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI = ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
} else {
jwks = ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwks = ginjwt.TestHelperJoseJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
}

cfg := ginjwt.AuthConfig{Enabled: true, Audience: tt.middlewareAud, Issuer: tt.middlewareIss, JWKSURI: jwksURI, JWKS: jwks}
Expand Down Expand Up @@ -389,7 +389,7 @@ func TestMiddlewareAuthRequired(t *testing.T) {

for _, tt := range testCases {
t.Run(tt.testName, func(t *testing.T) {
jwksURI := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)

cfg := ginjwt.AuthConfig{Enabled: true, Audience: tt.middlewareAud, Issuer: tt.middlewareIss, JWKSURI: jwksURI}
authMW, err := ginjwt.NewAuthMiddleware(cfg)
Expand Down Expand Up @@ -451,7 +451,7 @@ func TestInvalidAuthHeader(t *testing.T) {

for _, tt := range testCases {
t.Run(tt.testName, func(t *testing.T) {
jwksURI := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
cfg := ginjwt.AuthConfig{Enabled: true, Audience: "aud", Issuer: "iss", JWKSURI: jwksURI}
authMW, err := ginjwt.NewAuthMiddleware(cfg)
require.NoError(t, err)
Expand All @@ -475,7 +475,7 @@ func TestInvalidAuthHeader(t *testing.T) {
}

func TestInvalidJWKURIWithWrongPath(t *testing.T) {
uri := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
uri := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
uri += "/some-extra-path"
cfg := ginjwt.AuthConfig{Enabled: true, Audience: "aud", Issuer: "iss", JWKSURI: uri}
_, err := ginjwt.NewAuthMiddleware(cfg)
Expand Down Expand Up @@ -639,7 +639,7 @@ func TestVerifyTokenWithScopes(t *testing.T) {

for _, tt := range testCases {
t.Run(tt.testName, func(t *testing.T) {
jwksURI := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
config := ginjwt.AuthConfig{
Enabled: true,
Audience: tt.middlewareAud,
Expand Down Expand Up @@ -673,8 +673,8 @@ func TestVerifyTokenWithScopes(t *testing.T) {
}

func TestAuthMiddlewareConfig(t *testing.T) {
jwks := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI := ginjwt.TestHelperJWKSURIProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwks := ginjwt.TestHelperJoseJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)
jwksURI := ginjwt.TestHelperJWKSProvider(ginjwt.TestPrivRSAKey1ID, ginjwt.TestPrivRSAKey2ID)

testCases := []struct {
name string
Expand Down
10 changes: 5 additions & 5 deletions ginjwt/testtools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func TestHelperMustMakeSigner(alg jose.SignatureAlgorithm, kid string, k interfa
return sig
}

// TestHelperJWKSProvider returns a JWKS
func TestHelperJWKSProvider(keyIDs ...string) jose.JSONWebKeySet {
// TestHelperJoseJWKSProvider returns a JWKS
func TestHelperJoseJWKSProvider(keyIDs ...string) jose.JSONWebKeySet {
jwks := make([]jose.JSONWebKey, len(keyIDs))

for idx, keyID := range keyIDs {
Expand All @@ -78,12 +78,12 @@ func TestHelperJWKSProvider(keyIDs ...string) jose.JSONWebKeySet {
}
}

// TestHelperJWKSURIProvider returns a url for a webserver that will return JSONWebKeySets
func TestHelperJWKSURIProvider(keyIDs ...string) string {
// TestHelperJWKSProvider returns a url for a webserver that will return JSONWebKeySets
func TestHelperJWKSProvider(keyIDs ...string) string {
gin.SetMode(gin.TestMode)
r := gin.New()

keySet := TestHelperJWKSProvider(keyIDs...)
keySet := TestHelperJoseJWKSProvider(keyIDs...)

r.GET("/.well-known/jwks.json", func(c *gin.Context) {
c.JSON(http.StatusOK, keySet)
Expand Down