Merge pull request #7 from jacobbednarz/dont-panic-for-invalid-json

Dont panic for invalid json
jacobbednarz · Oct 3, 2017 · f6ccaab · f6ccaab
2 parents 6126bef + ffd1c19
commit f6ccaab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/csp_collector.go b/csp_collector.go
@@ -64,7 +64,8 @@ func handleViolationReport(w http.ResponseWriter, r *http.Request) {
 
 	err := decoder.Decode(&report)
 	if err != nil {
-		panic(err)
+		w.WriteHeader(http.StatusUnprocessableEntity)
+		return
 	}
 	defer r.Body.Close()
 
@@ -107,7 +108,7 @@ func validateViolation(r CSPReport) error {
 
 	for _, value := range ignoredBlockedURIs {
 		if strings.HasPrefix(r.Body.BlockedURI, value) == true {
-			err := fmt.Errorf("Blocked URI ('%s') is an invalid resource.", value)
+			err := fmt.Errorf("blocked URI ('%s') is an invalid resource", value)
 			return err
 		}
 	}

diff --git a/csp_collector_test.go b/csp_collector_test.go
@@ -137,7 +137,7 @@ func TestValidateViolationWithInvalidBlockedURIs(t *testing.T) {
 				t.Errorf("expected error to be raised but it didn't")
 			}
 
-			if validateErr.Error() != fmt.Sprintf("Blocked URI ('%s') is an invalid resource.", blockedURI) {
+			if validateErr.Error() != fmt.Sprintf("blocked URI ('%s') is an invalid resource", blockedURI) {
 				t.Errorf("expected error to include correct message string but it didn't")
 			}
 		})