Don't use server_name config for RPC connections
#5394
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
hanshasselberg
commented
Feb 27, 2019
|
|
||
| if tlsConfig.ServerName == "" { | ||
| tlsConfig.ServerName = c.base.NodeName | ||
| InsecureSkipVerify: !c.base.VerifyServerHostname, |
There was a problem hiding this comment.
Since ServerName is not used here anymore, this only depends on VerifyServerHostname now.
hanshasselberg
commented
Feb 27, 2019
| tlsConfig.ServerName = c.base.ServerName | ||
| if tlsConfig.ServerName == "" { | ||
| tlsConfig.ServerName = c.base.NodeName | ||
| } |
There was a problem hiding this comment.
OutgoingTLSConfigForChecks is the only place where we allow setting it now. Even that I find questionable... But I don't want to change to many things at once.
hanshasselberg
commented
Feb 27, 2019
| require.Equal(t, tlsConf.ServerName, "consul.example.com") | ||
| require.False(t, tlsConf.InsecureSkipVerify) | ||
| require.Empty(t, tlsConf.ServerName) | ||
| require.True(t, tlsConf.InsecureSkipVerify) |
There was a problem hiding this comment.
I was thinking about this test, which I had to change to make it pass.
It is skipping the builtin check from golang tls, but we are still checking the cert chain. Since VerifyServerHostname is disabled, we do not check that. I think this is what we want.
mkeeler
approved these changes
Mar 1, 2019
4 tasks
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.
server_nameshouldn't be used for RPC connections. If it is hardcoded, it can never properly work in a multi dc setup, since for that it has to be dynamic to account for forwarding calls into other dcs. Fixes #5357.This PR contains a bunch of comment wrapping.