diff options
Diffstat (limited to 'ipn/ipnlocal/dnsconfig_test.go')
| -rw-r--r-- | ipn/ipnlocal/dnsconfig_test.go | 94 |
1 files changed, 1 insertions, 93 deletions
diff --git a/ipn/ipnlocal/dnsconfig_test.go b/ipn/ipnlocal/dnsconfig_test.go index 9d30029ff..1eacec354 100644 --- a/ipn/ipnlocal/dnsconfig_test.go +++ b/ipn/ipnlocal/dnsconfig_test.go @@ -10,14 +10,12 @@ import ( "reflect" "testing" - "tailscale.com/appc" "tailscale.com/ipn" "tailscale.com/net/dns" "tailscale.com/tailcfg" "tailscale.com/tstest" "tailscale.com/types/dnstype" "tailscale.com/types/netmap" - "tailscale.com/types/opt" "tailscale.com/util/cloudenv" "tailscale.com/util/dnsname" "tailscale.com/util/set" @@ -389,102 +387,12 @@ func TestDNSConfigForNetmap(t *testing.T) { prefs: &ipn.Prefs{}, want: &dns.Config{}, }, - { - name: "conn25-split-dns", - nm: &netmap.NetworkMap{ - SelfNode: (&tailcfg.Node{ - Name: "a", - Addresses: ipps("100.101.101.101"), - CapMap: tailcfg.NodeCapMap{ - tailcfg.NodeCapability(appc.AppConnectorsExperimentalAttrName): []tailcfg.RawMessage{ - tailcfg.RawMessage(`{"name":"app1","connectors":["tag:woo"],"domains":["example.com"]}`), - }, - }, - }).View(), - AllCaps: set.Of(tailcfg.NodeCapability(appc.AppConnectorsExperimentalAttrName)), - }, - peers: nodeViews([]*tailcfg.Node{ - { - ID: 1, - Name: "p1", - Addresses: ipps("100.102.0.1"), - Tags: []string{"tag:woo"}, - Hostinfo: (&tailcfg.Hostinfo{ - Services: []tailcfg.Service{ - { - Proto: tailcfg.PeerAPI4, - Port: 1234, - }, - }, - AppConnector: opt.NewBool(true), - }).View(), - }, - }), - prefs: &ipn.Prefs{ - CorpDNS: true, - }, - want: &dns.Config{ - AcceptDNS: true, - Hosts: map[dnsname.FQDN][]netip.Addr{ - "a.": ips("100.101.101.101"), - "p1.": ips("100.102.0.1"), - }, - Routes: map[dnsname.FQDN][]*dnstype.Resolver{ - dnsname.FQDN("example.com."): { - {Addr: "http://100.102.0.1:1234/dns-query"}, - }, - }, - }, - }, - { - name: "conn25-split-dns-no-matching-peers", - nm: &netmap.NetworkMap{ - SelfNode: (&tailcfg.Node{ - Name: "a", - Addresses: ipps("100.101.101.101"), - CapMap: tailcfg.NodeCapMap{ - tailcfg.NodeCapability(appc.AppConnectorsExperimentalAttrName): []tailcfg.RawMessage{ - tailcfg.RawMessage(`{"name":"app1","connectors":["tag:woo"],"domains":["example.com"]}`), - }, - }, - }).View(), - AllCaps: set.Of(tailcfg.NodeCapability(appc.AppConnectorsExperimentalAttrName)), - }, - peers: nodeViews([]*tailcfg.Node{ - { - ID: 1, - Name: "p1", - Addresses: ipps("100.102.0.1"), - Tags: []string{"tag:nomatch"}, - Hostinfo: (&tailcfg.Hostinfo{ - Services: []tailcfg.Service{ - { - Proto: tailcfg.PeerAPI4, - Port: 1234, - }, - }, - AppConnector: opt.NewBool(true), - }).View(), - }, - }), - prefs: &ipn.Prefs{ - CorpDNS: true, - }, - want: &dns.Config{ - AcceptDNS: true, - Routes: map[dnsname.FQDN][]*dnstype.Resolver{}, - Hosts: map[dnsname.FQDN][]netip.Addr{ - "a.": ips("100.101.101.101"), - "p1.": ips("100.102.0.1"), - }, - }, - }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { verOS := cmp.Or(tt.os, "linux") var log tstest.MemLogger - got := dnsConfigForNetmap(tt.nm, peersMap(tt.peers), tt.prefs.View(), tt.expired, log.Logf, verOS) + got := dnsConfigForNetmap(tt.nm, peersMap(tt.peers), tt.prefs.View(), tt.expired, log.Logf, verOS, nil) if !reflect.DeepEqual(got, tt.want) { gotj, _ := json.MarshalIndent(got, "", "\t") wantj, _ := json.MarshalIndent(tt.want, "", "\t") |