diff options
author | Fabrizio Regini <freegenie@gmail.com> | 2012-10-01 00:00:44 +0200 |
---|---|---|
committer | Fabrizio Regini <freegenie@gmail.com> | 2012-12-05 11:07:14 +0100 |
commit | 86e3aaab939a67536f007d1633ec19521dba15e9 (patch) | |
tree | bae8f2b279a66616255fffc7709d2e9aad5998d1 /actionpack/lib/action_dispatch | |
parent | 129eac024382c7fbdad2007e86cf25778d5f6787 (diff) | |
download | rails-86e3aaab939a67536f007d1633ec19521dba15e9.tar.gz rails-86e3aaab939a67536f007d1633ec19521dba15e9.tar.bz2 rails-86e3aaab939a67536f007d1633ec19521dba15e9.zip |
Adding filter capability to ActionController logs
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/http/filter_redirect.rb | 37 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/filter_redirect.rb b/actionpack/lib/action_dispatch/http/filter_redirect.rb new file mode 100644 index 0000000000..900ce1c646 --- /dev/null +++ b/actionpack/lib/action_dispatch/http/filter_redirect.rb @@ -0,0 +1,37 @@ +module ActionDispatch + module Http + module FilterRedirect + + FILTERED = '[FILTERED]'.freeze # :nodoc: + + def filtered_location + if !location_filter.empty? && location_filter_match? + FILTERED + else + location + end + end + + private + + def location_filter + if request.present? + request.env['action_dispatch.redirect_filter'] || [] + else + [] + end + end + + def location_filter_match? + location_filter.any? do |filter| + if String === filter + location.include?(filter) + elsif Regexp === filter + location.match(filter) + end + end + end + + end + end +end diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 11b7534ea4..0f808ac9cf 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -61,6 +61,7 @@ module ActionDispatch # :nodoc: cattr_accessor(:default_headers) include Rack::Response::Helpers + include ActionDispatch::Http::FilterRedirect include ActionDispatch::Http::Cache::Response include MonitorMixin |