aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-08-13 17:23:48 +0200
committerLoïc Hoguin <[email protected]>2018-08-13 17:23:48 +0200
commit0a5fadc60bc586946ebd3b17839bcaf13b76f6d0 (patch)
tree4e8122d59c486273d894296c0aba502f155e3687
parent06a3a93de0bb6bdd0759f658b7826f38a50bb8a6 (diff)
downloadcowboy-0a5fadc60bc586946ebd3b17839bcaf13b76f6d0.tar.gz
cowboy-0a5fadc60bc586946ebd3b17839bcaf13b76f6d0.tar.bz2
cowboy-0a5fadc60bc586946ebd3b17839bcaf13b76f6d0.zip
Improve errors for when the ProvideCallback is missing
-rw-r--r--src/cowboy_rest.erl7
-rw-r--r--test/handlers/provide_callback_missing_h.erl11
-rw-r--r--test/rest_handler_SUITE.erl8
3 files changed, 23 insertions, 3 deletions
diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl
index c73ee53..2780a90 100644
--- a/src/cowboy_rest.erl
+++ b/src/cowboy_rest.erl
@@ -1069,7 +1069,7 @@ set_resp_body_expires(Req, State) ->
%% Set the response headers and call the callback found using
%% content_types_provided/2 to obtain the request body and add
%% it to the response.
-set_resp_body(Req, State=#state{content_type_a={_, Callback}}) ->
+set_resp_body(Req, State=#state{handler=Handler, content_type_a={_, Callback}}) ->
try case call(Req, State, Callback) of
{stop, Req2, HandlerState2} ->
terminate(Req2, State#state{handler_state=HandlerState2});
@@ -1079,8 +1079,9 @@ set_resp_body(Req, State=#state{content_type_a={_, Callback}}) ->
State2 = State#state{handler_state=HandlerState2},
Req3 = cowboy_req:set_resp_body(Body, Req2),
multiple_choices(Req3, State2)
- end catch Class:Reason = {case_clause, no_call} ->
- error_terminate(Req, State, Class, Reason)
+ end catch Class:{case_clause, no_call} ->
+ error_terminate(Req, State, Class, {error, {missing_callback, {Handler, Callback, 2}},
+ 'A callback specified in content_types_provided/2 is not exported.'})
end.
multiple_choices(Req, State) ->
diff --git a/test/handlers/provide_callback_missing_h.erl b/test/handlers/provide_callback_missing_h.erl
new file mode 100644
index 0000000..c9419ad
--- /dev/null
+++ b/test/handlers/provide_callback_missing_h.erl
@@ -0,0 +1,11 @@
+-module(provide_callback_missing_h).
+
+-export([init/2]).
+-export([content_types_provided/2]).
+
+init(Req, State) ->
+ {cowboy_rest, Req, State}.
+
+content_types_provided(Req, State) ->
+ ct_helper_error_h:ignore(cowboy_rest, set_resp_body, 2),
+ {[{<<"text/plain">>, provide}], Req, State}.
diff --git a/test/rest_handler_SUITE.erl b/test/rest_handler_SUITE.erl
index ec7c97d..1d9619c 100644
--- a/test/rest_handler_SUITE.erl
+++ b/test/rest_handler_SUITE.erl
@@ -38,6 +38,7 @@ end_per_group(Name, _) ->
init_dispatch(_) ->
cowboy_router:compile([{'_', [
+ {"/provide_callback_missing", provide_callback_missing_h, []},
{"/switch_handler", switch_handler_h, run},
{"/switch_handler_opts", switch_handler_h, hibernate}
]}]).
@@ -52,6 +53,13 @@ do_decode(Headers, Body) ->
%% Tests.
+provide_callback_missing(Config) ->
+ doc("A 500 response must be sent when the ProvideCallback can't be called."),
+ ConnPid = gun_open(Config),
+ Ref = gun:get(ConnPid, "/provide_callback_missing", [{<<"accept-encoding">>, <<"gzip">>}]),
+ {response, fin, 500, _} = gun:await(ConnPid, Ref),
+ ok.
+
switch_handler(Config) ->
doc("Switch REST to loop handler for streaming the response body."),
ConnPid = gun_open(Config),