Skip to content

fix(DefaultHTTPErrorHandler): return error message when message is an error #2456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 29, 2023
Merged

fix(DefaultHTTPErrorHandler): return error message when message is an error #2456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94f9c21
fix(DefaultHTTPErrorHandler): return error message when message is an…
gnuletik May 26, 2023
321c93e
fix(echo): marshal as JSON for types that implements json.Marshaler
gnuletik May 28, 2023
f133ab6
test(DefaultHTTPErroHandler): refactor to table based test
gnuletik May 28, 2023
e7e0db9
fix(DefaultHTTPErrorHandler): remove useless break statement in switc…
gnuletik May 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion echo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,16 @@ func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
// Issue #1426
code := he.Code
message := he.Message
if m, ok := he.Message.(string); ok {

switch m := he.Message.(type) {
case string:
if e.Debug {
message = Map{"message": m, "error": err.Error()}
} else {
message = Map{"message": m}
}
case error:
message = Map{"message": m.Error()}
}

// Send response
Expand Down
8 changes: 8 additions & 0 deletions echo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,9 @@ func TestDefaultHTTPErrorHandler(t *testing.T) {
err := errors.New("internal error message body")
return NewHTTPError(http.StatusBadRequest).SetInternal(err)
})
e.GET("/error-in-httperror", func(c Context) error {
return NewHTTPError(http.StatusBadRequest, errors.New("error in httperror"))
})

// With Debug=true plain response contains error message
c, b := request(http.MethodGet, "/plain", e)
Expand Down Expand Up @@ -1347,6 +1350,11 @@ func TestDefaultHTTPErrorHandler(t *testing.T) {
c, b = request(http.MethodGet, "/servererror", e)
assert.Equal(t, http.StatusInternalServerError, c)
assert.Equal(t, "{\"code\":33,\"error\":\"stackinfo\",\"message\":\"Something bad happened\"}\n", b)

// when returning HTTPError with error, the error message is returned
c, b = request(http.MethodGet, "/error-in-httperror", e)
assert.Equal(t, http.StatusBadRequest, c)
assert.Equal(t, "{\"message\":\"error in httperror\"}\n", b)
}

func TestEchoClose(t *testing.T) {
Expand Down