ruby-changes:58067
From: usa <ko1@a...>
Date: Tue, 1 Oct 2019 20:18:26 +0900 (JST)
Subject: [ruby-changes:58067] 3af01ae110 (ruby_2_5): lib/shell/command-processor.rb (Shell#[]): prevent unknown command
https://git.ruby-lang.org/ruby.git/commit/?id=3af01ae110 From 3af01ae1101e0b8815ae5a106be64b0e82a58640 Mon Sep 17 00:00:00 2001 From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Tue, 1 Oct 2019 11:01:53 +0000 Subject: lib/shell/command-processor.rb (Shell#[]): prevent unknown command `FileTest.send(command, ...)` allows to call not only FileTest-related methods but also any method that belongs to Kernel, Object, etc. patched by <mame@r...> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb index b52cb00..08ea5c8 100644 --- a/lib/shell/command-processor.rb +++ b/lib/shell/command-processor.rb @@ -180,6 +180,9 @@ class Shell https://github.com/ruby/ruby/blob/trunk/lib/shell/command-processor.rb#L180 top_level_test(command, file1) end else + unless FileTest.methods(false).include?(command.to_sym) + raise "unsupported command: #{ command }" + end if file2 FileTest.send(command, file1, file2) else diff --git a/test/shell/test_command_processor.rb b/test/shell/test_command_processor.rb index 06b5ecc..51e14b5 100644 --- a/test/shell/test_command_processor.rb +++ b/test/shell/test_command_processor.rb @@ -67,6 +67,24 @@ class TestShell::CommandProcessor < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/shell/test_command_processor.rb#L67 Dir.rmdir(path) end + def test_test + name = "foo#{exeext}" + path = File.join(@tmpdir, name) + open(path, "w", 0644) {} + + assert_equal(true, @shell[?e, path]) + assert_equal(true, @shell[:e, path]) + assert_equal(true, @shell["e", path]) + assert_equal(true, @shell[:exist?, path]) + assert_equal(true, @shell["exist?", path]) + assert_raise_with_message(RuntimeError, /unsupported command/) do + assert_equal(true, @shell[:instance_eval, path]) + end + ensure + Process.waitall + File.unlink(path) + end + def test_option_type name = 'foo.cmd' path = File.join(@tmpdir, name) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/