1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test/ruby/test_require.rb: Remove the tests of require with $SAFE

Browse Source 
The taint mechanism is decided to be removed at 2.7.  [Feature #16131]
So, this change removes the tests that expects a SecurityError when
requiring a file under $SAFE >= 1.

The reason why they should be removed in advance is because the upstream
of rubygems has already removed a call to "untaint" method, which makes
the tests fail.
This commit is contained in:
Yusuke Endoh 2019-11-12 08:31:13 +09:00
parent d9978ce5d3
commit 9594f57f3d
1 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
test/ruby/test_require.rb
View File

@ -62,12 +62,6 @@ class TestRequire < Test::Unit::TestCase
assert_require_nonascii_path(encoding, bug8165) assert_require_nonascii_path(encoding, bug8165)
end end
def test_require_insecure_path
assert_require_insecure_path("foo")
encoding = 'filesystem'
assert_require_insecure_path(nil, encoding)
end
def test_require_nonascii_path_utf8 def test_require_nonascii_path_utf8
bug8676 = '[ruby-core:56136] [Bug #8676]' bug8676 = '[ruby-core:56136] [Bug #8676]'
encoding = Encoding::UTF_8 encoding = Encoding::UTF_8
@ -75,12 +69,6 @@ class TestRequire < Test::Unit::TestCase
assert_require_nonascii_path(encoding, bug8676) assert_require_nonascii_path(encoding, bug8676)
end end
def test_require_insecure_path_utf8
encoding = Encoding::UTF_8
return if Encoding.find('filesystem') == encoding
assert_require_insecure_path(nil, encoding)
end
def test_require_nonascii_path_shift_jis def test_require_nonascii_path_shift_jis
bug8676 = '[ruby-core:56136] [Bug #8676]' bug8676 = '[ruby-core:56136] [Bug #8676]'
encoding = Encoding::Shift_JIS encoding = Encoding::Shift_JIS
@ -88,12 +76,6 @@ class TestRequire < Test::Unit::TestCase
assert_require_nonascii_path(encoding, bug8676) assert_require_nonascii_path(encoding, bug8676)
end end
def test_require_insecure_path_shift_jis
encoding = Encoding::Shift_JIS
return if Encoding.find('filesystem') == encoding
assert_require_insecure_path(nil, encoding)
end
case RUBY_PLATFORM case RUBY_PLATFORM
when /cygwin/, /mswin/, /mingw/, /darwin/ when /cygwin/, /mswin/, /mingw/, /darwin/
def self.ospath_encoding(path) def self.ospath_encoding(path)
@ -105,18 +87,6 @@ class TestRequire < Test::Unit::TestCase
end end
end end
SECURITY_WARNING =
if /mswin|mingw/ =~ RUBY_PLATFORM
nil
else
proc do |require_path|
$SAFE = 1
require(require_path)
ensure
$SAFE = 0
end
end
def prepare_require_path(dir, encoding) def prepare_require_path(dir, encoding)
Dir.mktmpdir {|tmp| Dir.mktmpdir {|tmp|
begin begin
@ -153,31 +123,6 @@ class TestRequire < Test::Unit::TestCase
} }
end end
def assert_require_insecure_path(dirname, encoding = nil)
return unless SECURITY_WARNING
dirname ||= "\u3042" * 5
encoding ||= dirname.encoding
prepare_require_path(dirname, encoding) {|require_path|
require_path.untaint
require(require_path)
$".pop
File.chmod(0777, File.dirname(require_path))
require_path.encode('filesystem') rescue
require_path.encode(self.class.ospath_encoding(require_path))
e = nil
stderr = EnvUtil.verbose_warning do
e = assert_raise(SecurityError) do
SECURITY_WARNING.call(require_path)
end
end
assert_include(e.message, "loading from unsafe path")
assert_include(stderr, "Insecure world writable dir")
require_path = require_path.encode(self.class.ospath_encoding(require_path))
assert_include(e.message, require_path)
assert_include(stderr, File.dirname(require_path))
}
end
def test_require_path_home_1 def test_require_path_home_1
env_rubypath, env_home = ENV["RUBYPATH"], ENV["HOME"] env_rubypath, env_home = ENV["RUBYPATH"], ENV["HOME"]
pathname_too_long = /pathname too long \(ignored\).*\(LoadError\)/m pathname_too_long = /pathname too long \(ignored\).*\(LoadError\)/m