提交 eb67532b 编写于 作者: P Prem Sichanugrist 提交者: José Valim

Make local_request? to returns true when facing ::1 IPv6 address [#3257 status:resolved]

Signed-off-by: NJosé Valim <jose.valim@gmail.com>
上级 a0dc6cc7
......@@ -20,7 +20,7 @@ module ActionDispatch
# * :exception - The exception raised;
#
class ShowExceptions
LOCALHOST = '127.0.0.1'.freeze
LOCALHOST = ['127.0.0.1', '::1'].freeze
RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
......@@ -118,7 +118,7 @@ def rescue_action_in_public(exception)
# True if the request came from localhost, 127.0.0.1.
def local_request?(request)
request.remote_addr == LOCALHOST && request.remote_ip == LOCALHOST
LOCALHOST.any?{ |local_ip| request.remote_addr == local_ip && request.remote_ip == local_ip }
end
def status_code(exception)
......
......@@ -53,19 +53,21 @@ class ShowExceptionsTest < ActionController::IntegrationTest
test "rescue locally from a local request" do
@app = ProductionApp
self.remote_addr = '127.0.0.1'
['127.0.0.1', '::1'].each do |ip_address|
self.remote_addr = ip_address
get "/"
assert_response 500
assert_match /puke/, body
get "/"
assert_response 500
assert_match /puke/, body
get "/not_found"
assert_response 404
assert_match /#{ActionController::UnknownAction.name}/, body
get "/not_found"
assert_response 404
assert_match /#{ActionController::UnknownAction.name}/, body
get "/method_not_allowed"
assert_response 405
assert_match /ActionController::MethodNotAllowed/, body
get "/method_not_allowed"
assert_response 405
assert_match /ActionController::MethodNotAllowed/, body
end
end
test "localize public rescue message" do
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册