diff options
| -rw-r--r-- | file.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_file.rb | 20 |
2 files changed, 21 insertions, 1 deletions
@@ -4086,7 +4086,7 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode } } - OBJ_TAINT(resolved); + OBJ_INFECT(resolved, unresolved_path); RB_GC_GUARD(unresolved_path); RB_GC_GUARD(curdir); return resolved; diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index 4be4e86131..9d29bbbb65 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -283,6 +283,26 @@ class TestFile < Test::Unit::TestCase } end + def test_realpath_taintedness + Dir.mktmpdir('rubytest-realpath') {|tmpdir| + dir = File.realpath(tmpdir).untaint + File.write(File.join(dir, base = "test.file"), '') + base.taint + dir.taint + assert_predicate(File.realpath(base, dir), :tainted?) + base.untaint + dir.taint + assert_predicate(File.realpath(base, dir), :tainted?) + base.taint + dir.untaint + assert_predicate(File.realpath(base, dir), :tainted?) + base.untaint + dir.untaint + assert_not_predicate(File.realpath(base, dir), :tainted?) + assert_predicate(Dir.chdir(dir) {File.realpath(base)}, :tainted?) + } + end + def test_realdirpath Dir.mktmpdir('rubytest-realdirpath') {|tmpdir| realdir = File.realpath(tmpdir) |