rubygems
/
puma
1
0
Fork 0
Code Packages Releases Activity

[jruby] allow truststore without password (#2904)

This commit is contained in:
Karol Bucek 2022-08-27 22:18:24 +02:00 committed by GitHub
parent 4bea6967a7
commit dbf450bdd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
examples/puma/client-certs/ca_store.jks Normal file
View File

Binary file not shown.

7
ext/puma_http11/org/jruby/puma/MiniSSL.java
View File

@ -160,7 +160,12 @@ public class MiniSSL extends RubyObject { // MiniSSL::Engine
truststoreType = keystoreType;
} else if (!isDefaultSymbol(context, truststore)) {
truststoreFile = truststore.convertToString().asJavaString();
truststorePass = asStringValue(miniSSLContext.callMethod(context, "truststore_pass"), null).toCharArray();
IRubyObject pass = miniSSLContext.callMethod(context, "truststore_pass");
if (pass.isNil()) {
truststorePass = null;
} else {
truststorePass = asStringValue(pass, null).toCharArray();
}
truststoreType = asStringValue(miniSSLContext.callMethod(context, "truststore_type"), KeyStore::getDefaultType);
} else { // self.truststore = :default
truststoreFile = null;

19
test/test_puma_server_ssl.rb
View File

@ -489,6 +489,25 @@ class TestPumaServerSSLClient < Minitest::Test
end
end if Puma.jruby?
def test_verify_client_cert_with_truststore_without_pass
ctx = Puma::MiniSSL::Context.new
ctx.keystore = "#{CERT_PATH}/server.p12"
ctx.keystore_type = 'pkcs12'
ctx.keystore_pass = 'jruby_puma'
ctx.truststore = "#{CERT_PATH}/ca_store.jks" # cert entry can be read without password
ctx.truststore_type = 'jks'
ctx.verify_mode = Puma::MiniSSL::VERIFY_PEER
assert_ssl_client_error_match(false, context: ctx) do |http|
key = "#{CERT_PATH}/client.key"
crt = "#{CERT_PATH}/client.crt"
http.key = OpenSSL::PKey::RSA.new File.read(key)
http.cert = OpenSSL::X509::Certificate.new File.read(crt)
http.ca_file = "#{CERT_PATH}/ca.crt"
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
end
end if Puma.jruby?
end if ::Puma::HAS_SSL
class TestPumaServerSSLWithCertPemAndKeyPem < Minitest::Test