opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 04:09:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Team LBAC: Fix multiple header values (#76821)

Browse Source 
* Team LBAC: Fix multiple header values

Co-authored-by: Eric Leijonmarck <eleijonmarck@users.noreply.github.com>

* Fix linter error

---------

Co-authored-by: Eric Leijonmarck <eleijonmarck@users.noreply.github.com>
This commit is contained in:
Alexander Zobnin
2023-10-19 17:09:53 +02:00
committed by GitHub
parent 2adfdb49c9
commit 5563f2f98f
2 changed files with 91 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/util/proxyutil/proxyutil.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"net"
"net/http"
"net/url"
"sort"
"strconv"
"strings"
@ -170,9 +171,14 @@ func GetTeamHTTPHeaders(ds *datasources.DataSource, teams []int64) (map[string]s
}
for _, header := range headers {
// TODO: handle multiple header values
// add tests for these cases
teamHTTPHeadersMap[header.Header] = header.Value
// Header values should be properly escaped.
if value, ok := teamHTTPHeadersMap[header.Header]; ok {
// Add multiple header values as a comma-separated strings according to RFC 7230
// https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.6
teamHTTPHeadersMap[header.Header] = fmt.Sprintf("%s,%s", value, url.PathEscape(header.Value))
} else {
teamHTTPHeadersMap[header.Header] = url.PathEscape(header.Value)
}
}
}