Merge pull request #18 from jackyzha0/no-pass-rendering

no password paste rendering

2 files changed, 6 insertions, 10 deletions

diff --git a/backend/api/routes.go b/backend/api/routes.go
index f8d2e4f..ff43714 100644
--- a/backend/api/routes.go
+++ b/backend/api/routes.go
@@ -38,7 +38,8 @@ func insertFunc(w http.ResponseWriter, r *http.Request) {
 	hash, err := db.New(ip, content, expiry, title, password)
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		fmt.Fprintf(w, "got err: %s", err.Error())
+		fmt.Fprintf(w, "%s", err.Error())
+		return
 	}
 
 	// if successful return paste hash
@@ -75,14 +76,14 @@ func handleGetPaste(w http.ResponseWriter, r *http.Request, parsedPassword strin
 	// if hash was not found
 	if err == cache.PasteNotFound {
 		w.WriteHeader(http.StatusNotFound)
-		fmt.Fprintf(w, "got err: %s", err)
+		fmt.Fprintf(w, "%s", err)
 		return
 	}
 
 	// if paste is password protected
 	if err == cache.UserUnauthorized {
 		w.WriteHeader(http.StatusUnauthorized)
-		fmt.Fprintf(w, "got err: %s", err)
+		fmt.Fprintf(w, "%s", err)
 		return
 	}
 
diff --git a/backend/db/db.go b/backend/db/db.go
index fba7bd9..4e58188 100644
--- a/backend/db/db.go
+++ b/backend/db/db.go
@@ -82,16 +82,11 @@ func New(ip, content, expiry, title, password string) (string, error) {
 }
 
 func checkLengths(title string, content string) error {
-	errs := ""
 	if len(title) > TitleLimit {
-		errs += fmt.Sprintf("title is longer than character limit of %d\n", TitleLimit)
+		return fmt.Errorf("title is longer than character limit of %d\n", TitleLimit)
 	}
 	if len(content) > ContentLimit {
-		errs += fmt.Sprintf("content is longer than character limit of %d\n", ContentLimit)
-	}
-	// if any errors were found
-	if errs != "" {
-		return fmt.Errorf(errs)
+		return fmt.Errorf("content is longer than character limit of %d\n", ContentLimit)
 	}
 
 	return nil