simplify caserver, we don't need a router

Author: Brian McCallister

pkg/caclient/caclient.go

@@ -7,19 +7,18 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"net/url"
 
 	"github.com/brianm/epithet/pkg/caserver"
 )
 
 // Client is a CA Client
 type Client struct {
 	httpClient *http.Client
-	caURL      *url.URL
+	caURL      string
 }
 
 // New creates a new CA Client
-func New(url *url.URL, options ...Option) *Client {
+func New(url string, options ...Option) *Client {
 	client := &Client{
 		caURL:      url,
 		httpClient: http.DefaultClient,
@@ -58,7 +57,7 @@ func (c *Client) GetCert(ctx context.Context, req *caserver.CreateCertRequest) (
 		return nil, err
 	}
 
-	rq, err := http.NewRequest("POST", c.caURL.String(), bytes.NewReader(body))
+	rq, err := http.NewRequest("POST", c.caURL, bytes.NewReader(body))
 	if err != nil {
 		return nil, err
 	}

pkg/caserver/caserver.go

@@ -10,8 +10,6 @@ import (
 
 	"github.com/brianm/epithet/pkg/ca"
 	"github.com/brianm/epithet/pkg/sshcert"
-	"github.com/go-chi/chi"
-	"github.com/go-chi/chi/middleware"
 	"github.com/sirupsen/logrus"
 )
 
@@ -22,25 +20,22 @@ func New(c *ca.CA) http.Handler {
 	cas := &caServer{
 		c: c,
 	}
-
-	r := chi.NewRouter()
-	r.Use(middleware.RequestID)
-	r.Use(middleware.RealIP)
-	r.Use(middleware.Logger)
-	r.Use(middleware.Recoverer)
-
-	r.Use(middleware.Timeout(60 * time.Second))
-
-	r.Get("/", cas.GetPubKey)
-	r.Post("/", cas.CreateCert)
-
-	return r
+	return cas
 }
 
 type caServer struct {
 	c *ca.CA
 }
 
+func (s *caServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		s.getPubKey(w, r)
+	case "POST":
+		s.createCert(w, r)
+	}
+}
+
 // CreateCertRequest asks for a signed cert
 type CreateCertRequest struct {
 	PublicKey     sshcert.RawPublicKey `json:"publicKey"`
@@ -57,7 +52,7 @@ type CreateCertResponse struct {
 // RequestBodySizeLimit is the maximum request body size
 const RequestBodySizeLimit = 8192
 
-func (s *caServer) CreateCert(w http.ResponseWriter, r *http.Request) {
+func (s *caServer) createCert(w http.ResponseWriter, r *http.Request) {
 	ccr := CreateCertRequest{}
 	lr := io.LimitReader(r.Body, RequestBodySizeLimit)
 
@@ -110,7 +105,7 @@ func (s *caServer) CreateCert(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (s *caServer) GetPubKey(w http.ResponseWriter, r *http.Request) {
+func (s *caServer) getPubKey(w http.ResponseWriter, r *http.Request) {
 	w.Header().Add("Content-type", "text/plain")
 	w.WriteHeader(200)
 	w.Write([]byte(s.c.PublicKey()))

test/integration_test.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"net"
 	"net/http/httptest"
-	"net/url"
 	"os/exec"
 	"testing"
 
@@ -31,7 +30,7 @@ func Test_EndToEnd(t *testing.T) {
 	c, err := ca.New(_caPubKey, _caPrivKey)
 	require.NoError(err)
 
-	cad, err := startCA(c)
+	cad, err := startCAServer(c)
 	require.NoError(err)
 	defer cad.Close()
 
@@ -42,9 +41,7 @@ func Test_EndToEnd(t *testing.T) {
 	pubKey, privKey, err := sshcert.GenerateKeys()
 	require.NoError(err)
 
-	caurl, err := url.Parse(cad.srv.URL + "/")
-	require.NoError(err)
-	cac := caclient.New(caurl)
+	cac := caclient.New(cad.srv.URL)
 
 	car, err := cac.GetCert(ctx, &caserver.CreateCertRequest{
 		PublicKey:     pubKey,
@@ -72,7 +69,7 @@ type caServer struct {
 	srv *httptest.Server
 }
 
-func startCA(c *ca.CA) (*caServer, error) {
+func startCAServer(c *ca.CA) (*caServer, error) {
 	handler := caserver.New(c)
 	srv := httptest.NewServer(handler)