From 75f62e311723dff45a1abc07e50cd086edf03be8 Mon Sep 17 00:00:00 2001
From: Kyle Havlovitz <kylehav@gmail.com>
Date: Sun, 8 Apr 2018 21:59:08 -0700
Subject: [PATCH] Update the CA config endpoint to enable GETs

---
 agent/connect_ca_endpoint.go | 22 ++++++++++++++++++++--
 agent/http_oss.go            |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/agent/connect_ca_endpoint.go b/agent/connect_ca_endpoint.go
index 43eeb8644d..979005df13 100644
--- a/agent/connect_ca_endpoint.go
+++ b/agent/connect_ca_endpoint.go
@@ -26,6 +26,9 @@ func (s *HTTPServer) ConnectCARoots(resp http.ResponseWriter, req *http.Request)
 // /v1/connect/ca/configuration
 func (s *HTTPServer) ConnectCAConfiguration(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
 	switch req.Method {
+	case "GET":
+		return s.ConnectCAConfigurationGet(resp, req)
+
 	case "PUT":
 		return s.ConnectCAConfigurationSet(resp, req)
 
@@ -34,12 +37,27 @@ func (s *HTTPServer) ConnectCAConfiguration(resp http.ResponseWriter, req *http.
 	}
 }
 
+// GEt /v1/connect/ca/configuration
+func (s *HTTPServer) ConnectCAConfigurationGet(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
+	// Method is tested in ConnectCAConfiguration
+	var args structs.DCSpecificRequest
+	if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
+		return nil, nil
+	}
+
+	var reply structs.CAConfiguration
+	err := s.agent.RPC("ConnectCA.ConfigurationGet", &args, &reply)
+	return reply, err
+}
+
 // PUT /v1/connect/ca/configuration
 func (s *HTTPServer) ConnectCAConfigurationSet(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
 	// Method is tested in ConnectCAConfiguration
 
-	var args structs.CAConfiguration
-	if err := decodeBody(req, &args, nil); err != nil {
+	var args structs.CARequest
+	s.parseDC(req, &args.Datacenter)
+	s.parseToken(req, &args.Token)
+	if err := decodeBody(req, &args.Config, nil); err != nil {
 		resp.WriteHeader(http.StatusBadRequest)
 		fmt.Fprintf(resp, "Request decode failed: %v", err)
 		return nil, nil
diff --git a/agent/http_oss.go b/agent/http_oss.go
index 774388ad3e..124a268755 100644
--- a/agent/http_oss.go
+++ b/agent/http_oss.go
@@ -43,7 +43,7 @@ func init() {
 	registerEndpoint("/v1/catalog/services", []string{"GET"}, (*HTTPServer).CatalogServices)
 	registerEndpoint("/v1/catalog/service/", []string{"GET"}, (*HTTPServer).CatalogServiceNodes)
 	registerEndpoint("/v1/catalog/node/", []string{"GET"}, (*HTTPServer).CatalogNodeServices)
-	registerEndpoint("/v1/connect/ca/configuration", []string{"PUT"}, (*HTTPServer).ConnectCAConfiguration)
+	registerEndpoint("/v1/connect/ca/configuration", []string{"GET", "PUT"}, (*HTTPServer).ConnectCAConfiguration)
 	registerEndpoint("/v1/connect/ca/roots", []string{"GET"}, (*HTTPServer).ConnectCARoots)
 	registerEndpoint("/v1/connect/intentions", []string{"GET", "POST"}, (*HTTPServer).IntentionEndpoint)
 	registerEndpoint("/v1/connect/intentions/match", []string{"GET"}, (*HTTPServer).IntentionMatch)