rubygems-update 3.0.3 → 3.4.7

data/test/rubygems/test_gem_package_old.rb

@@ -1,89 +1,90 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/simple_gem'
+require_relative "helper"
 
-class TestGemPackageOld < Gem::TestCase
+unless Gem.java_platform? # jruby can't require the simple_gem file
+  require "rubygems/simple_gem"
 
-  def setup
-    super
+  class TestGemPackageOld < Gem::TestCase
+    def setup
+      super
 
-    File.open 'old_format.gem', 'wb' do |io|
-      io.write SIMPLE_GEM
-    end
+      File.open "old_format.gem", "wb" do |io|
+        io.write SIMPLE_GEM
+      end
 
-    @package = Gem::Package::Old.new 'old_format.gem'
-    @destination = File.join @tempdir, 'extract'
+      @package = Gem::Package::Old.new "old_format.gem"
+      @destination = File.join @tempdir, "extract"
 
-    FileUtils.mkdir_p @destination
-  end
+      FileUtils.mkdir_p @destination
+    end
 
-  def test_contents
-    assert_equal %w[lib/foo.rb lib/test.rb lib/test/wow.rb], @package.contents
-  end
+    def test_contents
+      assert_equal %w[lib/foo.rb lib/test.rb lib/test/wow.rb], @package.contents
+    end
 
-  def test_contents_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_contents_security_policy
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+      @package.security_policy = Gem::Security::AlmostNoSecurity
 
-    assert_raises Gem::Security::Exception do
-      @package.contents
+      assert_raise Gem::Security::Exception do
+        @package.contents
+      end
     end
-  end
 
-  def test_extract_files
-    @package.extract_files @destination
+    def test_extract_files
+      @package.extract_files @destination
 
-    extracted = File.join @destination, 'lib/foo.rb'
-    assert_path_exists extracted
+      extracted = File.join @destination, "lib/foo.rb"
+      assert_path_exist extracted
 
-    mask = 0100644 & (~File.umask)
+      mask = 0100644 & (~File.umask)
 
-    assert_equal mask, File.stat(extracted).mode unless win_platform?
-  end
+      assert_equal mask, File.stat(extracted).mode unless win_platform?
+    end
 
-  def test_extract_files_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_extract_files_security_policy
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+      @package.security_policy = Gem::Security::AlmostNoSecurity
 
-    assert_raises Gem::Security::Exception do
-      @package.extract_files @destination
+      assert_raise Gem::Security::Exception do
+        @package.extract_files @destination
+      end
     end
-  end
 
-  def test_spec
-    assert_equal 'testing', @package.spec.name
-  end
+    def test_spec
+      assert_equal "testing", @package.spec.name
+    end
 
-  def test_spec_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_spec_security_policy
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+      @package.security_policy = Gem::Security::AlmostNoSecurity
 
-    assert_raises Gem::Security::Exception do
-      @package.spec
+      assert_raise Gem::Security::Exception do
+        @package.spec
+      end
     end
-  end
 
-  def test_verify
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_verify
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
-    assert @package.verify
+      assert @package.verify
 
-    @package.security_policy = Gem::Security::NoSecurity
+      @package.security_policy = Gem::Security::NoSecurity
 
-    assert @package.verify
+      assert @package.verify
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+      @package.security_policy = Gem::Security::AlmostNoSecurity
 
-    e = assert_raises Gem::Security::Exception do
-      @package.verify
-    end
+      e = assert_raise Gem::Security::Exception do
+        @package.verify
+      end
 
-    assert_equal 'old format gems do not contain signatures ' +
-                 'and cannot be verified',
-                 e.message
+      assert_equal "old format gems do not contain signatures " +
+                   "and cannot be verified",
+                   e.message
+    end
   end
-
 end

data/test/rubygems/test_gem_package_tar_header.rb

@@ -1,26 +1,25 @@
 # frozen_string_literal: true
-require 'rubygems/package/tar_test_case'
-require 'rubygems/package'
+require_relative "package/tar_test_case"
+require "rubygems/package"
 
 class TestGemPackageTarHeader < Gem::Package::TarTestCase
-
   def setup
     super
 
     header = {
-      :name     => 'x',
-      :mode     => 0644,
-      :uid      => 1000,
-      :gid      => 10000,
-      :size     => 100,
-      :mtime    => 12345,
-      :typeflag => '0',
-      :linkname => 'link',
-      :uname    => 'user',
-      :gname    => 'group',
+      :name => "x",
+      :mode => 0644,
+      :uid => 1000,
+      :gid => 10000,
+      :size => 100,
+      :mtime => 12345,
+      :typeflag => "0",
+      :linkname => "link",
+      :uname => "user",
+      :gname => "group",
       :devmajor => 1,
       :devminor => 2,
-      :prefix   => 'y',
+      :prefix => "y",
     }
 
     @tar_header = Gem::Package::TarHeader.new header
@@ -37,62 +36,62 @@ class TestGemPackageTarHeader < Gem::Package::TarTestCase
   end
 
   def test_initialize
-    assert_equal '',      @tar_header.checksum, 'checksum'
-    assert_equal 1,       @tar_header.devmajor, 'devmajor'
-    assert_equal 2,       @tar_header.devminor, 'devminor'
-    assert_equal 10000,   @tar_header.gid,      'gid'
-    assert_equal 'group', @tar_header.gname,    'gname'
-    assert_equal 'link',  @tar_header.linkname, 'linkname'
-    assert_equal 'ustar', @tar_header.magic,    'magic'
-    assert_equal 0644,    @tar_header.mode,     'mode'
-    assert_equal 12345,   @tar_header.mtime,    'mtime'
-    assert_equal 'x',     @tar_header.name,     'name'
-    assert_equal 'y',     @tar_header.prefix,   'prefix'
-    assert_equal 100,     @tar_header.size,     'size'
-    assert_equal '0',     @tar_header.typeflag, 'typeflag'
-    assert_equal 1000,    @tar_header.uid,      'uid'
-    assert_equal 'user',  @tar_header.uname,    'uname'
-    assert_equal '00',    @tar_header.version,  'version'
-
-    refute_empty @tar_header, 'empty'
+    assert_equal "",      @tar_header.checksum, "checksum"
+    assert_equal 1,       @tar_header.devmajor, "devmajor"
+    assert_equal 2,       @tar_header.devminor, "devminor"
+    assert_equal 10000,   @tar_header.gid,      "gid"
+    assert_equal "group", @tar_header.gname,    "gname"
+    assert_equal "link",  @tar_header.linkname, "linkname"
+    assert_equal "ustar", @tar_header.magic,    "magic"
+    assert_equal 0644,    @tar_header.mode,     "mode"
+    assert_equal 12345,   @tar_header.mtime,    "mtime"
+    assert_equal "x",     @tar_header.name,     "name"
+    assert_equal "y",     @tar_header.prefix,   "prefix"
+    assert_equal 100,     @tar_header.size,     "size"
+    assert_equal "0",     @tar_header.typeflag, "typeflag"
+    assert_equal 1000,    @tar_header.uid,      "uid"
+    assert_equal "user",  @tar_header.uname,    "uname"
+    assert_equal "00",    @tar_header.version,  "version"
+
+    refute_empty @tar_header, "empty"
   end
 
   def test_initialize_bad
-    assert_raises ArgumentError do
-      Gem::Package::TarHeader.new :name => '', :size => '', :mode => ''
+    assert_raise ArgumentError do
+      Gem::Package::TarHeader.new :name => "", :size => "", :mode => ""
     end
 
-    assert_raises ArgumentError do
-      Gem::Package::TarHeader.new :name => '', :size => '', :prefix => ''
+    assert_raise ArgumentError do
+      Gem::Package::TarHeader.new :name => "", :size => "", :prefix => ""
     end
 
-    assert_raises ArgumentError do
-      Gem::Package::TarHeader.new :name => '', :prefix => '', :mode => ''
+    assert_raise ArgumentError do
+      Gem::Package::TarHeader.new :name => "", :prefix => "", :mode => ""
     end
 
-    assert_raises ArgumentError do
-      Gem::Package::TarHeader.new :prefix => '', :size => '', :mode => ''
+    assert_raise ArgumentError do
+      Gem::Package::TarHeader.new :prefix => "", :size => "", :mode => ""
     end
   end
 
   def test_initialize_typeflag
     header = {
-      :mode     => '',
-      :name     => '',
-      :prefix   => '',
-      :size     => '',
-      :typeflag => '',
+      :mode => "",
+      :name => "",
+      :prefix => "",
+      :size => "",
+      :typeflag => "",
     }
 
     tar_header = Gem::Package::TarHeader.new header
 
-    assert_equal '0', tar_header.typeflag
+    assert_equal "0", tar_header.typeflag
   end
 
   def test_empty_eh
     refute_empty @tar_header
 
-    @tar_header = Gem::Package::TarHeader.new :name => 'x', :prefix => '',
+    @tar_header = Gem::Package::TarHeader.new :name => "x", :prefix => "",
                                               :mode => 0, :size => 0,
                                               :empty => true
 
@@ -136,11 +135,11 @@ group\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000
   end
 
   def test_update_checksum
-    assert_equal '', @tar_header.checksum
+    assert_equal "", @tar_header.checksum
 
     @tar_header.update_checksum
 
-    assert_equal '012467', @tar_header.checksum
+    assert_equal "012467", @tar_header.checksum
   end
 
   def test_from_bad_octal
@@ -157,11 +156,70 @@ group\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000
       # overwrite the size field
       header_s[124, 12] = val
       io = TempIO.new header_s
-      assert_raises ArgumentError do
+      assert_raise ArgumentError do
         Gem::Package::TarHeader.from io
       end
       io.close!
     end
   end
 
+  def test_big_uid_gid
+    stream = StringIO.new(
+      <<-EOF.dup.force_encoding("binary").split("\n").join
+GeoIP2-City_20190528/
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x000000755\x00\x80\x00
+\x00\x00v\xB2Z\x9E\x80\x00\x00\x00v\xB2Z\x9E00000000000\x0013473270100\x00015424
+\x00 5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00ustar  \x00
+tjmather\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00tjmather\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00
+      EOF
+    )
+
+    tar_header = Gem::Package::TarHeader.from stream
+
+    assert_equal 1991400094, tar_header.uid
+    assert_equal 1991400094, tar_header.gid
+
+    assert_equal "GeoIP2-City_20190528/", tar_header.name
+    assert_equal 0755, tar_header.mode
+    assert_equal 0, tar_header.size
+    assert_equal 1559064640, tar_header.mtime
+    assert_equal 6932, tar_header.checksum
+  end
+
+  def test_spaces_in_headers
+    stream = StringIO.new(
+      <<-EOF.dup.force_encoding("binary").split("\n").join
+Access_Points_09202018.csv
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
+\x00\x00100777 \x00     0 \x00     0 \x00       4357 13545040367  104501
+\x000
+      EOF
+    )
+
+    tar_header = Gem::Package::TarHeader.from stream
+
+    assert_equal 0, tar_header.uid
+    assert_equal 0, tar_header.gid
+  end
 end

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/package/tar_test_case'
-require 'rubygems/package'
+require_relative "package/tar_test_case"
+require "rubygems/package"
 
 class TestGemPackageTarReader < Gem::Package::TarTestCase
-
   def test_each_entry
     tar = tar_dir_header "foo", "bar", 0, Time.now
     tar << tar_file_header("bar", "baz", 0, 0, Time.now)
@@ -26,11 +25,11 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
   end
 
   def test_rewind
-    content = ('a'..'z').to_a.join(" ")
+    content = ("a".."z").to_a.join(" ")
 
     str =
       tar_file_header("lib/foo", "", 010644, content.size, Time.now) +
-        content + "\0" * (512 - content.size)
+      content + "\0" * (512 - content.size)
     str << "\0" * 1024
 
     io = TempIO.new(str)
@@ -57,10 +56,10 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
     io = TempIO.new tar
 
     Gem::Package::TarReader.new io do |tar_reader|
-      tar_reader.seek 'baz/bar' do |entry|
+      tar_reader.seek "baz/bar" do |entry|
         assert_kind_of Gem::Package::TarReader::Entry, entry
 
-        assert_equal 'baz/bar', entry.full_name
+        assert_equal "baz/bar", entry.full_name
       end
 
       assert_equal 0, io.pos
@@ -76,8 +75,8 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
     io = TempIO.new tar
 
     Gem::Package::TarReader.new io do |tar_reader|
-      tar_reader.seek 'nonexistent' do |entry|
-        flunk 'entry missing but entry-found block was run'
+      tar_reader.seek "nonexistent" do |entry|
+        flunk "entry missing but entry-found block was run"
       end
 
       assert_equal 0, io.pos
@@ -85,5 +84,4 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
   ensure
     io.close!
   end
-
 end

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
-require 'rubygems/package/tar_test_case'
-require 'rubygems/package'
+require_relative "package/tar_test_case"
+require "rubygems/package"
 
 class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
-
   def setup
     super
 
-    @contents = ('a'..'z').to_a.join * 100
+    @contents = ("a".."z").to_a.join * 100
 
     @tar = String.new
     @tar << tar_file_header("lib/foo", "", 0, @contents.size, Time.now)
@@ -43,20 +42,20 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     assert @entry.bytes_read
 
-    e = assert_raises IOError do @entry.eof? end
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    e = assert_raise(IOError) { @entry.eof? }
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
-    e = assert_raises IOError do @entry.getc end
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    e = assert_raise(IOError) { @entry.getc }
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
-    e = assert_raises IOError do @entry.pos end
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    e = assert_raise(IOError) { @entry.pos }
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
-    e = assert_raises IOError do @entry.read end
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    e = assert_raise(IOError) { @entry.read }
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
-    e = assert_raises IOError do @entry.rewind end
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    e = assert_raise(IOError) { @entry.rewind }
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
   end
 
   def test_closed_eh
@@ -72,17 +71,18 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   end
 
   def test_full_name
-    assert_equal 'lib/foo', @entry.full_name
+    assert_equal "lib/foo", @entry.full_name
   end
 
   def test_full_name_null
+    pend "jruby strips the null byte and does not think it's corrupt" if Gem.java_platform?
     @entry.header.prefix << "\000"
 
-    e = assert_raises Gem::Package::TarInvalidError do
+    e = assert_raise Gem::Package::TarInvalidError do
       @entry.full_name
     end
 
-    assert_equal 'tar is corrupt, name contains null byte', e.message
+    assert_equal "tar is corrupt, name contains null byte", e.message
   end
 
   def test_getc
@@ -125,6 +125,18 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert_equal @contents, @entry.read
   end
 
+  def test_consecutive_read
+    expected = StringIO.new(@contents)
+    assert_equal expected.read, @entry.read
+    assert_equal expected.read, @entry.read
+  end
+
+  def test_consecutive_read_bytes_past_eof
+    expected = StringIO.new(@contents)
+    assert_equal expected.read, @entry.read
+    assert_equal expected.read(1), @entry.read(1)
+  end
+
   def test_read_big
     assert_equal @contents, @entry.read(@contents.size * 2)
   end
@@ -133,9 +145,24 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert_equal @contents[0...100], @entry.read(100)
   end
 
-  def test_readpartial
-    assert_raises(EOFError) do
-      @entry.read(@contents.size)
+  def test_read_remaining
+    @entry.read(100)
+    assert_equal @contents[100..-1], @entry.read
+  end
+
+  def test_read_partial
+    assert_equal @contents[0...100], @entry.readpartial(100)
+  end
+
+  def test_read_partial_buffer
+    buffer = "".b
+    @entry.readpartial(100, buffer)
+    assert_equal @contents[0...100], buffer
+  end
+
+  def test_readpartial_past_eof
+    @entry.readpartial(@contents.size)
+    assert_raise(EOFError) do
       @entry.readpartial(1)
     end
   end
@@ -150,4 +177,34 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert_equal char, @entry.getc
   end
 
+  def test_read_zero
+    expected = StringIO.new("")
+    assert_equal expected.read(0), @entry.read(0)
+  end
+
+  def test_readpartial_zero
+    expected = StringIO.new("")
+    assert_equal expected.readpartial(0), @entry.readpartial(0)
+  end
+
+  def util_zero_byte_entry
+    tar = String.new
+    tar << tar_file_header("lib/empty", "", 0, 0, Time.now)
+    tar << "\0" * (512 - (tar.size % 512))
+    util_entry tar
+  end
+
+  def test_zero_byte_file_read
+    zero_entry = util_zero_byte_entry
+    expected = StringIO.new("")
+
+    assert_equal expected.read, zero_entry.read
+  end
+
+  def test_zero_byte_file_readpartial
+    zero_entry = util_zero_byte_entry
+    expected = StringIO.new("")
+
+    assert_equal expected.readpartial(0), zero_entry.readpartial(0)
+  end
 end