InvalidEmailProblem should return 400 httpcode.

ronyweng · J.C. Jones · commit d2ee8d575449 · 2016-02-23T14:57:05.000-07:00
diff --git a/probs/probs.go b/probs/probs.go
@@ -47,7 +47,7 @@ func ProblemDetailsToStatusCode(prob *ProblemDetails) int {
 		return prob.HTTPStatus
 	}
 	switch prob.Type {
-	case ConnectionProblem, MalformedProblem, TLSProblem, UnknownHostProblem, BadNonceProblem:
+	case ConnectionProblem, MalformedProblem, TLSProblem, UnknownHostProblem, BadNonceProblem, InvalidEmailProblem:
 		return http.StatusBadRequest
 	case ServerInternalProblem:
 		return http.StatusInternalServerError
diff --git a/probs/probs_test.go b/probs/probs_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/letsencrypt/boulder/test"
+	"net/http"
 )
 
 func TestProblemDetails(t *testing.T) {
@@ -14,3 +15,30 @@ func TestProblemDetails(t *testing.T) {
 	}
 	test.AssertEquals(t, pd.Error(), "urn:acme:error:malformed :: Wat? o.O")
 }
+
+func TestProblemDetailsToStatusCode(t *testing.T) {
+	testCases := []struct {
+		pb         *ProblemDetails
+		statusCode int
+	}{
+		{&ProblemDetails{Type: ConnectionProblem}, http.StatusBadRequest},
+		{&ProblemDetails{Type: MalformedProblem}, http.StatusBadRequest},
+		{&ProblemDetails{Type: ServerInternalProblem}, http.StatusInternalServerError},
+		{&ProblemDetails{Type: TLSProblem}, http.StatusBadRequest},
+		{&ProblemDetails{Type: UnauthorizedProblem}, http.StatusForbidden},
+		{&ProblemDetails{Type: UnknownHostProblem}, http.StatusBadRequest},
+		{&ProblemDetails{Type: RateLimitedProblem}, statusTooManyRequests},
+		{&ProblemDetails{Type: BadNonceProblem}, http.StatusBadRequest},
+		{&ProblemDetails{Type: InvalidEmailProblem}, http.StatusBadRequest},
+		{&ProblemDetails{Type: "foo"}, http.StatusInternalServerError},
+		{&ProblemDetails{Type: "foo", HTTPStatus: 200}, 200},
+		{&ProblemDetails{Type: ConnectionProblem, HTTPStatus: 200}, 200},
+	}
+
+	for _, c := range testCases {
+		p := ProblemDetailsToStatusCode(c.pb)
+		if c.statusCode != p {
+			t.Errorf("Incorrect status code for %s. Expected %d, got %d", c.pb.Type, c.statusCode, p)
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func ProblemDetailsToStatusCode(prob *ProblemDetails) int {`
`47`	`47`	`return prob.HTTPStatus`
`48`	`48`	`}`
`49`	`49`	`switch prob.Type {`
`50`		`- case ConnectionProblem, MalformedProblem, TLSProblem, UnknownHostProblem, BadNonceProblem:`
	`50`	`+ case ConnectionProblem, MalformedProblem, TLSProblem, UnknownHostProblem, BadNonceProblem, InvalidEmailProblem:`
`51`	`51`	`return http.StatusBadRequest`
`52`	`52`	`case ServerInternalProblem:`
`53`	`53`	`return http.StatusInternalServerError`