Do not send rack.input or any other rack information to AD listeners.

This commit is contained in:
José Valim
2010-01-19 12:17:52 +01:00
parent bec5356f25
commit 4e2852a487
3 changed files with 17 additions and 11 deletions

View File

@@ -8,17 +8,24 @@ module ActionDispatch
@app = app
end
def call(stack_env)
env = stack_env.dup
ActiveSupport::Notifications.instrument("action_dispatch.before_dispatch", :env => env)
def call(env)
payload = retrieve_payload_from_env(env)
ActiveSupport::Notifications.instrument("action_dispatch.before_dispatch", payload)
ActiveSupport::Notifications.instrument!("action_dispatch.after_dispatch", :env => env) do
@app.call(stack_env)
ActiveSupport::Notifications.instrument!("action_dispatch.after_dispatch", payload) do
@app.call(env)
end
rescue Exception => exception
ActiveSupport::Notifications.instrument('action_dispatch.exception',
:env => stack_env, :exception => exception)
:env => env, :exception => exception)
raise exception
end
protected
# Remove any rack related constants from the env, like rack.input.
def retrieve_payload_from_env(env)
Hash[:env => env.except(*env.keys.select { |k| k.to_s.index("rack.") == 0 })]
end
end
end

View File

@@ -5,8 +5,8 @@ module ActionDispatch
request = Request.new(event.payload[:env])
path = request.request_uri.inspect rescue "unknown"
info "\n\nProcessing #{path} to #{request.formats.join(', ')} " <<
"(for #{request.remote_ip} at #{event.time.to_s(:db)}) [#{request.method.to_s.upcase}]"
info "\n\nStarted #{request.method.to_s.upcase} #{path} " <<
"for #{request.remote_ip} at #{event.time.to_s(:db)}"
end
def logger

View File

@@ -78,9 +78,8 @@ module DispatcherSubscriberTest
log = @logger.logged(:info).first
assert_equal 1, @logger.logged(:info).size
assert_match %r{^Processing "/" to text/html}, log
assert_match %r{\(for 127\.0\.0\.1}, log
assert_match %r{\[GET\]}, log
assert_match %r{^Started GET "/"}, log
assert_match %r{for 127\.0\.0\.1}, log
end
def test_subscriber_has_its_logged_flushed_after_request