Plugins: Fix issue with propagating ID token downstream for RunStream requests (#104833)
fix issue
This commit is contained in:
@@ -5,6 +5,8 @@ import (
|
||||
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||
|
||||
"github.com/grafana/grafana/pkg/apimachinery/identity"
|
||||
"github.com/grafana/grafana/pkg/infra/log"
|
||||
"github.com/grafana/grafana/pkg/services/contexthandler"
|
||||
)
|
||||
|
||||
@@ -15,19 +17,36 @@ const forwardIDHeaderName = "X-Grafana-Id"
|
||||
func NewForwardIDMiddleware() backend.HandlerMiddleware {
|
||||
return backend.HandlerMiddlewareFunc(func(next backend.Handler) backend.Handler {
|
||||
return &ForwardIDMiddleware{
|
||||
log: log.New("forward_id_middleware"),
|
||||
BaseHandler: backend.NewBaseHandler(next),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
type ForwardIDMiddleware struct {
|
||||
log log.Logger
|
||||
|
||||
backend.BaseHandler
|
||||
}
|
||||
|
||||
func (m *ForwardIDMiddleware) applyToken(ctx context.Context, pCtx backend.PluginContext, req backend.ForwardHTTPHeaders) error {
|
||||
func (m *ForwardIDMiddleware) applyToken(ctx context.Context, _ backend.PluginContext, req backend.ForwardHTTPHeaders) error {
|
||||
if req == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
reqCtx := contexthandler.FromContext(ctx)
|
||||
// no HTTP request context => skip middleware
|
||||
if req == nil || reqCtx == nil || reqCtx.SignedInUser == nil {
|
||||
// no HTTP request context => check requester
|
||||
if reqCtx == nil || reqCtx.SignedInUser == nil {
|
||||
requester, err := identity.GetRequester(ctx)
|
||||
if err != nil {
|
||||
m.log.Debug("Failed to get requester from context", "error", err)
|
||||
return nil
|
||||
}
|
||||
|
||||
if requester.GetIDToken() != "" {
|
||||
req.SetHTTPHeader(forwardIDHeaderName, requester.GetIDToken())
|
||||
return nil
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user