diff options
Diffstat (limited to 'actionpack')
3 files changed, 14 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb index 46e33484a4..2c98ca03a8 100644 --- a/actionpack/lib/action_dispatch/middleware/params_parser.rb +++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb @@ -4,7 +4,14 @@ require 'active_support/core_ext/hash/indifferent_access' module ActionDispatch class ParamsParser - class ParseError < StandardError; end + class ParseError < StandardError + attr_reader :original_exception + + def initialize(message, original_exception) + super(message) + @original_exception = original_exception + end + end DEFAULT_PARSERS = { Mime::XML => :xml_simple, @@ -52,10 +59,9 @@ module ActionDispatch false end rescue Exception => e # YAML, XML or Ruby code block errors - message = "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}" - logger(env).debug message + logger(env).debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}" - raise ParseError, message + raise ParseError.new(e.message, e) end def content_type_from_legacy_post_data_format_header(env) diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb index 2022586912..c0c3147e37 100644 --- a/actionpack/test/dispatch/request/json_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb @@ -47,7 +47,8 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest $stderr = StringIO.new # suppress the log json = "[\"person]\": {\"name\": \"David\"}}" exception = assert_raise(ActionDispatch::ParamsParser::ParseError) { post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => false} } - assert_match json, exception.message + assert_equal MultiJson::DecodeError, exception.original_exception.class + assert_equal exception.original_exception.message, exception.message ensure $stderr = STDERR end diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb index 1ef2195810..cb68667002 100644 --- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb @@ -69,7 +69,8 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest $stderr = StringIO.new # suppress the log xml = "<person><name>David</name></pineapple>" exception = assert_raise(ActionDispatch::ParamsParser::ParseError) { post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => false) } - assert_match xml, exception.message + assert_equal REXML::ParseException, exception.original_exception.class + assert_equal exception.original_exception.message, exception.message ensure $stderr = STDERR end |