correctly install default ssl socket factory when no key or trust store #13589
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #13589 +/- ##
============================================
+ Coverage 61.75% 62.08% +0.32%
+ Complexity 207 198 -9
============================================
Files 2436 2558 +122
Lines 133233 140972 +7739
Branches 20636 21869 +1233
============================================
+ Hits 82274 87516 +5242
- Misses 44911 46830 +1919
- Partials 6048 6626 +578
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
zhtaoxiang
commented
Jul 12, 2024
| @@ -0,0 +1,367 @@ | |||
| /** | |||
There was a problem hiding this comment.
note to reviewers: there is no logic change, just rename the file name
xiangfu0
approved these changes
Jul 14, 2024
xiangfu0
reviewed
Jul 14, 2024
| if (keyStorePath == null && trustStorePath == null) { | ||
| // When neither keyStorePath nor trustStorePath is provided, a SSLFactory cannot be created. create SSLContext | ||
| // directly and use the default key manager and trust manager. | ||
| sc = SSLContext.getInstance(SSL_CONTEXT_PROTOCOL); |
There was a problem hiding this comment.
Is this guaranteed to be not null?
There was a problem hiding this comment.
Yes, the protocol SSL is valid, so SSLContext.getInstance(SSL_CONTEXT_PROTOCOL) is guaranteed to be not null
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.
When changing the ssl context to be swappable, the logic of installing default ssl socket factory when no key or trust store was broken. Specifically, we can install default ssl socket factory when no key or trust store before changing the ssl context to be swappable, but cannot do it any more after the change.
This PR fixes the issue.