better error messages for posting csr + test

canonical · Apr 18, 2024 · bbaa5c2 · bbaa5c2
1 parent a1fc40e
commit bbaa5c2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/internal/api/handlers.go b/internal/api/handlers.go
@@ -64,10 +64,13 @@ func PostCertificateRequest(env *Environment) http.HandlerFunc {
 			if strings.Contains(err.Error(), "UNIQUE constraint failed") {
 				logError("given csr already recorded", http.StatusBadRequest, w)
 				return
-			} else {
-				logError(err.Error(), http.StatusInternalServerError, w)
+			}
+			if strings.Contains(err.Error(), "csr validation failed") {
+				logError(err.Error(), http.StatusBadRequest, w)
 				return
 			}
+			logError(err.Error(), http.StatusInternalServerError, w)
+			return
 		}
 		w.WriteHeader(http.StatusCreated)
 		if _, err := w.Write([]byte(strconv.FormatInt(id, 10))); err != nil {

diff --git a/internal/api/handlers_test.go b/internal/api/handlers_test.go
@@ -134,6 +134,14 @@ func TestGoCertRouter(t *testing.T) {
 			response: "null",
 			status:   http.StatusOK,
 		},
+		{
+			desc:     "post csr1 fail",
+			method:   "POST",
+			path:     "/api/v1/certificate_requests",
+			data:     "this is very clearly not a csr",
+			response: "error: csr validation failed: PEM Certificate Request string not found or malformed",
+			status:   http.StatusBadRequest,
+		},
 		{
 			desc:     "post csr1 success",
 			method:   "POST",

diff --git a/internal/certdb/certdb.go b/internal/certdb/certdb.go
@@ -68,7 +68,7 @@ func (db *CertificateRequestsRepository) Retrieve(id string) (CertificateRequest
 // The given CSR must be valid and unique
 func (db *CertificateRequestsRepository) Create(csr string) (int64, error) {
 	if err := ValidateCertificateRequest(csr); err != nil {
-		return 0, err
+		return 0, errors.New("csr validation failed: " + err.Error())
 	}
 	result, err := db.conn.Exec(fmt.Sprintf(queryCreateCSR, db.table), csr)
 	if err != nil {