diff options
author | Jordan Owens <jkowens@gmail.com> | 2016-05-09 14:04:45 -0400 |
---|---|---|
committer | Jordan Owens <jkowens@gmail.com> | 2016-05-09 14:04:45 -0400 |
commit | 31bc9f27c8c689a19d0013ad92e088b80642ce64 (patch) | |
tree | 01586ff9f3212a5db4fbbc574d16c218fc59d854 | |
parent | a0b3de3002bd9f608b3a9e41e702762b10430207 (diff) | |
download | rails-31bc9f27c8c689a19d0013ad92e088b80642ce64.tar.gz rails-31bc9f27c8c689a19d0013ad92e088b80642ce64.tar.bz2 rails-31bc9f27c8c689a19d0013ad92e088b80642ce64.zip |
use Rack::Utils.valid_path? to check path
This commit uses the new method in Rack to check if a path is valid.
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index 41c220236a..2c5721dc22 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -27,8 +27,8 @@ module ActionDispatch # in the server's `public/` directory (see Static#call). def match?(path) path = ::Rack::Utils.unescape_path path - return false unless valid_path?(path) - path = Rack::Utils.clean_path_info path + return false unless ::Rack::Utils.valid_path? path + path = ::Rack::Utils.clean_path_info path paths = [path, "#{path}#{ext}", "#{path}/#{@index}#{ext}"] @@ -94,10 +94,6 @@ module ActionDispatch false end end - - def valid_path?(path) - path.valid_encoding? && !path.include?("\0") - end end # This middleware will attempt to return the contents of a file's body from |