diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-04-01 01:17:45 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-04-05 21:08:57 +0900 |
| commit | 4b6fa03a72b23fa03a8f37cbfdcad3f0251832cf (patch) | |
| tree | f4272d22879e461ffbf4a4de34e17759b8b4082c | |
| parent | 2f992272f20d29fe20e70555ffabe09cf80d8655 (diff) | |
[ruby/tmpdir] Make usable chars more strict
Remove other than alphanumeric and some punctuations considered
filesystem-safe, instead of removing some unsafe chars only.
https://hackerone.com/reports/1131465
https://github.com/ruby/tmpdir/commit/adf294bc2d
| -rw-r--r-- | lib/tmpdir.rb | 2 | ||||
| -rw-r--r-- | test/test_tmpdir.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index 0b1f00aecf..bf7db5282a 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -115,7 +115,7 @@ class Dir Dir.tmpdir end - UNUSABLE_CHARS = [File::SEPARATOR, File::ALT_SEPARATOR, File::PATH_SEPARATOR, ":"].uniq.join("").freeze + UNUSABLE_CHARS = "^,-.0-9A-Z_a-z~" class << (RANDOM = Random.new) MAX = 36**6 # < 0x100000000 diff --git a/test/test_tmpdir.rb b/test/test_tmpdir.rb index c56fd5f401..7ef9f59b54 100644 --- a/test/test_tmpdir.rb +++ b/test/test_tmpdir.rb @@ -97,8 +97,10 @@ class TestTmpdir < Test::Unit::TestCase target = target.chomp('/') + '/' traversal_path = target.sub(/\A\w:/, '') # for DOSISH traversal_path = Array.new(target.count('/')-2, '..').join('/') + traversal_path - actual = yield traversal_path - assert_not_send([File.absolute_path(actual), :start_with?, target]) + [File::SEPARATOR, File::ALT_SEPARATOR].compact.each do |separator| + actual = yield traversal_path.tr('/', separator) + assert_not_send([File.absolute_path(actual), :start_with?, target]) + end end end end |