IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Authn: Set requester in middleware (#89929)

Browse Source 
identify in context
This commit is contained in:
Ryan McKinley 2024-07-02 09:50:35 +03:00 committed by GitHub
parent c3b5cabb14
commit 073ef93007
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,16 +112,16 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
reqContext.Logger = reqContext.Logger.New("traceID", traceID) reqContext.Logger = reqContext.Logger.New("traceID", traceID)
} }
identity, err := h.authnService.Authenticate(ctx, &authn.Request{HTTPRequest: reqContext.Req, Resp: reqContext.Resp}) id, err := h.authnService.Authenticate(ctx, &authn.Request{HTTPRequest: reqContext.Req, Resp: reqContext.Resp})
if err != nil { if err != nil {
// Hack: set all errors on LookupTokenErr, so we can check it in auth middlewares // Hack: set all errors on LookupTokenErr, so we can check it in auth middlewares
reqContext.LookupTokenErr = err reqContext.LookupTokenErr = err
} else { } else {
reqContext.SignedInUser = identity.SignedInUser() reqContext.SignedInUser = id.SignedInUser()
reqContext.UserToken = identity.SessionToken reqContext.UserToken = id.SessionToken
reqContext.IsSignedIn = !reqContext.SignedInUser.IsAnonymous reqContext.IsSignedIn = !reqContext.SignedInUser.IsAnonymous
reqContext.AllowAnonymous = reqContext.SignedInUser.IsAnonymous reqContext.AllowAnonymous = reqContext.SignedInUser.IsAnonymous
reqContext.IsRenderCall = identity.IsAuthenticatedBy(login.RenderModule) reqContext.IsRenderCall = id.IsAuthenticatedBy(login.RenderModule)
} }
reqContext.Logger = reqContext.Logger.New("userId", reqContext.UserID, "orgId", reqContext.OrgID, "uname", reqContext.Login) reqContext.Logger = reqContext.Logger.New("userId", reqContext.UserID, "orgId", reqContext.OrgID, "uname", reqContext.Login)
@ -138,7 +138,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
// End the span to make next handlers not wrapped within middleware span // End the span to make next handlers not wrapped within middleware span
span.End() span.End()
next.ServeHTTP(w, r) next.ServeHTTP(w, r.WithContext(identity.WithRequester(ctx, id)))
}) })
} }

11
pkg/services/contexthandler/contexthandler_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/authn" "github.com/grafana/grafana/pkg/services/authn"
"github.com/grafana/grafana/pkg/services/authn/authntest" "github.com/grafana/grafana/pkg/services/authn/authntest"
@ -44,20 +45,24 @@ func TestContextHandler(t *testing.T) {
}) })
t.Run("should set identity on successful authentication", func(t *testing.T) { t.Run("should set identity on successful authentication", func(t *testing.T) {
identity := &authn.Identity{ID: authn.NewNamespaceID(authn.NamespaceUser, 1), OrgID: 1} id := &authn.Identity{ID: authn.NewNamespaceID(authn.NamespaceUser, 1), OrgID: 1}
handler := contexthandler.ProvideService( handler := contexthandler.ProvideService(
setting.NewCfg(), setting.NewCfg(),
tracing.InitializeTracerForTest(), tracing.InitializeTracerForTest(),
featuremgmt.WithFeatures(), featuremgmt.WithFeatures(),
&authntest.FakeService{ExpectedIdentity: identity}, &authntest.FakeService{ExpectedIdentity: id},
) )
server := webtest.NewServer(t, routing.NewRouteRegister()) server := webtest.NewServer(t, routing.NewRouteRegister())
server.Mux.Use(handler.Middleware) server.Mux.Use(handler.Middleware)
server.Mux.Get("/api/handler", func(c *contextmodel.ReqContext) { server.Mux.Get("/api/handler", func(c *contextmodel.ReqContext) {
require.True(t, c.IsSignedIn) require.True(t, c.IsSignedIn)
require.EqualValues(t, identity.SignedInUser(), c.SignedInUser) require.EqualValues(t, id.SignedInUser(), c.SignedInUser)
require.NoError(t, c.LookupTokenErr) require.NoError(t, c.LookupTokenErr)
requester, err := identity.GetRequester(c.Req.Context())
require.NoError(t, err)
require.Equal(t, id, requester)
}) })
res, err := server.Send(server.NewGetRequest("/api/handler")) res, err := server.Send(server.NewGetRequest("/api/handler"))