public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.1.x] Auth: Fix static test fake (#72627)

Browse Source 
Auth: Fix static test fake (#72514)

fix static fake

(cherry picked from commit e04a6fb08e)
This commit is contained in:
Jo
2023-08-01 16:41:25 +02:00
committed by GitHub
parent 6cb0366996
commit 46f971bf48
2 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/authn/authntest/fake.go
+44 -9
View File
@@ -9,28 +9,63 @@ import (
var _ authn.Service = new(FakeService)
type FakeService struct {
ExpectedErr error
ExpectedRedirect *authn.Redirect
ExpectedIdentity *authn.Identity
ExpectedErr error
ExpectedRedirect *authn.Redirect
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
}
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
}
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
}
func (f FakeService) RegisterClient(c authn.Client) {}
func (f *FakeService) RegisterClient(c authn.Client) {}
var _ authn.ContextAwareClient = new(FakeClient)
pkg/services/contexthandler/contexthandler.go
+3 -3
View File
@@ -70,7 +70,7 @@ func ProvideService(cfg *setting.Cfg, tokenService auth.UserTokenService, jwtSer
orgService: orgService,
oauthTokenService: oauthTokenService,
features: features,
authnService: authnService,
AuthnService: authnService,
anonSessionService: anonSessionService,
singleflight: new(singleflight.Group),
}
@@ -93,7 +93,7 @@ type ContextHandler struct {
orgService org.Service
oauthTokenService oauthtoken.OAuthTokenService
features *featuremgmt.FeatureManager
authnService authn.Service
AuthnService authn.Service
singleflight *singleflight.Group
anonSessionService anonymous.Service
// GetTime returns the current time.
@@ -171,7 +171,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
}
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 errors.Is(err, auth.ErrInvalidSessionToken) {
// Burn the cookie in case of invalid, expired or missing token