diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-08 01:32:18 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-08 01:32:18 +0000 |
commit | c00e84327f14845bd484e76b5ee5dfeb1fa9ce3d (patch) | |
tree | 9f558dafa363f4f0118d504a50cd4461e2821cd1 /test/rubygems/test_gem_security_policy.rb | |
parent | 6b05153a3a75b74b64553d6a46f501d9ee0f0376 (diff) |
Merge rubygems master.
This is RC version of Rubygems 2.7.0.
https://github.com/rubygems/rubygems/commit/688fb7e83c13c3fe7c2bb03c49a2db4c82852aee
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_security_policy.rb')
-rw-r--r-- | test/rubygems/test_gem_security_policy.rb | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb index bee0973f64..4108551dca 100644 --- a/test/rubygems/test_gem_security_policy.rb +++ b/test/rubygems/test_gem_security_policy.rb @@ -1,4 +1,4 @@ -# coding: UTF-8 +# coding: utf-8 # frozen_string_literal: true require 'rubygems/test_case' @@ -34,7 +34,7 @@ class TestGemSecurityPolicy < Gem::TestCase s.files = %w[lib/code.rb] end - @sha1 = OpenSSL::Digest::SHA1 + @digest = Gem::Security::DIGEST_ALGORITHM @trust_dir = Gem::Security.trust_dir.dir # HACK use the object @no = Gem::Security::NoSecurity @@ -69,7 +69,7 @@ class TestGemSecurityPolicy < Gem::TestCase signature = sign data - assert @almost_no.check_data(PUBLIC_KEY, @sha1, signature, data) + assert @almost_no.check_data(PUBLIC_KEY, @digest, signature, data) end def test_check_data_invalid @@ -80,7 +80,7 @@ class TestGemSecurityPolicy < Gem::TestCase invalid = digest 'hello!' e = assert_raises Gem::Security::Exception do - @almost_no.check_data PUBLIC_KEY, @sha1, signature, invalid + @almost_no.check_data PUBLIC_KEY, @digest, signature, invalid end assert_equal 'invalid signature', e.message @@ -238,18 +238,18 @@ class TestGemSecurityPolicy < Gem::TestCase def test_check_trust Gem::Security.trust_dir.trust_cert PUBLIC_CERT - assert @high.check_trust [PUBLIC_CERT], @sha1, @trust_dir + assert @high.check_trust [PUBLIC_CERT], @digest, @trust_dir end def test_check_trust_child Gem::Security.trust_dir.trust_cert PUBLIC_CERT - assert @high.check_trust [PUBLIC_CERT, CHILD_CERT], @sha1, @trust_dir + assert @high.check_trust [PUBLIC_CERT, CHILD_CERT], @digest, @trust_dir end def test_check_trust_empty_chain e = assert_raises Gem::Security::Exception do - @chain.check_trust [], @sha1, @trust_dir + @chain.check_trust [], @digest, @trust_dir end assert_equal 'missing root certificate', e.message @@ -259,7 +259,7 @@ class TestGemSecurityPolicy < Gem::TestCase Gem::Security.trust_dir.trust_cert PUBLIC_CERT e = assert_raises Gem::Security::Exception do - @high.check_trust [WRONG_KEY_CERT], @sha1, @trust_dir + @high.check_trust [WRONG_KEY_CERT], @digest, @trust_dir end assert_equal "trusted root certificate #{PUBLIC_CERT.subject} checksum " + @@ -268,7 +268,7 @@ class TestGemSecurityPolicy < Gem::TestCase def test_check_trust_no_chain e = assert_raises Gem::Security::Exception do - @chain.check_trust nil, @sha1, @trust_dir + @chain.check_trust nil, @digest, @trust_dir end assert_equal 'missing signing chain', e.message @@ -276,7 +276,7 @@ class TestGemSecurityPolicy < Gem::TestCase def test_check_trust_no_trust e = assert_raises Gem::Security::Exception do - @high.check_trust [PUBLIC_CERT], @sha1, @trust_dir + @high.check_trust [PUBLIC_CERT], @digest, @trust_dir end assert_equal "root cert #{PUBLIC_CERT.subject} is not trusted", e.message @@ -284,7 +284,7 @@ class TestGemSecurityPolicy < Gem::TestCase def test_check_trust_no_trust_child e = assert_raises Gem::Security::Exception do - @high.check_trust [PUBLIC_CERT, CHILD_CERT], @sha1, @trust_dir + @high.check_trust [PUBLIC_CERT, CHILD_CERT], @digest, @trust_dir end assert_equal "root cert #{PUBLIC_CERT.subject} is not trusted " + @@ -370,7 +370,7 @@ class TestGemSecurityPolicy < Gem::TestCase data = digest 'goodbye' - signatures[1] = PRIVATE_KEY.sign @sha1.new, data.digest + signatures[1] = PRIVATE_KEY.sign @digest.new, data.digest e = assert_raises Gem::Security::Exception do @almost_no.verify [PUBLIC_CERT], nil, digests, signatures @@ -453,17 +453,17 @@ class TestGemSecurityPolicy < Gem::TestCase metadata_gz = Gem.gzip @spec.to_yaml package = Gem::Package.new 'nonexistent.gem' - package.checksums['SHA1'] = {} + package.checksums[Gem::Security::DIGEST_NAME] = {} s = StringIO.new metadata_gz def s.full_name() 'metadata.gz' end digests = package.digest s - metadata_gz_digest = digests['SHA1']['metadata.gz'] + metadata_gz_digest = digests[Gem::Security::DIGEST_NAME]['metadata.gz'] signatures = {} signatures['metadata.gz'] = - PRIVATE_KEY.sign @sha1.new, metadata_gz_digest.digest + PRIVATE_KEY.sign @digest.new, metadata_gz_digest.digest assert @high.verify_signatures @spec, digests, signatures end @@ -476,19 +476,19 @@ class TestGemSecurityPolicy < Gem::TestCase metadata_gz = Gem.gzip @spec.to_yaml package = Gem::Package.new 'nonexistent.gem' - package.checksums['SHA1'] = {} + package.checksums[Gem::Security::DIGEST_NAME] = {} s = StringIO.new metadata_gz def s.full_name() 'metadata.gz' end digests = package.digest s - digests['SHA1']['data.tar.gz'] = OpenSSL::Digest.new 'SHA1', 'hello' + digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.new 'hello' - metadata_gz_digest = digests['SHA1']['metadata.gz'] + metadata_gz_digest = digests[Gem::Security::DIGEST_NAME]['metadata.gz'] signatures = {} signatures['metadata.gz'] = - PRIVATE_KEY.sign @sha1.new, metadata_gz_digest.digest + PRIVATE_KEY.sign @digest.new, metadata_gz_digest.digest e = assert_raises Gem::Security::Exception do @high.verify_signatures @spec, digests, signatures @@ -505,13 +505,13 @@ class TestGemSecurityPolicy < Gem::TestCase metadata_gz = Gem.gzip @spec.to_yaml package = Gem::Package.new 'nonexistent.gem' - package.checksums['SHA1'] = {} + package.checksums[Gem::Security::DIGEST_NAME] = {} s = StringIO.new metadata_gz def s.full_name() 'metadata.gz' end digests = package.digest s - digests['SHA1']['data.tar.gz'] = OpenSSL::Digest.new 'SHA1', 'hello' + digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.new 'hello' assert_raises Gem::Security::Exception do @high.verify_signatures @spec, digests, {} @@ -519,19 +519,19 @@ class TestGemSecurityPolicy < Gem::TestCase end def digest data - digester = @sha1.new + digester = @digest.new digester << data digester end def sign data, key = PRIVATE_KEY - key.sign @sha1.new, data.digest + key.sign @digest.new, data.digest end def dummy_signatures key = PRIVATE_KEY data = digest 'hello' - digests = { 'SHA1' => { 0 => data } } + digests = { Gem::Security::DIGEST_NAME => { 0 => data } } signatures = { 0 => sign(data, key) } return digests, signatures |