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

Live: use ReqSignedIn middleware for ws routes (#33381)

Browse Source
This commit is contained in:
Alexander Emelin 2021-04-27 17:19:36 +03:00 committed by GitHub
parent 084066c712
commit e6f9f65fdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/services/live/live.go
View File

@ -12,6 +12,7 @@ import (
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins/manager" "github.com/grafana/grafana/pkg/plugins/manager"
"github.com/grafana/grafana/pkg/plugins/plugincontext" "github.com/grafana/grafana/pkg/plugins/plugincontext"
@ -272,10 +273,6 @@ func (g *GrafanaLive) Init() error {
g.websocketHandler = func(ctx *models.ReqContext) { g.websocketHandler = func(ctx *models.ReqContext) {
user := ctx.SignedInUser user := ctx.SignedInUser
if user == nil {
ctx.Resp.WriteHeader(401)
return
}
// Centrifuge expects Credentials in context with a current user ID. // Centrifuge expects Credentials in context with a current user ID.
cred := &centrifuge.Credentials{ cred := &centrifuge.Credentials{
@ -284,36 +281,28 @@ func (g *GrafanaLive) Init() error {
newCtx := centrifuge.SetCredentials(ctx.Req.Context(), cred) newCtx := centrifuge.SetCredentials(ctx.Req.Context(), cred)
newCtx = livecontext.SetContextSignedUser(newCtx, user) newCtx = livecontext.SetContextSignedUser(newCtx, user)
newCtx = livecontext.SetContextValues(newCtx, ctx.Req.URL.Query()) newCtx = livecontext.SetContextValues(newCtx, ctx.Req.URL.Query())
r := ctx.Req.Request r := ctx.Req.Request
r = r.WithContext(newCtx) // Set a user ID. r = r.WithContext(newCtx)
wsHandler.ServeHTTP(ctx.Resp, r) wsHandler.ServeHTTP(ctx.Resp, r)
} }
g.pushWebsocketHandler = func(ctx *models.ReqContext) { g.pushWebsocketHandler = func(ctx *models.ReqContext) {
user := ctx.SignedInUser user := ctx.SignedInUser
if user == nil { newCtx := livecontext.SetContextSignedUser(ctx.Req.Context(), user)
ctx.Resp.WriteHeader(401)
return
}
// Centrifuge expects Credentials in context with a current user ID.
cred := &centrifuge.Credentials{
UserID: fmt.Sprintf("%d", user.UserId),
}
newCtx := centrifuge.SetCredentials(ctx.Req.Context(), cred)
newCtx = livecontext.SetContextSignedUser(newCtx, user)
newCtx = livecontext.SetContextValues(newCtx, ctx.Req.URL.Query()) newCtx = livecontext.SetContextValues(newCtx, ctx.Req.URL.Query())
r := ctx.Req.Request r := ctx.Req.Request
r = r.WithContext(newCtx) // Set a user ID. r = r.WithContext(newCtx)
pushWSHandler.ServeHTTP(ctx.Resp, r) pushWSHandler.ServeHTTP(ctx.Resp, r)
} }
g.RouteRegister.Get("/live/ws", g.websocketHandler) g.RouteRegister.Group("/live", func(group routing.RouteRegister) {
g.RouteRegister.Get("/live/push", g.pushWebsocketHandler) group.Get("/ws", g.websocketHandler)
}, middleware.ReqSignedIn)
g.RouteRegister.Group("/api/live", func(group routing.RouteRegister) {
group.Get("/push", g.pushWebsocketHandler)
}, middleware.ReqOrgAdmin)
return nil return nil
} }