status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

http: rename paresTokenResolveProxy to parseTokenWithDefault

This commit is contained in:
Kit Patella 2020-04-17 13:35:24 -07:00
parent e2467f4b2c
commit ccece5cd21
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/http.go
View File

@ -976,10 +976,10 @@ func (s *HTTPServer) parseTokenInternal(req *http.Request, token *string) {
return
}
// parseTokenResolveProxy passes through to parseTokenInternal and optionally resolves proxy tokens to real ACL tokens.
// parseTokenWithDefault passes through to parseTokenInternal and optionally resolves proxy tokens to real ACL tokens.
// If the token is invalid or not specified it will populate the token with the agents UserToken (acl_token in the
// consul configuration)
func (s *HTTPServer) parseTokenResolveProxy(req *http.Request, token *string) {
func (s *HTTPServer) parseTokenWithDefault(req *http.Request, token *string) {
s.parseTokenInternal(req, token) // parseTokenInternal modifies *token
if token != nil && *token == "" {
*token = s.agent.tokens.UserToken()
@ -991,7 +991,7 @@ func (s *HTTPServer) parseTokenResolveProxy(req *http.Request, token *string) {
// parseToken is used to parse the ?token query param or the X-Consul-Token header or
// Authorization Bearer token header (RFC6750). This function is used widely in Consul's endpoints
func (s *HTTPServer) parseToken(req *http.Request, token *string) {
s.parseTokenResolveProxy(req, token)
s.parseTokenWithDefault(req, token)
}
func sourceAddrFromRequest(req *http.Request) string {
@ -1051,7 +1051,7 @@ func (s *HTTPServer) parseMetaFilter(req *http.Request) map[string]string {
func (s *HTTPServer) parseInternal(resp http.ResponseWriter, req *http.Request, dc *string, b structs.QueryOptionsCompat) bool {
s.parseDC(req, dc)
var token string
s.parseTokenResolveProxy(req, &token)
s.parseTokenWithDefault(req, &token)
b.SetToken(token)
var filter string
s.parseFilter(req, &filter)