- Notifications
You must be signed in to change notification settings - Fork1k
chore: add a dns.OSConfigurator implementation that uses the CoderVPN protocol#15342
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
2 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
5 changes: 5 additions & 0 deletionstailnet/conn.go
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
58 changes: 58 additions & 0 deletionsvpn/dns.go
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package vpn | ||
| import "tailscale.com/net/dns" | ||
| func NewDNSConfigurator(t *Tunnel) dns.OSConfigurator { | ||
| return &dnsManager{tunnel: t} | ||
| } | ||
| type dnsManager struct { | ||
| tunnel *Tunnel | ||
| } | ||
| func (v *dnsManager) SetDNS(cfg dns.OSConfig) error { | ||
| settings := convertDNSConfig(cfg) | ||
| return v.tunnel.ApplyNetworkSettings(v.tunnel.ctx, &NetworkSettingsRequest{ | ||
| DnsSettings: settings, | ||
| }) | ||
| } | ||
| func (*dnsManager) GetBaseConfig() (dns.OSConfig, error) { | ||
| // Tailscale calls this function to blend the OS's DNS configuration with | ||
| // it's own, so this is only called if `SupportsSplitDNS` returns false. | ||
| return dns.OSConfig{}, dns.ErrGetBaseConfigNotSupported | ||
| } | ||
| func (*dnsManager) SupportsSplitDNS() bool { | ||
| // macOS & Windows 10+ support split DNS, so we'll assume all CoderVPN | ||
| // clients do too. | ||
| return true | ||
| } | ||
| // Close implements dns.OSConfigurator. | ||
| func (*dnsManager) Close() error { | ||
| // There's no cleanup that we need to initiate from within the dylib. | ||
| return nil | ||
| } | ||
| func convertDNSConfig(cfg dns.OSConfig) *NetworkSettingsRequest_DNSSettings { | ||
| servers := make([]string, 0, len(cfg.Nameservers)) | ||
| for _, ns := range cfg.Nameservers { | ||
| servers = append(servers, ns.String()) | ||
| } | ||
| searchDomains := make([]string, 0, len(cfg.SearchDomains)) | ||
| for _, domain := range cfg.SearchDomains { | ||
| searchDomains = append(searchDomains, domain.WithoutTrailingDot()) | ||
| } | ||
| matchDomains := make([]string, 0, len(cfg.MatchDomains)) | ||
| for _, domain := range cfg.MatchDomains { | ||
| matchDomains = append(matchDomains, domain.WithoutTrailingDot()) | ||
| } | ||
| return &NetworkSettingsRequest_DNSSettings{ | ||
| Servers: servers, | ||
| SearchDomains: searchDomains, | ||
| DomainName: "coder", | ||
| MatchDomains: matchDomains, | ||
| MatchDomainsNoSearch: false, | ||
| } | ||
| } |
73 changes: 73 additions & 0 deletionsvpn/dns_internal_test.go
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package vpn | ||
| import ( | ||
| "net/netip" | ||
| "testing" | ||
| "github.com/stretchr/testify/require" | ||
| "tailscale.com/net/dns" | ||
| "tailscale.com/util/dnsname" | ||
| ) | ||
| func TestConvertDNSConfig(t *testing.T) { | ||
| t.Parallel() | ||
| tests := []struct { | ||
| name string | ||
| input dns.OSConfig | ||
| expected *NetworkSettingsRequest_DNSSettings | ||
| }{ | ||
| { | ||
| name: "Basic", | ||
| input: dns.OSConfig{ | ||
| Nameservers: []netip.Addr{ | ||
| netip.MustParseAddr("1.1.1.1"), | ||
| netip.MustParseAddr("8.8.8.8"), | ||
| }, | ||
| SearchDomains: []dnsname.FQDN{ | ||
| "example.com.", | ||
| "test.local.", | ||
| }, | ||
| MatchDomains: []dnsname.FQDN{ | ||
| "internal.domain.", | ||
| }, | ||
| }, | ||
| expected: &NetworkSettingsRequest_DNSSettings{ | ||
| Servers: []string{"1.1.1.1", "8.8.8.8"}, | ||
| SearchDomains: []string{"example.com", "test.local"}, | ||
| DomainName: "coder", | ||
| MatchDomains: []string{"internal.domain"}, | ||
| MatchDomainsNoSearch: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Empty", | ||
| input: dns.OSConfig{ | ||
| Nameservers: []netip.Addr{}, | ||
| SearchDomains: []dnsname.FQDN{}, | ||
| MatchDomains: []dnsname.FQDN{}, | ||
| }, | ||
| expected: &NetworkSettingsRequest_DNSSettings{ | ||
| Servers: []string{}, | ||
| SearchDomains: []string{}, | ||
| DomainName: "coder", | ||
| MatchDomains: []string{}, | ||
| MatchDomainsNoSearch: false, | ||
| }, | ||
| }, | ||
| } | ||
| //nolint:paralleltest // outdated rule | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| t.Parallel() | ||
| result := convertDNSConfig(tt.input) | ||
| require.Equal(t, tt.expected.Servers, result.Servers) | ||
| require.Equal(t, tt.expected.SearchDomains, result.SearchDomains) | ||
| require.Equal(t, tt.expected.DomainName, result.DomainName) | ||
| require.Equal(t, tt.expected.MatchDomains, result.MatchDomains) | ||
| require.Equal(t, tt.expected.MatchDomainsNoSearch, result.MatchDomainsNoSearch) | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.