Support -cert and -noCertificateCheck in WebSocket mode
#690
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
basil
added
the
enhancement
basil
commented
Oct 23, 2023
Comment on lines
+1063
to
+1066
| SSLContext sslContext = null; | ||
| if (noCertificateCheck) { | ||
| sslContext = SSLContext.getInstance("TLS"); | ||
| sslContext.init(null, new TrustManager[]{new NoCheckTrustManager()}, new SecureRandom()); | ||
| } else if (x509Certificates != null && !x509Certificates.isEmpty()) { |
There was a problem hiding this comment.
Moved from JnlpAgentEndpointResolver#openURLConnection to facilitate code reuse.
Comment on lines
-300
to
-301
| "-cert", | ||
| "-noCertificateCheck", |
There was a problem hiding this comment.
Removing these restrictions.
timja
approved these changes
Oct 24, 2023
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.
I couldn't see a good reason to support these in one transport but not the other, given that it is just a matter of plumbing through the relevant
SSLContextto the HTTP layer.Testing done
Set up a WebSocket agent against my controller with a self-signed HTTPS certificate. Verified the connection failed before this PR and passed after this PR when adding
-noCertificateCheck. I also tested that I could connect with HTTPS and-noCertificateCheckwithout WebSocket. I did not test-certbecause I don't actually have a valid certificate for my local testing environment. But this code is common code, so if it's plumbed through correctly in one case it should be plumbed through correctly in the other as well.