-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
[jruby] support a truststore option #2849
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
which might be a completely different file than keystore ... due backwards compatibility we assume `truststore = keystore` (`truststore_pass = keystore_pass`)
nateberkopec
reviewed
Apr 2, 2022
nateberkopec
reviewed
Apr 2, 2022
nateberkopec
requested changes
Apr 2, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Concerned that test would be green on master - do we have a way of specifically testing a cert that would fail unless the trust store was set?
nateberkopec
added
waiting-for-review
Waiting on review from anyone
and removed
waiting-for-changes
Waiting on changes from the requestor
labels
Apr 6, 2022
Thanks @kares! |
kares
added a commit
to kares/puma
that referenced
this pull request
May 23, 2022
This was referenced May 23, 2022
MSP-Greg
pushed a commit
that referenced
this pull request
May 30, 2022
* [jruby] refactor - only keep peer cert around * [jruby] make miss an error not to be caught! * [test] follow-up proper testing of GH-2849 * [jruby] support truststore = :default * [jruby] sync dsl/context-builder with new props
MSP-Greg
added
ssl
jruby
and removed
waiting-for-review
Waiting on review from anyone
labels
Jun 1, 2022
7 tasks
Closed
JuanitoFatas
pushed a commit
to JuanitoFatas/puma
that referenced
this pull request
Sep 9, 2022
* [jruby] support a truststore option which might be a completely different file than keystore ... due backwards compatibility we assume `truststore = keystore` (`truststore_pass = keystore_pass`) * [jruby] actually use truststore on initialize * [jruby] add keystore_type and truststore_type * [jruby] dry and simplify native bits * [jruby] setup SSLError in native (like C part) * [jruby] map to SSLError from native exception * [jruby] provide peercert even if hand-shake fails
JuanitoFatas
pushed a commit
to JuanitoFatas/puma
that referenced
this pull request
Sep 9, 2022
* [jruby] refactor - only keep peer cert around * [jruby] make miss an error not to be caught! * [test] follow-up proper testing of pumaGH-2849 * [jruby] support truststore = :default * [jruby] sync dsl/context-builder with new props
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
which might be a completely different file than the keystore ...
due backwards compatibility we assume
truststore = keystore
(
truststore_pass = keystore_pass
)Description
Since the SSL implementations are different on MRI vs JRuby and the JRuby versions follows Java convention, in terms of using a keystore, this PR takes the convention used in Java one step further to have a separate trust-store (with trusted certificates) and key-store which is expected to hold the private key related material.
Your checklist for this pull request
[ci skip]
to the title of the PR.#issue
" to the PR description or my commit messages.