diff options
| author | schneems <richard.schneeman@gmail.com> | 2014-08-18 11:20:06 -0500 |
|---|---|---|
| committer | schneems <richard.schneeman@gmail.com> | 2014-08-27 13:03:08 -0500 |
| commit | 0b1a87f73cca3da23b65f3dfb19daeac436ab2ee (patch) | |
| tree | a5e04e8b52c47c007dee4861c5f26383674ff9d7 /actionpack/test | |
| parent | 5bcd5a32abf14b371424131dce819139de09c74c (diff) | |
| download | rails-0b1a87f73cca3da23b65f3dfb19daeac436ab2ee.tar.gz rails-0b1a87f73cca3da23b65f3dfb19daeac436ab2ee.tar.bz2 rails-0b1a87f73cca3da23b65f3dfb19daeac436ab2ee.zip | |
Refactor out Dir.glob from ActionDispatch::Static
Dir.glob can be a security concern. The original use was to provide logic of fallback files. Example a request to `/` should render the file from `/public/index.html`. We can replace the dir glob with the specific logic it represents. The glob {,index,index.html} will look for the current path, then in the directory of the path with index file and then in the directory of the path with index.html. This PR replaces the glob logic by manually checking each potential match. Best case scenario this results in one less file API request, worst case, this has one more file API request.
Related to #16464
Update: added a test for when a file of a given name (`public/bar.html` and a directory `public/bar` both exist in the same root directory. Changed logic to accommodate this scenario.
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/static_test.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/fixtures/public/bar.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/public/bar/index.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/bar.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/bar/index.html | 1 |
5 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index 97affc7b21..6f7373201c 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -37,6 +37,10 @@ module StaticTests assert_html "/foo/index.html", get("/foo") end + def test_serves_file_with_same_name_before_index_in_directory + assert_html "/bar.html", get("/bar") + end + def test_served_static_file_with_non_english_filename jruby_skip "Stop skipping if following bug gets fixed: " \ "http://jira.codehaus.org/browse/JRUBY-7192" diff --git a/actionpack/test/fixtures/public/bar.html b/actionpack/test/fixtures/public/bar.html new file mode 100644 index 0000000000..67fc57079b --- /dev/null +++ b/actionpack/test/fixtures/public/bar.html @@ -0,0 +1 @@ +/bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/bar/index.html b/actionpack/test/fixtures/public/bar/index.html new file mode 100644 index 0000000000..d5bb8f898d --- /dev/null +++ b/actionpack/test/fixtures/public/bar/index.html @@ -0,0 +1 @@ +/bar/index.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/公共/bar.html b/actionpack/test/fixtures/公共/bar.html new file mode 100644 index 0000000000..67fc57079b --- /dev/null +++ b/actionpack/test/fixtures/公共/bar.html @@ -0,0 +1 @@ +/bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/公共/bar/index.html b/actionpack/test/fixtures/公共/bar/index.html new file mode 100644 index 0000000000..d5bb8f898d --- /dev/null +++ b/actionpack/test/fixtures/公共/bar/index.html @@ -0,0 +1 @@ +/bar/index.html
\ No newline at end of file |