mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge pull request #14262 from kornholi/fix/dataproxy-auth
dataproxy: Override incoming Authorization header
This commit is contained in:
@@ -51,7 +51,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
|
|||||||
if token, err := tokenProvider.getAccessToken(data); err != nil {
|
if token, err := tokenProvider.getAccessToken(data); err != nil {
|
||||||
logger.Error("Failed to get access token", "error", err)
|
logger.Error("Failed to get access token", "error", err)
|
||||||
} else {
|
} else {
|
||||||
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
|
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,7 +60,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
|
|||||||
if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil {
|
if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil {
|
||||||
logger.Error("Failed to get access token", "error", err)
|
logger.Error("Failed to get access token", "error", err)
|
||||||
} else {
|
} else {
|
||||||
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
|
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,7 +73,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("Failed to get default access token from meta data server", "error", err)
|
logger.Error("Failed to get default access token from meta data server", "error", err)
|
||||||
} else {
|
} else {
|
||||||
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
|
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user