Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add GlobalSign Root CA - R3 cert and remove outdated certs #4100

Merged
merged 1 commit into from Dec 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Manifest.txt
Expand Up @@ -477,9 +477,7 @@ lib/rubygems/spec_fetcher.rb
lib/rubygems/specification.rb
lib/rubygems/specification_policy.rb
lib/rubygems/ssl_certs/.document
lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
lib/rubygems/stub_specification.rb
lib/rubygems/syck_hack.rb
lib/rubygems/test_case.rb
Expand Down
21 changes: 0 additions & 21 deletions lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem

This file was deleted.

21 changes: 21 additions & 0 deletions lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
@@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
WD9f
-----END CERTIFICATE-----
10 changes: 7 additions & 3 deletions test/rubygems/test_bundled_ca.rb
Expand Up @@ -46,11 +46,15 @@ def test_accessing_rubygems
assert_https('rubygems.org')
end

def test_accessing_fastly
assert_https('rubygems.global.ssl.fastly.net')
def test_accessing_www_rubygems
assert_https('www.rubygems.org')
end

def test_accessing_staging
assert_https('staging.rubygems.org')
end

def test_accessing_new_index
assert_https('fastly.rubygems.org')
assert_https('index.rubygems.org')
end
end if Gem::HAVE_OPENSSL
5 changes: 1 addition & 4 deletions util/update_bundled_ca_certificates.rb
Expand Up @@ -5,16 +5,13 @@

URIS = [
URI('https://rubygems.org'),
URI('https://www.rubygems.org'),
URI('https://index.rubygems.org'),
URI('https://staging.rubygems.org'),
URI('https://fastly.rubygems.org'),
URI('https://rubygems.global.ssl.fastly.net'),
].freeze

HOSTNAMES_TO_MAP = [
'rubygems.global.ssl.fastly.net',
'rubygems.org',
'index.rubygems.org',
].freeze

def connect_to(uri, store)
Expand Down