Convert built-in hosts to unambiguous domain names #1104
Merged
Conversation
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
jandubois
requested changes
Oct 14, 2022
Nino-K
force-pushed
the
fix-unambiguous-host-to-ip
branch
3 times, most recently
from
94bb788 to
c47eb28
Compare
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
Nino-K
force-pushed
the
fix-unambiguous-host-to-ip
branch
from
c47eb28 to
7c79a59
Compare
jandubois
requested changes
Oct 14, 2022
pkg/hostagent/dns/dns.go
Outdated
| @@ -132,10 +131,11 @@ func NewHandler(opts HandlerOptions) (dns.Handler, error) { | |||
| hostToIP: make(map[string]net.IP), | |||
| } | |||
| for host, address := range opts.StaticHosts { | |||
| fqdn := cname(host) | |||
There was a problem hiding this comment.
Suggested change
| fqdn := cname(host) | |
| cname := dns.CanonicalName(host) |
pkg/hostagent/dns/dns.go
Outdated
| if ip := net.ParseIP(address); ip != nil { | ||
| h.hostToIP[host] = ip | ||
| h.hostToIP[fqdn] = ip |
There was a problem hiding this comment.
Suggested change
| h.hostToIP[fqdn] = ip | |
| h.hostToIP[cname] = ip |
pkg/hostagent/dns/dns.go
Outdated
| } else { | ||
| h.cnameToHost[host] = limayaml.Cname(address) | ||
| h.cnameToHost[fqdn] = cname(address) |
There was a problem hiding this comment.
Suggested change
| h.cnameToHost[fqdn] = cname(address) | |
| h.cnameToHost[cname] = dns.CanonicalName(address) |
pkg/hostagent/dns/dns.go
Outdated
Comment on lines
403
to
410
|
|
||
| func cname(host string) string { | ||
| host = strings.ToLower(host) | ||
| if !strings.HasSuffix(host, ".") { | ||
| host += "." | ||
| } | ||
| return host | ||
| } |
There was a problem hiding this comment.
Suggested change
| func cname(host string) string { | |
| host = strings.ToLower(host) | |
| if !strings.HasSuffix(host, ".") { | |
| host += "." | |
| } | |
| return host | |
| } |
Nino-K
force-pushed
the
fix-unambiguous-host-to-ip
branch
from
7c79a59 to
d34b86e
Compare
jandubois
requested changes
Oct 17, 2022
- Adds test cases for A records and Cnames - Move cname conversion out of yaml into dns package Signed-off-by: Nino Kodabande <nkodabande@suse.com>
Nino-K
force-pushed
the
fix-unambiguous-host-to-ip
branch
from
d34b86e to
e78d91d
Compare
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.
This change ensures that user-defined host names are converted correctly to unambiguous domain names. Regardless if the user declares them as fully qualified or not we always convert them to fully qualified.
Addresses: rancher-sandbox/rancher-desktop#3163
Signed-off-by: Nino Kodabande nkodabande@suse.com