Revert "Merge pull request #20584 from arthurnn/fix_url"

This reverts commit 0b339787, reversing
changes made to 56d52e37.

As pointed out on the PR, this will hide development mistakes too, which
is not ideal.
上级 15de4b6d
* Handle InvalidURIError on bad paths on redirect route.
*arthurnn*
* Deprecate passing first parameter as `Hash` and default status code for `head` method.
*Mehmet Emin İNAÇ*
......
......@@ -23,12 +23,8 @@ def call(env)
def serve(req)
req.check_path_parameters!
begin
uri = URI.parse(path(req.path_parameters, req))
rescue URI::InvalidURIError
return [ 400, {}, ['Invalid path.'] ]
end
uri = URI.parse(path(req.path_parameters, req))
unless uri.host
if relative_path?(uri.path)
uri.path = "#{req.script_name}/#{uri.path}"
......@@ -36,7 +32,7 @@ def serve(req)
uri.path = req.script_name.empty? ? "/" : req.script_name
end
end
uri.scheme ||= req.scheme
uri.host ||= req.host
uri.port ||= req.port unless req.standard_port?
......@@ -128,7 +124,7 @@ def path(params, request)
url_options[:script_name] = request.script_name
end
end
ActionDispatch::Http::URL.url_for url_options
end
......
......@@ -219,13 +219,6 @@ def test_X_Cascade
assert_equal 404, resp.first
end
def test_invalid_url_path
routes = Class.new { include ActionDispatch::Routing::Redirection }.new
route = routes.redirect("/foo/bar/%{id}")
resp = route.serve(rails_env({ 'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/foo/(function(){})' }))
assert_equal 400, resp.first
end
def test_clear_trailing_slash_from_script_name_on_root_unanchored_routes
route_set = Routing::RouteSet.new
mapper = Routing::Mapper.new route_set
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册