Updated cert manager

Author: djthorpe

cmd/nginx-server/main.go

@@ -103,6 +103,15 @@ func main() {
 	// Cert manager
 	certmanager, err := certmanager.Config{
 		CertStorage: certstore.(certmanager.CertStorage),
+		X509Name: certmanager.X509Name{
+			OrganizationalUnit: "mutablelogic.com",
+			Organization:       "mutablelogic",
+			StreetAddress:      "N/A",
+			Locality:           "Berlin",
+			Province:           "Berlin",
+			PostalCode:         "10967",
+			Country:            "DE",
+		},
 	}.New()
 	if err != nil {
 		log.Fatal("certmanager: ", err)

pkg/handler/certmanager/endpoints.go

@@ -53,7 +53,7 @@ var (
 	reRoot   = regexp.MustCompile(`^/?$`)
 	reCA     = regexp.MustCompile(`^/ca/?$`)
 	reSerial = regexp.MustCompile(`^/([0-9]+)/?$`)
-	rePem    = regexp.MustCompile(`^/([0-9]+)/(cert\.pem|key\.pem)?$`)
+	rePem    = regexp.MustCompile(`^/([0-9]+)/(cert|key)\.pem$`)
 )
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -154,7 +154,7 @@ func (service *certmanager) reqGetCert(w http.ResponseWriter, r *http.Request) {
 	httpresponse.JSON(w, respCert, http.StatusOK, jsonIndent)
 }
 
-// Get a certificate or CA
+// Get a certificate or CA as a PEM file
 func (service *certmanager) reqGetCertPEM(w http.ResponseWriter, r *http.Request) {
 	urlParameters := router.Params(r.Context())
 
@@ -168,8 +168,8 @@ func (service *certmanager) reqGetCertPEM(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	// Key or Cert
-	w.Header().Set("Content-Type", mimetypePem)
+	// Write the certificate or key
+	w.Header().Set(httpresponse.ContentTypeKey, mimetypePem)
 	switch urlParameters[1] {
 	case "cert":
 		if err := cert.WriteCertificate(w); err != nil {

pkg/httpresponse/httpresponse.go

@@ -34,7 +34,7 @@ func JSON(w http.ResponseWriter, v interface{}, code int, indent uint) error {
 	if w == nil {
 		return nil
 	}
-	w.Header().Add(ContentTypeKey, ContentTypeJSON)
+	w.Header().Set(ContentTypeKey, ContentTypeJSON)
 	w.WriteHeader(code)
 	enc := json.NewEncoder(w)
 	if indent > 0 {
@@ -48,7 +48,7 @@ func Text(w http.ResponseWriter, v string, code int) {
 	if w == nil {
 		return
 	}
-	w.Header().Add(ContentTypeKey, ContentTypeText)
+	w.Header().Set(ContentTypeKey, ContentTypeText)
 	w.WriteHeader(code)
 	w.Write([]byte(v + "\n"))
 }
@@ -58,7 +58,7 @@ func Empty(w http.ResponseWriter, code int) {
 	if w == nil {
 		return
 	}
-	w.Header().Add(ContentLengthKey, "0")
+	w.Header().Set(ContentLengthKey, "0")
 	w.WriteHeader(code)
 }