From fda2d150db460dfe66f307d976be021b7fa47722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 27 Sep 2017 16:20:38 +0200 Subject: Fix error response when constraint validation fails --- src/cowboy_req.erl | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'src/cowboy_req.erl') diff --git a/src/cowboy_req.erl b/src/cowboy_req.erl index e916976..40aa652 100644 --- a/src/cowboy_req.erl +++ b/src/cowboy_req.erl @@ -194,7 +194,13 @@ parse_qs(#{qs := Qs}) -> -spec match_qs(cowboy:fields(), req()) -> map(). match_qs(Fields, Req) -> - filter(Fields, kvlist_to_map(Fields, parse_qs(Req))). + case filter(Fields, kvlist_to_map(Fields, parse_qs(Req))) of + {ok, Map} -> + Map; + {error, Errors} -> + exit({request_error, {match_qs, Errors}, + 'Query string validation constraints failed for the reasons provided.'}) + end. -spec uri(req()) -> iodata(). uri(Req) -> @@ -407,7 +413,13 @@ parse_cookies(Req) -> -spec match_cookies(cowboy:fields(), req()) -> map(). match_cookies(Fields, Req) -> - filter(Fields, kvlist_to_map(Fields, parse_cookies(Req))). + case filter(Fields, kvlist_to_map(Fields, parse_cookies(Req))) of + {ok, Map} -> + Map; + {error, Errors} -> + exit({request_error, {match_cookies, Errors}, + 'Cookie validation constraints failed for the reasons provided.'}) + end. %% Request body. @@ -803,12 +815,7 @@ kvlist_to_map(Keys, [{Key, Value}|Tail], Map) -> end. filter(Fields, Map0) -> - case filter(Fields, Map0, #{}) of - {ok, Map} -> - Map; - {error, Errors} -> - exit({validation_failed, Errors}) - end. + filter(Fields, Map0, #{}). %% Loop through fields, if value is missing and no default, %% record the error; else if value is missing and has a -- cgit v1.2.3