Ensure TXT RRs always end up in the Additional section except for ANY or TXT queries #4362
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 9, 2018
agent/dns.go
Outdated
| @@ -620,7 +628,7 @@ func encodeKVasRFC1464(key, value string) (txt string) { | |||
| } | |||
|
|
|||
| // formatNodeRecord takes a Node and returns an A, AAAA, TXT or CNAME record | |||
| func (d *DNSServer) formatNodeRecord(node *structs.Node, addr, qName string, qType uint16, ttl time.Duration, edns, answer bool) (records []dns.RR) { | |||
| func (d *DNSServer) formatNodeRecord(node *structs.Node, addr, qName string, qType uint16, ttl time.Duration, edns bool) (records []dns.RR, meta []dns.RR) { | |||
There was a problem hiding this comment.
nit: you don't need to repeat the type if it's the same, It's idiomatic to write that as records, meta []dns.RR
agent/dns.go
Outdated
| @@ -620,7 +628,7 @@ func encodeKVasRFC1464(key, value string) (txt string) { | |||
| } | |||
|
|
|||
| // formatNodeRecord takes a Node and returns an A, AAAA, TXT or CNAME record | |||
There was a problem hiding this comment.
nit: I'd update the doc comment to describe the semantics of the two returned slices.
… or TXT queries This also changes where the enforcement of the enable_additional_node_meta_txt configuration gets applied. formatNodeRecord returns the main RRs and the meta/TXT RRs in separate slices. Its then up to the caller to add to the appropriate sections or not.
|
Ran full suite: 3 tests failed. Ran those tests individually and they passed. So all tests CAN pass. |
banks
approved these changes
Jul 9, 2018
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 #4354
This also changes where the enforcement of the enable_additional_node_meta_txt configuration gets applied.
formatNodeRecord returns the main RRs and the meta/TXT RRs in separate slices. Its then up to the caller to add to the appropriate sections or not.