diff options
| author | Josh Goebel <dreamer3@gmail.com> | 2013-03-21 14:23:46 -0400 |
|---|---|---|
| committer | Josh Goebel <dreamer3@gmail.com> | 2013-03-21 14:23:46 -0400 |
| commit | ea2336b9e2c47a9cc1a73b1350ffc03252e6468e (patch) | |
| tree | 8bfd4a55d6710ede53fb0be5e56d2a780eaf354f /actionpack | |
| parent | ecfdc842a58816540e7c96a913f95a0d94be7ca7 (diff) | |
| download | rails-ea2336b9e2c47a9cc1a73b1350ffc03252e6468e.tar.gz rails-ea2336b9e2c47a9cc1a73b1350ffc03252e6468e.tar.bz2 rails-ea2336b9e2c47a9cc1a73b1350ffc03252e6468e.zip | |
failure to parse params should trigger a 400 Bad Request
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/dispatch/show_exceptions_test.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/fixtures/public/400.html | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb index 7489ce8028..4c331f2f0b 100644 --- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb +++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb @@ -12,6 +12,7 @@ module ActionDispatch 'ActionController::NotImplemented' => :not_implemented, 'ActionController::UnknownFormat' => :not_acceptable, 'ActionController::InvalidAuthenticityToken' => :unprocessable_entity, + 'ActionDispatch::ParamsParser::ParseError' => :bad_request, 'ActionController::BadRequest' => :bad_request, 'ActionController::ParameterMissing' => :bad_request ) diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb index 45f8fc11b3..900f45ee5e 100644 --- a/actionpack/test/dispatch/show_exceptions_test.rb +++ b/actionpack/test/dispatch/show_exceptions_test.rb @@ -8,6 +8,8 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest case req.path when "/not_found" raise AbstractController::ActionNotFound + when "/bad_params" + raise ActionDispatch::ParamsParser::ParseError.new("", StandardError.new) when "/method_not_allowed" raise ActionController::MethodNotAllowed when "/not_found_original_exception" @@ -33,6 +35,10 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest get "/", {}, {'action_dispatch.show_exceptions' => true} assert_response 500 assert_equal "500 error fixture\n", body + + get "/bad_params", {}, {'action_dispatch.show_exceptions' => true} + assert_response 400 + assert_equal "400 error fixture\n", body get "/not_found", {}, {'action_dispatch.show_exceptions' => true} assert_response 404 diff --git a/actionpack/test/fixtures/public/400.html b/actionpack/test/fixtures/public/400.html new file mode 100644 index 0000000000..03be6bedaf --- /dev/null +++ b/actionpack/test/fixtures/public/400.html @@ -0,0 +1 @@ +400 error fixture |