diff options
author | Andrew White <andyw@pixeltrix.co.uk> | 2012-02-17 14:06:38 +0000 |
---|---|---|
committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-02-17 14:08:13 +0000 |
commit | 86d3bc37b8f302e8dbe5ad1095ea2723fc87f8c0 (patch) | |
tree | 5c1ed8c4b4f46ba7ef601d8a16cf8151762949cf /actionpack/lib | |
parent | 1a0bc2ab7fbade57a24e3daa3512e4167641410d (diff) | |
download | rails-86d3bc37b8f302e8dbe5ad1095ea2723fc87f8c0.tar.gz rails-86d3bc37b8f302e8dbe5ad1095ea2723fc87f8c0.tar.bz2 rails-86d3bc37b8f302e8dbe5ad1095ea2723fc87f8c0.zip |
Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.
Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.
[1]: http://www.ietf.org/rfc/rfc3986.txt
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index 404943d720..531edb27ba 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -11,14 +11,14 @@ module ActionDispatch def match?(path) path = path.dup - full_path = path.empty? ? @root : File.join(@root, ::Rack::Utils.unescape(path)) + full_path = path.empty? ? @root : File.join(@root, escape_glob_chars(unescape_path(path))) paths = "#{full_path}#{ext}" matches = Dir[paths] match = matches.detect { |m| File.file?(m) } if match match.sub!(@compiled_root, '') - match + ::Rack::Utils.escape(match) end end @@ -32,6 +32,14 @@ module ActionDispatch "{,#{ext},/index#{ext}}" end end + + def unescape_path(path) + URI.parser.unescape(path) + end + + def escape_glob_chars(path) + path.gsub(/(\*|\?|\[|\]|\{|\})/, "\\\\\\1") + end end class Static |