diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-12-31 08:18:18 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-12-31 08:30:18 +1030 |
| commit | 2c5190e3299c83a357c8bf8010d6ca7bff99c1b5 (patch) | |
| tree | f97567d61700cad7587464446154af1c7509efa2 /railties | |
| parent | 8ebd34b249fbcc392d058e18538aeca1f2fb5293 (diff) | |
| parent | 6efdb7177bcafe5034d210759446deec1feb6880 (diff) | |
| download | rails-2c5190e3299c83a357c8bf8010d6ca7bff99c1b5.tar.gz rails-2c5190e3299c83a357c8bf8010d6ca7bff99c1b5.tar.bz2 rails-2c5190e3299c83a357c8bf8010d6ca7bff99c1b5.zip | |
Merge pull request #27515 from kbrock/fix_log_remote_ip_before_dispatcher_ips_settings
Allow log remote ip addres when config.action_dispatch.trusted_proxie…
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application/default_middleware_stack.rb | 3 | ||||
| -rw-r--r-- | railties/test/application/middleware_test.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb index 14c0a8cbe4..5ecc7bb7c6 100644 --- a/railties/lib/rails/application/default_middleware_stack.rb +++ b/railties/lib/rails/application/default_middleware_stack.rb @@ -42,11 +42,12 @@ module Rails middleware.use ::Rack::MethodOverride unless config.api_only middleware.use ::ActionDispatch::RequestId + middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies # Must come after Rack::MethodOverride to properly log overridden methods + # Must come after ActionDispatch::RemoteIP to properly log ip address middleware.use ::Rails::Rack::Logger, config.log_tags middleware.use ::ActionDispatch::ShowExceptions, show_exceptions_app middleware.use ::ActionDispatch::DebugExceptions, app, config.debug_exception_response_format - middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies unless config.cache_classes middleware.use ::ActionDispatch::Reloader, app.reloader diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index be41dcb299..71d822bb41 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -30,10 +30,10 @@ module ApplicationTests "Rack::Runtime", "Rack::MethodOverride", "ActionDispatch::RequestId", + "ActionDispatch::RemoteIp", # Must come before Rails::Rack::Logger to properly log request_id "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods "ActionDispatch::ShowExceptions", "ActionDispatch::DebugExceptions", - "ActionDispatch::RemoteIp", "ActionDispatch::Reloader", "ActionDispatch::Callbacks", "ActiveRecord::Migration::CheckPending", @@ -58,10 +58,10 @@ module ApplicationTests "ActiveSupport::Cache::Strategy::LocalCache", "Rack::Runtime", "ActionDispatch::RequestId", + "ActionDispatch::RemoteIp", "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods "ActionDispatch::ShowExceptions", "ActionDispatch::DebugExceptions", - "ActionDispatch::RemoteIp", "ActionDispatch::Reloader", "ActionDispatch::Callbacks", "Rack::Head", |