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.

Sign up for GitHub

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

Jump to bottom

(PUP-11935) Update JRuby in tests to 9.3.y.z #9087

Merged
merged 2 commits into from
Sep 16, 2023
Merged

(PUP-11935) Update JRuby in tests to 9.3.y.z #9087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fcd7c7
(PUP-11935) Update JRuby in tests to 9.3.y.z
mhashizume Jul 12, 2023
760ec82
(PUP-11935) Handle JRuby OpenSSL behavior
mhashizume Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rspec_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- {os: ubuntu-latest, ruby: '2.6'}
- {os: ubuntu-latest, ruby: '2.7'}
- {os: ubuntu-latest, ruby: '3.0'}
- {os: ubuntu-latest, ruby: 'jruby-9.2.21.0'}
- {os: ubuntu-latest, ruby: 'jruby-9.3.9.0'}
- {os: windows-2019, ruby: '2.5'}
- {os: windows-2019, ruby: '2.6'}
- {os: windows-2019, ruby: '2.7'}
Expand Down
17 changes: 17 additions & 0 deletions spec/unit/ssl/certificate_signer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
require 'spec_helper'

describe Puppet::SSL::CertificateSigner do
include PuppetSpec::Files

let(:wrong_key) { OpenSSL::PKey::RSA.new(512) }
let(:client_cert) { cert_fixture('signed.pem') }

# jruby-openssl >= 0.13.0 (JRuby >= 9.3.5.0) raises an error when signing a
# certificate when there is a discrepancy between the certificate and key.
it 'raises if client cert signature is invalid', if: Puppet::Util::Platform.jruby? && RUBY_VERSION.to_f >= 2.6 do
expect {
client_cert.sign(wrong_key, OpenSSL::Digest::SHA256.new)
}.to raise_error(OpenSSL::X509::CertificateError,
'invalid public key data')
end
end
4 changes: 2 additions & 2 deletions spec/unit/ssl/ssl_provider_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
).to eq(['CN=signed', 'CN=Test CA Subauthority', 'CN=Test CA'])
end

it 'raises if client cert signature is invalid' do
it 'raises if client cert signature is invalid', unless: Puppet::Util::Platform.jruby? && RUBY_VERSION.to_f >= 2.6 do
client_cert.sign(wrong_key, OpenSSL::Digest::SHA256.new)
expect {
subject.create_context(**config.merge(client_cert: client_cert))
Expand Down Expand Up @@ -337,7 +337,7 @@
end
end

it 'raises if intermediate CA signature is invalid' do
it 'raises if intermediate CA signature is invalid', unless: Puppet::Util::Platform.jruby? && RUBY_VERSION.to_f >= 2.6 do
int = global_cacerts.last
int.sign(wrong_key, OpenSSL::Digest::SHA256.new)

Expand Down