IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 09:05:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(influxdb): clear existing Authorization header when proxying request to InfluxDB, fixes #2778

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-09-19 12:32:35 +02:00
parent f4f7f47901
commit a23217cc6f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dataproxy.go
View File

@ -43,6 +43,7 @@ func NewReverseProxy(ds *m.DataSource, proxyPath string, targetUrl *url.URL) *ht
reqQueryVals.Add("db", ds.Database) reqQueryVals.Add("db", ds.Database)
req.URL.RawQuery = reqQueryVals.Encode() req.URL.RawQuery = reqQueryVals.Encode()
if !ds.BasicAuth { if !ds.BasicAuth {
req.Header.Del("Authorization")
req.Header.Add("Authorization", util.GetBasicAuthHeader(ds.User, ds.Password)) req.Header.Add("Authorization", util.GetBasicAuthHeader(ds.User, ds.Password))
} }
} else { } else {
@ -50,6 +51,7 @@ func NewReverseProxy(ds *m.DataSource, proxyPath string, targetUrl *url.URL) *ht
} }
if ds.BasicAuth { if ds.BasicAuth {
req.Header.Del("Authorization")
req.Header.Add("Authorization", util.GetBasicAuthHeader(ds.BasicAuthUser, ds.BasicAuthPassword)) req.Header.Add("Authorization", util.GetBasicAuthHeader(ds.BasicAuthUser, ds.BasicAuthPassword))
} }