github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2058 from nathan7/master 

Parse ACL tokens for the catalog register/deregister endpoints
pull/2071/head
James Phillips 2016-05-24 12:49:13 -07:00
parent f6fef66e1b c4b362d5d2
commit 23353b721d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/catalog_endpoint.go
View File

@ -19,6 +19,7 @@ func (s *HTTPServer) CatalogRegister(resp http.ResponseWriter, req *http.Request
if args.Datacenter == "" { if args.Datacenter == "" {
args.Datacenter = s.agent.config.Datacenter args.Datacenter = s.agent.config.Datacenter
} }
s.parseToken(req, &args.Token)
// Forward to the servers // Forward to the servers
var out struct{} var out struct{}
@ -40,6 +41,7 @@ func (s *HTTPServer) CatalogDeregister(resp http.ResponseWriter, req *http.Reque
if args.Datacenter == "" { if args.Datacenter == "" {
args.Datacenter = s.agent.config.Datacenter args.Datacenter = s.agent.config.Datacenter
} }
s.parseToken(req, &args.Token)
// Forward to the servers // Forward to the servers
var out struct{} var out struct{}