Fix for endpoint format string regression#42
Merged
Conversation
And additional unit test to catch it
alienzach
reviewed
Oct 1, 2020
| } | ||
| ssl = ep.startsWith("https://") | ||
| || (!ep.startsWith("http://") | ||
| && (certificate != null && clientCertificate != null)) |
Contributor
There was a problem hiding this comment.
TLS client cert sometime is not required? Client may use other credentials to authenticate themselves.
Contributor
Author
There was a problem hiding this comment.
Yes client-auth is optional (and it wasn't possible to provide explicit certs for that until the last release).
But yes there's also etcd-level auth i.e. username/password which were always supported independent of this.
Contributor
Author
There was a problem hiding this comment.
Sorry @alienzach, I had misunderstood your question. You're right, the && there should be ||, great catch! Now pushed fix.
alienzach
approved these changes
Oct 1, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Unfortunately there was a regression in the last release when using
EtcdClusterConfigwith an endpoint string that doesn't include ahttp://orhttps://prefix, and where TLS certs aren't provided. Per the prior behaviour this should imply plaintext connection but with the regression it attempts to use SSL.Includes additional unit test to catch it.