mirror of
https://github.com/grafana/grafana.git
synced 2024-11-26 19:00:54 -06:00
5626461b3c
* define initial service and add to wire * update caching service interface * add skipQueryCache header handler and update metrics query function to use it * add caching service as a dependency to query service * working caching impl * propagate cache status to frontend in response * beginning of improvements suggested by Lean - separate caching logic from query logic. * more changes to simplify query function * Decided to revert renaming of function * Remove error status from cache request * add extra documentation * Move query caching duration metric to query package * add a little bit of documentation * wip: convert resource caching * Change return type of query service QueryData to a QueryDataResponse with Headers * update codeowners * change X-Cache value to const * use resource caching in endpoint handlers * write resource headers to response even if it's not a cache hit * fix panic caused by lack of nil check * update unit test * remove NONE header - shouldn't show up in OSS * Convert everything to use the plugin middleware * revert a few more things * clean up unused vars * start reverting resource caching, start to implement in plugin middleware * revert more, fix typo * Update caching interfaces - resource caching now has a separate cache method * continue wiring up new resource caching conventions - still in progress * add more safety to implementation * remove some unused objects * remove some code that I left in by accident * add some comments, fix codeowners, fix duplicate registration * fix source of panic in resource middleware * Update client decorator test to provide an empty response object * create tests for caching middleware * fix unit test * Update pkg/services/caching/service.go Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> * improve error message in error log * quick docs update * Remove use of mockery. Update return signature to return an explicit hit/miss bool * create unit test for empty request context * rename caching metrics to make it clear they pertain to caching * Update pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Add clarifying comments to cache skip middleware func * Add comment pointing to the resource cache update call * fix unit tests (missing dependency) * try to fix mystery syntax error * fix a panic * Caching: Introduce feature toggle to caching service refactor (#66323) * introduce new feature toggle * hide calls to new service behind a feature flag * remove licensing flag from toggle (misunderstood what it was for) * fix unit tests * rerun toggle gen --------- Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
147 lines
4.0 KiB
Go
147 lines
4.0 KiB
Go
package accesscontrol_test
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/grafana/grafana/pkg/infra/log"
|
|
"github.com/grafana/grafana/pkg/services/accesscontrol"
|
|
"github.com/grafana/grafana/pkg/services/accesscontrol/mock"
|
|
"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
|
|
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
|
|
"github.com/grafana/grafana/pkg/services/user"
|
|
"github.com/grafana/grafana/pkg/web"
|
|
)
|
|
|
|
type middlewareTestCase struct {
|
|
desc string
|
|
expectFallback bool
|
|
expectEndpoint bool
|
|
evaluator accesscontrol.Evaluator
|
|
ac accesscontrol.AccessControl
|
|
}
|
|
|
|
func TestMiddleware(t *testing.T) {
|
|
tests := []middlewareTestCase{
|
|
{
|
|
desc: "should use fallback if access control is disabled",
|
|
ac: mock.New().WithDisabled(),
|
|
expectFallback: true,
|
|
expectEndpoint: true,
|
|
},
|
|
{
|
|
desc: "should pass middleware for correct permissions",
|
|
ac: mock.New().WithPermissions(
|
|
[]accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}},
|
|
),
|
|
evaluator: accesscontrol.EvalPermission("users:read", "users:*"),
|
|
expectFallback: false,
|
|
expectEndpoint: true,
|
|
},
|
|
{
|
|
desc: "should not reach endpoint when missing permissions",
|
|
ac: mock.New().WithPermissions(
|
|
[]accesscontrol.Permission{{Action: "users:read", Scope: "users:1"}},
|
|
),
|
|
evaluator: accesscontrol.EvalPermission("users:read", "users:*"),
|
|
expectFallback: false,
|
|
expectEndpoint: false,
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.desc, func(t *testing.T) {
|
|
fallbackCalled := false
|
|
fallback := func(c *contextmodel.ReqContext) {
|
|
fallbackCalled = true
|
|
}
|
|
|
|
server := web.New()
|
|
server.UseMiddleware(web.Renderer("../../public/views", "[[", "]]"))
|
|
|
|
server.Use(contextProvider())
|
|
server.Use(accesscontrol.Middleware(test.ac)(fallback, test.evaluator))
|
|
|
|
endpointCalled := false
|
|
server.Get("/", func(c *contextmodel.ReqContext) {
|
|
endpointCalled = true
|
|
c.Resp.WriteHeader(http.StatusOK)
|
|
})
|
|
|
|
request, err := http.NewRequest(http.MethodGet, "/", nil)
|
|
assert.NoError(t, err)
|
|
recorder := httptest.NewRecorder()
|
|
|
|
server.ServeHTTP(recorder, request)
|
|
|
|
assert.Equal(t, test.expectFallback, fallbackCalled)
|
|
assert.Equal(t, test.expectEndpoint, endpointCalled)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestMiddleware_forceLogin(t *testing.T) {
|
|
tests := []struct {
|
|
url string
|
|
redirectToLogin bool
|
|
}{
|
|
{url: "/endpoint?forceLogin=true", redirectToLogin: true},
|
|
{url: "/endpoint?forceLogin=false"},
|
|
{url: "/endpoint"},
|
|
}
|
|
|
|
for _, tc := range tests {
|
|
var endpointCalled bool
|
|
|
|
server := web.New()
|
|
server.UseMiddleware(web.Renderer("../../public/views", "[[", "]]"))
|
|
|
|
server.Get("/endpoint", func(c *contextmodel.ReqContext) {
|
|
endpointCalled = true
|
|
c.Resp.WriteHeader(http.StatusOK)
|
|
})
|
|
|
|
ac := mock.New().WithPermissions([]accesscontrol.Permission{{Action: "endpoint:read", Scope: "endpoint:1"}})
|
|
server.Use(contextProvider(func(c *contextmodel.ReqContext) {
|
|
c.AllowAnonymous = true
|
|
c.SignedInUser.IsAnonymous = true
|
|
c.IsSignedIn = false
|
|
}))
|
|
server.Use(
|
|
accesscontrol.Middleware(ac)(nil, accesscontrol.EvalPermission("endpoint:read", "endpoint:1")),
|
|
)
|
|
|
|
request, err := http.NewRequest(http.MethodGet, tc.url, nil)
|
|
assert.NoError(t, err)
|
|
recorder := httptest.NewRecorder()
|
|
|
|
server.ServeHTTP(recorder, request)
|
|
|
|
expectedCode := http.StatusOK
|
|
if tc.redirectToLogin {
|
|
expectedCode = http.StatusFound
|
|
}
|
|
assert.Equal(t, expectedCode, recorder.Code)
|
|
assert.Equal(t, !tc.redirectToLogin, endpointCalled, "/endpoint should be called?")
|
|
}
|
|
}
|
|
|
|
func contextProvider(modifiers ...func(c *contextmodel.ReqContext)) web.Handler {
|
|
return func(c *web.Context) {
|
|
reqCtx := &contextmodel.ReqContext{
|
|
Context: c,
|
|
Logger: log.New(""),
|
|
SignedInUser: &user.SignedInUser{},
|
|
IsSignedIn: true,
|
|
SkipDSCache: true,
|
|
}
|
|
for _, modifier := range modifiers {
|
|
modifier(reqCtx)
|
|
}
|
|
c.Req = c.Req.WithContext(ctxkey.Set(c.Req.Context(), reqCtx))
|
|
}
|
|
}
|