auto-encrypt: Fix port resolution and fallback to default port #6205
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
banks
approved these changes
Jul 24, 2019
| } | ||
|
|
||
| // If TCP didn't yield anything then use the normal Go resolver which | ||
| // will try UDP, then might possibly try TCP again if the UDP response | ||
| // indicates it was truncated. | ||
| return net.LookupIP(host) | ||
| ips, err := net.LookupIP(host) |
There was a problem hiding this comment.
Heh not your code but the logic here seems odd - manually try TCP DNS first but then net.LookupIP will try it anyway if response is truncated? I guess in case TCP works and there are more IPs than fit in a UDP packet we save a UDP round trip first to discover that but that seems like a micro-optimization 😄.
Ah well. No point changing it in this PR.
|
Verified the fix works on AWS, merging. |
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.
Fixes: #6098
Auto-encrypt meant to fallback to the default port when it wasn't provided, but it hadn't been because of an issue with the error handling. We were checking against an incomplete error value here:
consul/agent/consul/auto_encrypt.go
Line 119 in d86efb8
"missing port in address"vs"address $HOST: missing port in address", as set here.Additionally, all RPCs to
AutoEncrypt.Signwere usinga.config.ServerPort, so those were updated to use ports resolved byresolveAddrs, if they are available.