ruby-changes:55027
From: nagachika <ko1@a...>
Date: Wed, 13 Mar 2019 06:32:12 +0900 (JST)
Subject: [ruby-changes:55027] nagachika:r67234 (ruby_2_5): Merge RubyGems 2.7.6.1 patch [Bug #15637]
nagachika 2019-03-13 06:32:03 +0900 (Wed, 13 Mar 2019) New Revision: 67234 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67234 Log: Merge RubyGems 2.7.6.1 patch [Bug #15637] Modified files: branches/ruby_2_5/lib/rubygems/command_manager.rb branches/ruby_2_5/lib/rubygems/commands/owner_command.rb branches/ruby_2_5/lib/rubygems/gemcutter_utilities.rb branches/ruby_2_5/lib/rubygems/installer.rb branches/ruby_2_5/lib/rubygems/package.rb branches/ruby_2_5/lib/rubygems/user_interaction.rb branches/ruby_2_5/lib/rubygems.rb branches/ruby_2_5/test/rubygems/test_gem_installer.rb branches/ruby_2_5/test/rubygems/test_gem_package.rb branches/ruby_2_5/test/rubygems/test_gem_text.rb branches/ruby_2_5/version.h Index: ruby_2_5/test/rubygems/test_gem_text.rb =================================================================== --- ruby_2_5/test/rubygems/test_gem_text.rb (revision 67233) +++ ruby_2_5/test/rubygems/test_gem_text.rb (revision 67234) @@ -85,4 +85,9 @@ Without the wrapping, the text might not https://github.com/ruby/ruby/blob/trunk/ruby_2_5/test/rubygems/test_gem_text.rb#L85 s = "ab" * 500_001 assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000) end + + def test_clean_text + assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a") + end + end Index: ruby_2_5/test/rubygems/test_gem_package.rb =================================================================== --- ruby_2_5/test/rubygems/test_gem_package.rb (revision 67233) +++ ruby_2_5/test/rubygems/test_gem_package.rb (revision 67234) @@ -480,6 +480,42 @@ class TestGemPackage < Gem::Package::Tar https://github.com/ruby/ruby/blob/trunk/ruby_2_5/test/rubygems/test_gem_package.rb#L480 "#{destination_subdir} is not allowed", e.message) end + def test_extract_symlink_parent_doesnt_delete_user_dir + skip if RUBY_VERSION <= "1.8.7" + + package = Gem::Package.new @gem + + # Extract into a subdirectory of @destination; if this test fails it writes + # a file outside destination_subdir, but we want the file to remain inside + # @destination so it will be cleaned up. + destination_subdir = File.join @destination, 'subdir' + FileUtils.mkdir_p destination_subdir + + destination_user_dir = File.join @destination, 'user' + destination_user_subdir = File.join destination_user_dir, 'dir' + FileUtils.mkdir_p destination_user_subdir + + tgz_io = util_tar_gz do |tar| + tar.add_symlink 'link', destination_user_dir, 16877 + tar.add_symlink 'link/dir', '.', 16877 + end + + e = assert_raises(Gem::Package::PathError, Errno::EACCES) do + package.extract_tar_gz tgz_io, destination_subdir + end + + assert_path_exists destination_user_subdir + + if Gem::Package::PathError === e + assert_equal("installing into parent path #{destination_user_subdir} of " + + "#{destination_subdir} is not allowed", e.message) + elsif win_platform? + skip "symlink - must be admin with no UAC on Windows" + else + raise e + end + end + def test_extract_tar_gz_directory package = Gem::Package.new @gem Index: ruby_2_5/test/rubygems/test_gem_installer.rb =================================================================== --- ruby_2_5/test/rubygems/test_gem_installer.rb (revision 67233) +++ ruby_2_5/test/rubygems/test_gem_installer.rb (revision 67234) @@ -1474,6 +1474,114 @@ gem 'other', version https://github.com/ruby/ruby/blob/trunk/ruby_2_5/test/rubygems/test_gem_installer.rb#L1474 end end + def test_pre_install_checks_malicious_name_before_eval + spec = util_spec "malicious\n::Object.const_set(:FROM_EVAL, true)#", '1' + def spec.full_name # so the spec is buildable + "malicious-1" + end + def spec.validate(*args); end + + util_build_gem spec + + gem = File.join(@gemhome, 'cache', spec.file_name) + + use_ui @ui do + @installer = Gem::Installer.at gem + e = assert_raises Gem::InstallError do + @installer.pre_install_checks + end + assert_equal "#<Gem::Specification name=malicious\n::Object.const_set(:FROM_EVAL, true)# version=1> has an invalid name", e.message + end + refute defined?(::Object::FROM_EVAL) + end + + def test_pre_install_checks_malicious_require_paths_before_eval + spec = util_spec "malicious", '1' + def spec.full_name # so the spec is buildable + "malicious-1" + end + def spec.validate(*args); end + spec.require_paths = ["malicious\n``"] + + util_build_gem spec + + gem = File.join(@gemhome, 'cache', spec.file_name) + + use_ui @ui do + @installer = Gem::Installer.at gem + e = assert_raises Gem::InstallError do + @installer.pre_install_checks + end + assert_equal "#<Gem::Specification name=malicious version=1> has an invalid require_paths", e.message + end + end + + def test_pre_install_checks_malicious_extensions_before_eval + skip "mswin environment disallow to create file contained the carriage return code." if Gem.win_platform? + + spec = util_spec "malicious", '1' + def spec.full_name # so the spec is buildable + "malicious-1" + end + def spec.validate(*args); end + spec.extensions = ["malicious\n``"] + + util_build_gem spec + + gem = File.join(@gemhome, 'cache', spec.file_name) + + use_ui @ui do + @installer = Gem::Installer.at gem + e = assert_raises Gem::InstallError do + @installer.pre_install_checks + end + assert_equal "#<Gem::Specification name=malicious version=1> has an invalid extensions", e.message + end + end + + def test_pre_install_checks_malicious_specification_version_before_eval + spec = util_spec "malicious", '1' + def spec.full_name # so the spec is buildable + "malicious-1" + end + def spec.validate(*args); end + spec.specification_version = "malicious\n``" + + util_build_gem spec + + gem = File.join(@gemhome, 'cache', spec.file_name) + + use_ui @ui do + @installer = Gem::Installer.at gem + e = assert_raises Gem::InstallError do + @installer.pre_install_checks + end + assert_equal "#<Gem::Specification name=malicious version=1> has an invalid specification_version", e.message + end + end + + def test_pre_install_checks_malicious_dependencies_before_eval + spec = util_spec "malicious", '1' + def spec.full_name # so the spec is buildable + "malicious-1" + end + def spec.validate(*args); end + spec.add_dependency "b\nfoo", '> 5' + + util_build_gem spec + + gem = File.join(@gemhome, 'cache', spec.file_name) + + use_ui @ui do + @installer = Gem::Installer.at gem + @installer.ignore_dependencies = true + e = assert_raises Gem::InstallError do + @installer.pre_install_checks + end + assert_equal "#<Gem::Specification name=malicious version=1> has an invalid dependencies", e.message + end + end + def test_shebang util_make_exec @spec, "#!/usr/bin/ruby" Index: ruby_2_5/lib/rubygems/commands/owner_command.rb =================================================================== --- ruby_2_5/lib/rubygems/commands/owner_command.rb (revision 67233) +++ ruby_2_5/lib/rubygems/commands/owner_command.rb (revision 67234) @@ -2,8 +2,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/commands/owner_command.rb#L2 require 'rubygems/command' require 'rubygems/local_remote_options' require 'rubygems/gemcutter_utilities' +require 'rubygems/text' class Gem::Commands::OwnerCommand < Gem::Command + + include Gem::Text include Gem::LocalRemoteOptions include Gem::GemcutterUtilities @@ -64,7 +67,7 @@ permission to. https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/commands/owner_command.rb#L67 end with_response response do |resp| - owners = Gem::SafeYAML.load resp.body + owners = Gem::SafeYAML.load clean_text(resp.body) say "Owners for gem: #{name}" owners.each do |owner| Index: ruby_2_5/lib/rubygems/user_interaction.rb =================================================================== --- ruby_2_5/lib/rubygems/user_interaction.rb (revision 67233) +++ ruby_2_5/lib/rubygems/user_interaction.rb (revision 67234) @@ -6,6 +6,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/user_interaction.rb#L6 #++ require 'rubygems/util' +require 'rubygems/text' ## # Module that defines the default UserInteraction. Any class including this @@ -13,6 +14,8 @@ require 'rubygems/util' https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/user_interaction.rb#L14 module Gem::DefaultUserInteraction + include Gem::Text + ## # The default UI is a class variable of the singleton class for this # module. @@ -160,8 +163,8 @@ module Gem::UserInteraction https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/user_interaction.rb#L163 # Calls +say+ with +msg+ or the results of the block if really_verbose # is true. - def verbose msg = nil - say(msg || yield) if Gem.configuration.really_verbose + def verbose(msg = nil) + say(clean_text(msg || yield)) if Gem.configuration.really_verbose end end Index: ruby_2_5/lib/rubygems/package.rb =================================================================== --- ruby_2_5/lib/rubygems/package.rb (revision 67233) +++ ruby_2_5/lib/rubygems/package.rb (revision 67234) @@ -425,6 +425,16 @@ EOM https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/package.rb#L425 raise Gem::Package::PathError.new(destination, destination_dir) unless destination.start_with? destination_dir + '/' + begin + real_destination = File.expand_path(File.realpath(destination)) + rescue + # it's fine if the destination doesn't exist, because rm -rf'ing it can't cause any damage + nil + else + raise Gem::Package::PathError.new(real_destination, destination_dir) unless + real_destination.start_with? destination_dir + '/' + end + destination.untaint destination end Index: ruby_2_5/lib/rubygems/installer.rb =================================================================== --- ruby_2_5/lib/rubygems/installer.rb (revision 67233) +++ ruby_2_5/lib/rubygems/installer.rb (revision 67234) @@ -707,9 +707,26 @@ class Gem::Installer https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/installer.rb#L707 unpack or File.writable?(gem_home) end - def verify_spec_name - return if spec.name =~ Gem::Specification::VALID_NAME_PATTERN - raise Gem::InstallError, "#{spec} has an invalid name" + def verify_spec + unless spec.name =~ Gem::Specification::VALID_NAME_PATTERN + raise Gem::InstallError, "#{spec} has an invalid name" + end + + if spec.raw_require_paths.any?{|path| path =~ /\r\n|\r|\n/ } + raise Gem::InstallError, "#{spec} has an invalid require_paths" + end + + if spec.extensions.any?{|ext| ext =~ /\r\n|\r|\n/ } + raise Gem::InstallError, "#{spec} has an invalid extensions" + end + + unless spec.specification_version.to_s =~ /\A\d+\z/ + raise Gem::InstallError, "#{spec} has an invalid specification_version" + end + + if spec.dependencies.any? {|dep| dep.type =~ /\r\n|\r|\n/ || dep.name =~ /\r\n|\r|\n/ } + raise Gem::InstallError, "#{spec} has an invalid dependencies" + end end ## @@ -836,9 +853,11 @@ TEXT https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/installer.rb#L853 def pre_install_checks verify_gem_home options[:unpack] - ensure_loadable_spec + # The name and require_paths must be verified first, since it could contain + # ruby code that would be eval'ed in #ensure_loadable_spec + verify_spec - verify_spec_name + ensure_loadable_spec if options[:install_as_default] Gem.ensure_default_gem_subdirectories gem_home Index: ruby_2_5/lib/rubygems/command_manager.rb =================================================================== --- ruby_2_5/lib/rubygems/command_manager.rb (revision 67233) +++ ruby_2_5/lib/rubygems/command_manager.rb (revision 67234) @@ -7,6 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/command_manager.rb#L7 require 'rubygems/command' require 'rubygems/user_interaction' +require 'rubygems/text' ## # The command manager registers and installs all the individual sub-commands @@ -32,6 +33,7 @@ require 'rubygems/user_interaction' https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/command_manager.rb#L33 class Gem::CommandManager + include Gem::Text include Gem::UserInteraction BUILTIN_COMMANDS = [ # :nodoc: @@ -140,12 +142,12 @@ class Gem::CommandManager https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/command_manager.rb#L142 def run(args, build_args=nil) process_args(args, build_args) rescue StandardError, Timeout::Error => ex - alert_error "While executing gem ... (#{ex.class})\n #{ex}" + alert_error clean_text("While executing gem ... (#{ex.class})\n #{ex}") ui.backtrace ex terminate_interaction(1) rescue Interrupt - alert_error "Interrupted" + alert_error clean_text("Interrupted") terminate_interaction(1) end @@ -163,7 +165,7 @@ class Gem::CommandManager https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/command_manager.rb#L165 say Gem::VERSION terminate_interaction 0 when /^-/ then - alert_error "Invalid option: #{args.first}. See 'gem --help'." + alert_error clean_text("Invalid option: #{args.first}. See 'gem --help'.") terminate_interaction 1 else cmd_name = args.shift.downcase @@ -212,7 +214,7 @@ class Gem::CommandManager https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/command_manager.rb#L214 rescue Exception => e e = load_error if load_error - alert_error "Loading command: #{command_name} (#{e.class})\n\t#{e}" + alert_error clean_text("Loading command: #{command_name} (#{e.class})\n\t#{e}") ui.backtrace e end end Index: ruby_2_5/lib/rubygems/gemcutter_utilities.rb =================================================================== --- ruby_2_5/lib/rubygems/gemcutter_utilities.rb (revision 67233) +++ ruby_2_5/lib/rubygems/gemcutter_utilities.rb (revision 67234) @@ -1,11 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/gemcutter_utilities.rb#L1 # frozen_string_literal: true require 'rubygems/remote_fetcher' +require 'rubygems/text' ## # Utility methods for using the RubyGems API. module Gem::GemcutterUtilities + include Gem::Text + # TODO: move to Gem::Command OptionParser.accept Symbol do |value| value.to_sym @@ -145,13 +148,13 @@ module Gem::GemcutterUtilities https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems/gemcutter_utilities.rb#L148 if block_given? then yield response else - say response.body + say clean_text(response.body) end else message = response.body message = "#{error_prefix}: #{message}" if error_prefix - say message + say clean_text(message) terminate_interaction 1 # TODO: question this end end Index: ruby_2_5/lib/rubygems.rb =================================================================== --- ruby_2_5/lib/rubygems.rb (revision 67233) +++ ruby_2_5/lib/rubygems.rb (revision 67234) @@ -10,7 +10,7 @@ require 'rbconfig' https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/rubygems.rb#L10 require 'thread' module Gem - VERSION = "2.7.6" + VERSION = "2.7.6.1" end # Must be first since it unloads the prelude from 1.9.2 Index: ruby_2_5/version.h =================================================================== --- ruby_2_5/version.h (revision 67233) +++ ruby_2_5/version.h (revision 67234) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1 #define RUBY_VERSION "2.5.4" #define RUBY_RELEASE_DATE "2019-03-13" -#define RUBY_PATCHLEVEL 146 +#define RUBY_PATCHLEVEL 147 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/