IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: use any rather than interface{} (#74066)

Browse Source
This commit is contained in:
Ryan McKinley
2023-08-30 08:46:47 -07:00
committed by GitHub
parent 3e272d2bda
commit 025b2f3011
525 changed files with 2528 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/auth/jwt/auth.go
View File

@@ -53,7 +53,7 @@ type AuthService struct {
keySet keySet
log log.Logger
expect map[string]interface{}
expect map[string]any
expectRegistered jwt.Expected
}

10
pkg/services/auth/jwt/auth_test.go
View File

@@ -262,19 +262,19 @@ func TestClaimValidation(t *testing.T) {
scenario(t, "validates non-registered (custom) claims for equality", func(t *testing.T, sc scenarioContext) {
var err error
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "foo", "my-number": 123}, nil))
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "foo", "my-number": 123}, nil))
require.NoError(t, err)
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "bar", "my-number": 123}, nil))
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "bar", "my-number": 123}, nil))
require.Error(t, err)
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "foo", "my-number": 100}, nil))
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "foo", "my-number": 100}, nil))
require.Error(t, err)
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "foo"}, nil))
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "foo"}, nil))
require.Error(t, err)
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-number": 123}, nil))
_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-number": 123}, nil))
require.Error(t, err)
}, configurePKIXPublicKeyFile, func(t *testing.T, cfg *setting.Cfg) {
cfg.JWTAuthExpectClaims = `{"my-str": "foo", "my-number": 123}`

2
pkg/services/auth/jwt/jwt.go
View File

@@ -4,7 +4,7 @@ import (
"context"
)
type JWTClaims map[string]interface{}
type JWTClaims map[string]any
type JWTService interface {
Verify(ctx context.Context, strToken string) (JWTClaims, error)

2
pkg/services/auth/jwt/key_sets.go
View File

@@ -97,7 +97,7 @@ func (s *AuthService) initKeySet() error {
return ErrFailedToParsePemFile
}
var key interface{}
var key any
switch block.Type {
case "PUBLIC KEY":
if key, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {

4
pkg/services/auth/jwt/signing_test.go
View File

@@ -10,7 +10,7 @@ import (
type noneSigner struct{}
func sign(t *testing.T, key interface{}, claims interface{}, opts *jose.SignerOptions) string {
func sign(t *testing.T, key any, claims any, opts *jose.SignerOptions) string {
t.Helper()
if opts == nil {
@@ -35,7 +35,7 @@ func (s noneSigner) SignPayload(payload []byte, alg jose.SignatureAlgorithm) ([]
return nil, nil
}
func signNone(t *testing.T, claims interface{}) string {
func signNone(t *testing.T, claims any) string {
t.Helper()
sig, err := jose.NewSigner(jose.SigningKey{Algorithm: "none", Key: noneSigner{}}, (&jose.SignerOptions{}).WithType("JWT"))

4
pkg/services/auth/jwt/validation.go
View File

@@ -32,7 +32,7 @@ func (s *AuthService) initClaimExpectations() error {
delete(s.expect, key)
case "aud":
switch value := value.(type) {
case []interface{}:
case []any:
for _, val := range value {
if v, ok := val.(string); ok {
s.expectRegistered.Audience = append(s.expectRegistered.Audience, v)
@@ -70,7 +70,7 @@ func (s *AuthService) validateClaims(claims JWTClaims) error {
}
case "aud":
switch value := value.(type) {
case []interface{}:
case []any:
for _, val := range value {
if v, ok := val.(string); ok {
registeredClaims.Audience = append(registeredClaims.Audience, v)