From 88c2a9c9470a642ad1edbc3b02b075f93317651d Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Tue, 12 Aug 2014 11:35:22 -0700
Subject: [PATCH] agent: Adding token parsing

---
 command/agent/acl_endpoint.go | 32 ++++++++++++++++++++++----------
 command/agent/http.go         | 10 ++++++++++
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/command/agent/acl_endpoint.go b/command/agent/acl_endpoint.go
index 815a867070..07e0016ebe 100644
--- a/command/agent/acl_endpoint.go
+++ b/command/agent/acl_endpoint.go
@@ -21,9 +21,10 @@ func aclDisabled(resp http.ResponseWriter, req *http.Request) (interface{}, erro
 
 func (s *HTTPServer) ACLDelete(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
 	args := structs.ACLRequest{
-		Op: structs.ACLDelete,
+		Datacenter: s.agent.config.ACLDatacenter,
+		Op:         structs.ACLDelete,
 	}
-	s.parseDC(req, &args.Datacenter)
+	s.parseToken(req, &args.Token)
 
 	// Pull out the acl id
 	args.ACL.ID = strings.TrimPrefix(req.URL.Path, "/v1/acl/delete/")
@@ -56,12 +57,13 @@ func (s *HTTPServer) aclSet(resp http.ResponseWriter, req *http.Request, update
 	}
 
 	args := structs.ACLRequest{
-		Op: structs.ACLSet,
+		Datacenter: s.agent.config.ACLDatacenter,
+		Op:         structs.ACLSet,
 		ACL: structs.ACL{
 			Type: structs.ACLTypeClient,
 		},
 	}
-	s.parseDC(req, &args.Datacenter)
+	s.parseToken(req, &args.Token)
 
 	// Handle optional request body
 	if req.ContentLength > 0 {
@@ -97,8 +99,11 @@ func (s *HTTPServer) aclSet(resp http.ResponseWriter, req *http.Request, update
 }
 
 func (s *HTTPServer) ACLClone(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	args := structs.ACLSpecificRequest{}
-	if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
+	args := structs.ACLSpecificRequest{
+		Datacenter: s.agent.config.ACLDatacenter,
+	}
+	var dc string
+	if done := s.parse(resp, req, &dc, &args.QueryOptions); done {
 		return nil, nil
 	}
 
@@ -130,6 +135,7 @@ func (s *HTTPServer) ACLClone(resp http.ResponseWriter, req *http.Request) (inte
 		ACL:        *out.ACLs[0],
 	}
 	createArgs.ACL.ID = ""
+	createArgs.Token = args.Token
 
 	// Create the acl, get the ID
 	var outID string
@@ -142,8 +148,11 @@ func (s *HTTPServer) ACLClone(resp http.ResponseWriter, req *http.Request) (inte
 }
 
 func (s *HTTPServer) ACLGet(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	args := structs.ACLSpecificRequest{}
-	if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
+	args := structs.ACLSpecificRequest{
+		Datacenter: s.agent.config.ACLDatacenter,
+	}
+	var dc string
+	if done := s.parse(resp, req, &dc, &args.QueryOptions); done {
 		return nil, nil
 	}
 
@@ -164,8 +173,11 @@ func (s *HTTPServer) ACLGet(resp http.ResponseWriter, req *http.Request) (interf
 }
 
 func (s *HTTPServer) ACLList(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	args := structs.DCSpecificRequest{}
-	if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
+	args := structs.DCSpecificRequest{
+		Datacenter: s.agent.config.ACLDatacenter,
+	}
+	var dc string
+	if done := s.parse(resp, req, &dc, &args.QueryOptions); done {
 		return nil, nil
 	}
 
diff --git a/command/agent/http.go b/command/agent/http.go
index 905858e25c..905428f95c 100644
--- a/command/agent/http.go
+++ b/command/agent/http.go
@@ -289,10 +289,20 @@ func (s *HTTPServer) parseDC(req *http.Request, dc *string) {
 	}
 }
 
+// parseToken is used to parse the ?token query param
+func (s *HTTPServer) parseToken(req *http.Request, token *string) {
+	if other := req.URL.Query().Get("token"); other != "" {
+		*token = other
+	} else if *token == "" {
+		*token = s.agent.config.ACLToken
+	}
+}
+
 // parse is a convenience method for endpoints that need
 // to use both parseWait and parseDC.
 func (s *HTTPServer) parse(resp http.ResponseWriter, req *http.Request, dc *string, b *structs.QueryOptions) bool {
 	s.parseDC(req, dc)
+	s.parseToken(req, &b.Token)
 	if parseConsistency(resp, req, b) {
 		return true
 	}