From a7197d02ad1c22376030edb843038b5ea6b4606d Mon Sep 17 00:00:00 2001 From: Moustafa Baiou Date: Wed, 9 Apr 2025 09:08:21 -0400 Subject: [PATCH] PluginProxy: Fix nil pointer in OAuth forwarding (#103626) --- pkg/api/pluginproxy/ds_proxy.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go index ce8bdf2770f..5648d098615 100644 --- a/pkg/api/pluginproxy/ds_proxy.go +++ b/pkg/api/pluginproxy/ds_proxy.go @@ -19,7 +19,6 @@ import ( glog "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/plugins" - "github.com/grafana/grafana/pkg/services/contexthandler" contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model" "github.com/grafana/grafana/pkg/services/datasources" "github.com/grafana/grafana/pkg/services/featuremgmt" @@ -263,8 +262,7 @@ func (proxy *DataSourceProxy) director(req *http.Request) { } if proxy.oAuthTokenService.IsOAuthPassThruEnabled(proxy.ds) { - reqCtx := contexthandler.FromContext(req.Context()) - if token := proxy.oAuthTokenService.GetCurrentOAuthToken(req.Context(), proxy.ctx.SignedInUser, reqCtx.UserToken); token != nil { + if token := proxy.oAuthTokenService.GetCurrentOAuthToken(req.Context(), proxy.ctx.SignedInUser, proxy.ctx.UserToken); token != nil { req.Header.Set("Authorization", fmt.Sprintf("%s %s", token.Type(), token.AccessToken)) idToken, ok := token.Extra("id_token").(string)