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

pkg/web: restrict handler types (#48495)

Browse Source 
Makes `pkg/web` only accept handles from the following set:

```go
	handlerStd       = func(http.ResponseWriter, *http.Request)
	handlerStdCtx    = func(http.ResponseWriter, *http.Request, *web.Context)
	handlerStdReqCtx = func(http.ResponseWriter, *http.Request, *models.ReqContext)
	handlerReqCtx    = func(*models.ReqContext)
	handlerReqCtxRes = func(*models.ReqContext) Response
	handlerCtx       = func(*web.Context)
```

This is a first step to reducing above set to only `http.Handler`.

---

Due to a cyclic import situation between `pkg/models` and `pkg/web`, parts of this PR were put into `pkg/api/response`, even though they definitely do not belong there. This however is _temporary_ until we untangle `models.ReqContext`.
This commit is contained in:
sh0rez
2022-05-20 12:45:18 -04:00
committed by GitHub
parent c980655f08
commit 3d5d8c785b
13 changed files with 115 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/multildap/multildap_test.go
+3
View File
@@ -8,6 +8,9 @@ import (
"github.com/grafana/grafana/pkg/services/ldap"
"github.com/stretchr/testify/require"
//TODO(sh0rez): remove once import cycle resolved
_ "github.com/grafana/grafana/pkg/api/response"
)
func TestMultiLDAP(t *testing.T) {