aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actionpack/test/dispatch/static_test.rb114
-rw-r--r--actionpack/test/fixtures/public/foo/foo!bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo$bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo&bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo'bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo(bar).html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo*bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo+bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo,bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo:bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo;bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo=bar.html1
-rw-r--r--actionpack/test/fixtures/public/foo/foo@bar.html1
13 files changed, 88 insertions, 38 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index e086d99b19..092ca3e20a 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -1,5 +1,6 @@
# encoding: utf-8
require 'abstract_unit'
+require 'rbconfig'
module StaticTests
def test_serves_dynamic_content
@@ -35,32 +36,85 @@ module StaticTests
assert_html "means hello in Japanese\n", get("/foo/#{Rack::Utils.escape("こんにちは.html")}")
end
- def test_serves_static_file_with_encoded_pchar
- assert_html "/foo/foo!bar.html", get("/foo/foo%21bar.html")
- assert_html "/foo/foo$bar.html", get("/foo/foo%24bar.html")
- assert_html "/foo/foo&bar.html", get("/foo/foo%26bar.html")
- assert_html "/foo/foo'bar.html", get("/foo/foo%27bar.html")
- assert_html "/foo/foo(bar).html", get("/foo/foo%28bar%29.html")
- assert_html "/foo/foo*bar.html", get("/foo/foo%2Abar.html")
- assert_html "/foo/foo+bar.html", get("/foo/foo%2Bbar.html")
- assert_html "/foo/foo,bar.html", get("/foo/foo%2Cbar.html")
- assert_html "/foo/foo;bar.html", get("/foo/foo%3Bbar.html")
- assert_html "/foo/foo:bar.html", get("/foo/foo%3Abar.html")
- assert_html "/foo/foo@bar.html", get("/foo/foo%40bar.html")
- end
-
- def test_serves_static_file_with_unencoded_pchar
- assert_html "/foo/foo!bar.html", get("/foo/foo!bar.html")
- assert_html "/foo/foo$bar.html", get("/foo/foo$bar.html")
- assert_html "/foo/foo&bar.html", get("/foo/foo&bar.html")
- assert_html "/foo/foo'bar.html", get("/foo/foo'bar.html")
- assert_html "/foo/foo(bar).html", get("/foo/foo(bar).html")
- assert_html "/foo/foo*bar.html", get("/foo/foo*bar.html")
- assert_html "/foo/foo+bar.html", get("/foo/foo+bar.html")
- assert_html "/foo/foo,bar.html", get("/foo/foo,bar.html")
- assert_html "/foo/foo;bar.html", get("/foo/foo;bar.html")
- assert_html "/foo/foo:bar.html", get("/foo/foo:bar.html")
- assert_html "/foo/foo@bar.html", get("/foo/foo@bar.html")
+
+ def test_serves_static_file_with_exclamation_mark_in_filename
+ with_static_file "/foo/foo!bar.html" do |file|
+ assert_html file, get("/foo/foo%21bar.html")
+ assert_html file, get("/foo/foo!bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_dollar_sign_in_filename
+ with_static_file "/foo/foo$bar.html" do |file|
+ assert_html file, get("/foo/foo%24bar.html")
+ assert_html file, get("/foo/foo$bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_ampersand_in_filename
+ with_static_file "/foo/foo&bar.html" do |file|
+ assert_html file, get("/foo/foo%26bar.html")
+ assert_html file, get("/foo/foo&bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_apostrophe_in_filename
+ with_static_file "/foo/foo'bar.html" do |file|
+ assert_html file, get("/foo/foo%27bar.html")
+ assert_html file, get("/foo/foo'bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_parentheses_in_filename
+ with_static_file "/foo/foo(bar).html" do |file|
+ assert_html file, get("/foo/foo%28bar%29.html")
+ assert_html file, get("/foo/foo(bar).html")
+ end
+ end
+
+ def test_serves_static_file_with_plus_sign_in_filename
+ with_static_file "/foo/foo+bar.html" do |file|
+ assert_html file, get("/foo/foo%2Bbar.html")
+ assert_html file, get("/foo/foo+bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_comma_in_filename
+ with_static_file "/foo/foo,bar.html" do |file|
+ assert_html file, get("/foo/foo%2Cbar.html")
+ assert_html file, get("/foo/foo,bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_semi_colon_in_filename
+ with_static_file "/foo/foo;bar.html" do |file|
+ assert_html file, get("/foo/foo%3Bbar.html")
+ assert_html file, get("/foo/foo;bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_at_symbol_in_filename
+ with_static_file "/foo/foo@bar.html" do |file|
+ assert_html file, get("/foo/foo%40bar.html")
+ assert_html file, get("/foo/foo@bar.html")
+ end
+ end
+
+ # Windows doesn't allow \ / : * ? " < > | in filenames
+ unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+ def test_serves_static_file_with_colon
+ with_static_file "/foo/foo:bar.html" do |file|
+ assert_html file, get("/foo/foo%3Abar.html")
+ assert_html file, get("/foo/foo:bar.html")
+ end
+ end
+
+ def test_serves_static_file_with_asterisk
+ with_static_file "/foo/foo*bar.html" do |file|
+ assert_html file, get("/foo/foo%2Abar.html")
+ assert_html file, get("/foo/foo*bar.html")
+ end
+ end
end
private
@@ -73,6 +127,14 @@ module StaticTests
def get(path)
Rack::MockRequest.new(@app).request("GET", path)
end
+
+ def with_static_file(file)
+ path = "#{FIXTURE_LOAD_PATH}/public" + file
+ File.open(path, "wb+") { |f| f.write(file) }
+ yield file
+ ensure
+ File.delete(path)
+ end
end
class StaticTest < ActiveSupport::TestCase
diff --git a/actionpack/test/fixtures/public/foo/foo!bar.html b/actionpack/test/fixtures/public/foo/foo!bar.html
deleted file mode 100644
index 2928f2717f..0000000000
--- a/actionpack/test/fixtures/public/foo/foo!bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo!bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo$bar.html b/actionpack/test/fixtures/public/foo/foo$bar.html
deleted file mode 100644
index 4f837df01d..0000000000
--- a/actionpack/test/fixtures/public/foo/foo$bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo$bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo&bar.html b/actionpack/test/fixtures/public/foo/foo&bar.html
deleted file mode 100644
index c194e8de87..0000000000
--- a/actionpack/test/fixtures/public/foo/foo&bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo&bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo'bar.html b/actionpack/test/fixtures/public/foo/foo'bar.html
deleted file mode 100644
index 25c3275736..0000000000
--- a/actionpack/test/fixtures/public/foo/foo'bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo'bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo(bar).html b/actionpack/test/fixtures/public/foo/foo(bar).html
deleted file mode 100644
index 94fa4cb944..0000000000
--- a/actionpack/test/fixtures/public/foo/foo(bar).html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo(bar).html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo*bar.html b/actionpack/test/fixtures/public/foo/foo*bar.html
deleted file mode 100644
index 79d5194c8d..0000000000
--- a/actionpack/test/fixtures/public/foo/foo*bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo*bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo+bar.html b/actionpack/test/fixtures/public/foo/foo+bar.html
deleted file mode 100644
index 0fdc2ecabc..0000000000
--- a/actionpack/test/fixtures/public/foo/foo+bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo+bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo,bar.html b/actionpack/test/fixtures/public/foo/foo,bar.html
deleted file mode 100644
index f040fce197..0000000000
--- a/actionpack/test/fixtures/public/foo/foo,bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo,bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo:bar.html b/actionpack/test/fixtures/public/foo/foo:bar.html
deleted file mode 100644
index 7900a2642b..0000000000
--- a/actionpack/test/fixtures/public/foo/foo:bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo:bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo;bar.html b/actionpack/test/fixtures/public/foo/foo;bar.html
deleted file mode 100644
index 2248376954..0000000000
--- a/actionpack/test/fixtures/public/foo/foo;bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo;bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo=bar.html b/actionpack/test/fixtures/public/foo/foo=bar.html
deleted file mode 100644
index 206f69e286..0000000000
--- a/actionpack/test/fixtures/public/foo/foo=bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo=bar.html \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/foo@bar.html b/actionpack/test/fixtures/public/foo/foo@bar.html
deleted file mode 100644
index 4e8e90f9b8..0000000000
--- a/actionpack/test/fixtures/public/foo/foo@bar.html
+++ /dev/null
@@ -1 +0,0 @@
-/foo/foo@bar.html \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 13:20:20 +0000