diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-10-30 11:37:33 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-10-30 11:37:33 -0700 |
commit | 03366b14d15aeebf255a54b2878dcc6206c0c372 (patch) | |
tree | b9bb34fdd8a46f057c1a5edd6aefd7f7609a0468 /actionpack/test | |
parent | 11fd052aa815ae0255ea5b2463e88138fb3fec61 (diff) | |
parent | 346acea281f048c853a6318429daac8d1a2e2d68 (diff) | |
download | rails-03366b14d15aeebf255a54b2878dcc6206c0c372.tar.gz rails-03366b14d15aeebf255a54b2878dcc6206c0c372.tar.bz2 rails-03366b14d15aeebf255a54b2878dcc6206c0c372.zip |
Merge branch '3.2.20' into 3-2-stable
* 3.2.20:
bumping version to 3.2.20
FileHandler should not be called for files outside the root
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/dispatch/static_test.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index 856746c451..a035abdf08 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -140,10 +140,28 @@ class StaticTest < ActiveSupport::TestCase [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]] } App = ActionDispatch::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public", "public, max-age=60") + Root = "#{FIXTURE_LOAD_PATH}/public" def setup @app = App + @root = Root end include StaticTests + + def test_custom_handler_called_when_file_is_outside_root + filename = 'shared.html.erb' + assert File.exist?(File.join(@root, '..', filename)) + env = { + "REQUEST_METHOD"=>"GET", + "REQUEST_PATH"=>"/..%2F#{filename}", + "PATH_INFO"=>"/..%2F#{filename}", + "REQUEST_URI"=>"/..%2F#{filename}", + "HTTP_VERSION"=>"HTTP/1.1", + "SERVER_NAME"=>"localhost", + "SERVER_PORT"=>"8080", + "QUERY_STRING"=>"" + } + assert_equal(DummyApp.call(nil), @app.call(env)) + end end |