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

Auth: Fix static test fake (#72514)

Browse Source 
fix static fake
This commit is contained in:
Jo 2023-07-31 10:41:37 +02:00 committed by GitHub
parent 51a246d27a
commit e04a6fb08e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/services/authn/authntest/fake.go
View File

@ -9,28 +9,63 @@ import (
var _ authn.Service = new(FakeService) var _ authn.Service = new(FakeService)
type FakeService struct { type FakeService struct {
ExpectedErr error ExpectedErr error
ExpectedRedirect *authn.Redirect ExpectedRedirect *authn.Redirect
ExpectedIdentity *authn.Identity ExpectedIdentity *authn.Identity
ExpectedErrs []error
ExpectedIdentities []*authn.Identity
CurrentIndex int
} }
func (f FakeService) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identity, error) { func (f *FakeService) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identity, error) {
if f.ExpectedIdentities != nil {
if f.CurrentIndex >= len(f.ExpectedIdentities) {
panic("ExpectedIdentities is empty")
}
if f.CurrentIndex >= len(f.ExpectedErrs) {
panic("ExpectedErrs is empty")
}
identity := f.ExpectedIdentities[f.CurrentIndex]
err := f.ExpectedErrs[f.CurrentIndex]
f.CurrentIndex += 1
return identity, err
}
return f.ExpectedIdentity, f.ExpectedErr return f.ExpectedIdentity, f.ExpectedErr
} }
func (f FakeService) RegisterPostAuthHook(hook authn.PostAuthHookFn, priority uint) {} func (f *FakeService) RegisterPostAuthHook(hook authn.PostAuthHookFn, priority uint) {}
func (f *FakeService) Login(ctx context.Context, client string, r *authn.Request) (*authn.Identity, error) {
if f.ExpectedIdentities != nil {
if f.CurrentIndex >= len(f.ExpectedIdentities) {
panic("ExpectedIdentities is empty")
}
if f.CurrentIndex >= len(f.ExpectedErrs) {
panic("ExpectedErrs is empty")
}
identity := f.ExpectedIdentities[f.CurrentIndex]
err := f.ExpectedErrs[f.CurrentIndex]
f.CurrentIndex += 1
return identity, err
}
func (f FakeService) Login(ctx context.Context, client string, r *authn.Request) (*authn.Identity, error) {
return f.ExpectedIdentity, f.ExpectedErr return f.ExpectedIdentity, f.ExpectedErr
} }
func (f FakeService) RegisterPostLoginHook(hook authn.PostLoginHookFn, priority uint) {} func (f *FakeService) RegisterPostLoginHook(hook authn.PostLoginHookFn, priority uint) {}
func (f FakeService) RedirectURL(ctx context.Context, client string, r *authn.Request) (*authn.Redirect, error) { func (f *FakeService) RedirectURL(ctx context.Context, client string, r *authn.Request) (*authn.Redirect, error) {
return f.ExpectedRedirect, f.ExpectedErr return f.ExpectedRedirect, f.ExpectedErr
} }
func (f FakeService) RegisterClient(c authn.Client) {} func (f *FakeService) RegisterClient(c authn.Client) {}
var _ authn.ContextAwareClient = new(FakeClient) var _ authn.ContextAwareClient = new(FakeClient)

6
pkg/services/contexthandler/contexthandler.go
View File

@ -70,7 +70,7 @@ func ProvideService(cfg *setting.Cfg, tokenService auth.UserTokenService, jwtSer
orgService: orgService, orgService: orgService,
oauthTokenService: oauthTokenService, oauthTokenService: oauthTokenService,
features: features, features: features,
authnService: authnService, AuthnService: authnService,
anonDeviceService: anonDeviceService, anonDeviceService: anonDeviceService,
singleflight: new(singleflight.Group), singleflight: new(singleflight.Group),
} }
@ -93,7 +93,7 @@ type ContextHandler struct {
orgService org.Service orgService org.Service
oauthTokenService oauthtoken.OAuthTokenService oauthTokenService oauthtoken.OAuthTokenService
features *featuremgmt.FeatureManager features *featuremgmt.FeatureManager
authnService authn.Service AuthnService authn.Service
singleflight *singleflight.Group singleflight *singleflight.Group
anonDeviceService anonymous.Service anonDeviceService anonymous.Service
// GetTime returns the current time. // GetTime returns the current time.
@ -171,7 +171,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
} }
if h.Cfg.AuthBrokerEnabled { if h.Cfg.AuthBrokerEnabled {
identity, err := h.authnService.Authenticate(ctx, &authn.Request{HTTPRequest: reqContext.Req, Resp: reqContext.Resp}) identity, err := h.AuthnService.Authenticate(ctx, &authn.Request{HTTPRequest: reqContext.Req, Resp: reqContext.Resp})
if err != nil { if err != nil {
if errors.Is(err, auth.ErrInvalidSessionToken) { if errors.Is(err, auth.ErrInvalidSessionToken) {
// Burn the cookie in case of invalid, expired or missing token // Burn the cookie in case of invalid, expired or missing token