types/appctype: remove Conn25Attr type

This type was previously logically distinct from AppConnectorAttr
despite containing the same fields. It is now logically also the same,
so doesn't need to exist separately.

Fixes tailscale/corp#50897.

Signed-off-by: Naman Sood <[email protected]>
This commit is contained in:
Naman Sood authored and GitHub committed 2026-11-03 14:54:57 -05:00
1 parent 911d8f84a0
commit 07915ae481
5 files changed
+85 -82

No files matched your search

+5 -3
View File
@@ -33,7 +33,7 @@ func TestReserveIPs(t *testing.T) {
domainStr := "example.com."
cfg := &config{
isConfigured: true,
appsByName: map[string]appctype.Conn25Attr{appName: {}},
appsByName: map[string]appctype.AppConnectorAttr{appName: {}},
ipSets: ipSets{
v4Magic: mustIPSetFromPrefix("100.64.0.0/24"),
v6Magic: mustIPSetFromPrefix("fd7a:115c:a1e0:a99c:0100::/80"),
@@ -320,10 +320,11 @@ func TestReconfigDoesNotReissueInUseAddresses(t *testing.T) {
afterRangeV4 := mustRange("0.0.0.4", "0.0.0.7")
afterRangeV6 := mustRange("::4", "::7")
makeNodeFromMagicRange := func(v4, v6 netipx.IPRange) tailcfg.NodeView {
return makeSelfNode(t, []appctype.Conn25Attr{{
return makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: appName,
Connectors: []string{"tag:woo"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
}}, appctype.Conn25PoolsAttr{
V4MagicIPPool: []netipx.IPRange{v4},
V6MagicIPPool: []netipx.IPRange{v6},
@@ -391,10 +392,11 @@ func TestAddressExpiryDependsOnActiveFlows(t *testing.T) {
configuredDomain := "example.com"
domainName := configuredDomain + "."
dnsMessageName := dnsmessage.MustNewName(domainName)
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:woo"},
Domains: []string{configuredDomain},
Mode: appctype.MagicIP,
}}, arbitraryPools, nil)
var ttlSecs uint32 = 300
+9 -13
View File
@@ -404,7 +404,7 @@ func (c *Conn25) handleHookReplyToDNSQueries(h ipnlocal.PeerAPIHandler, r *http.
}
// Determine which app the query is for
var app appctype.Conn25Attr
var app appctype.AppConnectorAttr
if appName, hasApp := r.URL.Query()["app"]; !hasApp || len(appName) != 1 {
return false, nil
} else {
@@ -429,7 +429,7 @@ func (c *Conn25) handleHookReplyToDNSQueries(h ipnlocal.PeerAPIHandler, r *http.
return true, makeNameChecker(app)
}
func makeNameChecker(app appctype.Conn25Attr) ipnlocal.DNSNameFilter {
func makeNameChecker(app appctype.AppConnectorAttr) ipnlocal.DNSNameFilter {
// TODO(tailscale/corp#40076): optimize the comparison; if the func is
// generated when the app config is created, that will avoid allocating
// temporary instances. Some of the work (e.g. conversion to [dnsname.FQDN])
@@ -771,8 +771,8 @@ func emptyIPSets() ipSets {
// config is not safe for concurrent use.
type config struct {
isConfigured bool
apps []appctype.Conn25Attr
appsByName map[string]appctype.Conn25Attr
apps []appctype.AppConnectorAttr
appsByName map[string]appctype.AppConnectorAttr
appNamesByDomain map[dnsname.FQDN][]string
appNamesByWCDomain map[dnsname.FQDN][]string
selfAppNames set.Set[string]
@@ -786,14 +786,10 @@ func configFromNodeView(n tailcfg.NodeView) (*config, error) {
if err != nil {
return &config{}, err
}
var apps []appctype.Conn25Attr
var apps []appctype.AppConnectorAttr
for _, app := range unfilteredApps {
if app.Mode == appctype.MagicIP {
apps = append(apps, appctype.Conn25Attr{
Name: app.Name,
Domains: app.Domains,
Connectors: app.Connectors,
})
apps = append(apps, app)
}
}
if len(apps) == 0 {
@@ -811,7 +807,7 @@ func configFromNodeView(n tailcfg.NodeView) (*config, error) {
cfg := &config{
isConfigured: true,
apps: apps,
appsByName: map[string]appctype.Conn25Attr{},
appsByName: map[string]appctype.AppConnectorAttr{},
appNamesByDomain: map[dnsname.FQDN][]string{},
appNamesByWCDomain: map[dnsname.FQDN][]string{},
selfAppNames: set.Set[string]{},
@@ -965,7 +961,7 @@ func makePeerAPIReq(ctx context.Context, httpClient *http.Client, urlBase string
return nil
}
func (e *extension) pickConnectorURLBase(app appctype.Conn25Attr) string {
func (e *extension) pickConnectorURLBase(app appctype.AppConnectorAttr) string {
nb := e.host.NodeBackend()
peers := pickConnector(nb, app)
for _, p := range peers {
@@ -1362,7 +1358,7 @@ func sortByPreference(self tailcfg.NodeView, ns []tailcfg.NodeView) {
// pickConnector returns peers the backend knows about that match the app, in order of preference to use as
// a connector.
func pickConnector(nb ipnext.NodeBackend, app appctype.Conn25Attr) []tailcfg.NodeView {
func pickConnector(nb ipnext.NodeBackend, app appctype.AppConnectorAttr) []tailcfg.NodeView {
appTagsSet := set.SetOf(app.Connectors)
matches := nb.AppendMatchingPeers(nil, func(n tailcfg.NodeView) bool {
if !isPeerEligibleConnector(n) {
+69 -52
View File
@@ -585,9 +585,10 @@ func TestHandleConnectorTransitIPRequest(t *testing.T) {
c := newConn25(logger.Discard)
c.reconfig(&config{
isConfigured: true,
appsByName: map[string]appctype.Conn25Attr{
appsByName: map[string]appctype.AppConnectorAttr{
appName: {
Name: appName,
Mode: appctype.MagicIP,
},
},
ipSets: ipSets{
@@ -899,12 +900,12 @@ func TestConfigFromNodeView(t *testing.T) {
func TestGetAppsForDomainName(t *testing.T) {
defaultSN := makeSelfNode(
t,
[]appctype.Conn25Attr{
{Name: "one", Domains: []string{"*.example.com", "example.com"}, Connectors: []string{"tag:one"}},
{Name: "two", Domains: []string{"sub.example.com", "example.com"}, Connectors: []string{"tag:two"}},
{Name: "three", Domains: []string{"*.sub.example.com"}, Connectors: []string{"tag:three"}},
{Name: "four", Domains: []string{"a.sub.example.com"}, Connectors: []string{"tag:four"}},
{Name: "self-routed", Domains: []string{"*.wildcard.com", "exact-match.com"}, Connectors: []string{"tag:self-routed"}},
[]appctype.AppConnectorAttr{
{Name: "one", Domains: []string{"*.example.com", "example.com"}, Connectors: []string{"tag:one"}, Mode: appctype.MagicIP},
{Name: "two", Domains: []string{"sub.example.com", "example.com"}, Connectors: []string{"tag:two"}, Mode: appctype.MagicIP},
{Name: "three", Domains: []string{"*.sub.example.com"}, Connectors: []string{"tag:three"}, Mode: appctype.MagicIP},
{Name: "four", Domains: []string{"a.sub.example.com"}, Connectors: []string{"tag:four"}, Mode: appctype.MagicIP},
{Name: "self-routed", Domains: []string{"*.wildcard.com", "exact-match.com"}, Connectors: []string{"tag:self-routed"}, Mode: appctype.MagicIP},
},
appctype.Conn25PoolsAttr{},
[]string{"tag:self-routed"},
@@ -1000,16 +1001,11 @@ func TestGetAppsForDomainName(t *testing.T) {
}
}
func makeSelfNode(t *testing.T, attrs []appctype.Conn25Attr, pools appctype.Conn25PoolsAttr, tags []string) tailcfg.NodeView {
func makeSelfNode(t *testing.T, attrs []appctype.AppConnectorAttr, pools appctype.Conn25PoolsAttr, tags []string) tailcfg.NodeView {
t.Helper()
cfg := make([]tailcfg.RawMessage, 0, len(attrs))
for i, attr := range attrs {
bs, err := json.Marshal(appctype.AppConnectorAttr{
Name: attr.Name,
Domains: attr.Domains,
Connectors: attr.Connectors,
Mode: appctype.MagicIP,
})
bs, err := json.Marshal(attr)
if err != nil {
t.Fatalf("unexpected error in test setup at index %d: %v", i, err)
}
@@ -1499,10 +1495,11 @@ func TestMapDNSResponseAssignsAddrs(t *testing.T) {
} else {
dnsResp = makeV6DNSResponse(t, tt.domain, tt.v6Addrs)
}
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:woo"},
Domains: tt.appDomains,
Mode: appctype.MagicIP,
}}, arbitraryPools, tt.selfTags)
c := newConn25(logger.Discard)
@@ -1536,10 +1533,11 @@ func TestMapDNSResponseSetsExpiryBasedOnTTL(t *testing.T) {
configuredDomain := "example.com"
domainName := configuredDomain + "."
dnsMessageName := dnsmessage.MustNewName(domainName)
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:woo"},
Domains: []string{configuredDomain},
Mode: appctype.MagicIP,
}}, arbitraryPools, nil)
c := newConn25(logger.Discard)
@@ -1637,10 +1635,11 @@ func TestMapDNSResponsePreservesTTL(t *testing.T) {
configuredDomain := "example.com"
domainName := configuredDomain + "."
dnsMessageName := dnsmessage.MustNewName(domainName)
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:connector"},
Domains: []string{configuredDomain},
Mode: appctype.MagicIP,
}}, arbitraryPools, nil)
cfg := mustConfig(t, sn)
@@ -1951,10 +1950,11 @@ func TestAddressAssignmentIsHandled(t *testing.T) {
}
defer ext.Shutdown()
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:woo"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
}}, appctype.Conn25PoolsAttr{}, []string{})
cfg := mustConfig(t, sn)
@@ -2081,10 +2081,11 @@ func TestMapDNSResponseRewritesResponses(t *testing.T) {
configuredDomain := "example.com"
domainName := configuredDomain + "."
dnsMessageName := dnsmessage.MustNewName(domainName)
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:connector"},
Domains: []string{configuredDomain},
Mode: appctype.MagicIP,
}}, appctype.Conn25PoolsAttr{
V4MagicIPPool: []netipx.IPRange{v4RangeFrom("0", "10")},
V4TransitIPPool: []netipx.IPRange{v4RangeFrom("40", "50")},
@@ -2634,10 +2635,11 @@ func TestMapDNSResponseRewritesResponses(t *testing.T) {
func TestMapDNSResponseDropsUnhandledTypes(t *testing.T) {
configuredDomain := "example.com"
dnsMessageName := dnsmessage.MustNewName(configuredDomain + ".")
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:connector"},
Domains: []string{configuredDomain},
Mode: appctype.MagicIP,
}}, arbitraryPools, []string{})
cfg := mustConfig(t, sn)
@@ -2700,10 +2702,11 @@ func TestMapDNSResponseWritesThroughNonAddressTypes(t *testing.T) {
configuredDomain := "example.com"
dnsMessageName := dnsmessage.MustNewName(configuredDomain + ".")
targetName := dnsmessage.MustNewName("target.example.net.")
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:connector"},
Domains: []string{configuredDomain},
Mode: appctype.MagicIP,
}}, arbitraryPools, []string{})
cfg := mustConfig(t, sn)
@@ -2821,10 +2824,11 @@ func TestMapDNSResponseStoresConnectorAndToken(t *testing.T) {
const domain = "example.com."
ipOne := netip.MustParseAddr("1.0.0.1")
ipTwo := netip.MustParseAddr("1.0.0.2")
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: testAppName,
Connectors: []string{"tag:woo"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
}}, arbitraryPools, nil)
c := newConn25(logger.Discard)
@@ -2875,10 +2879,11 @@ func TestMapDNSResponseStoresConnectorAndToken(t *testing.T) {
func TestMapDNSResponseUpdatesToken(t *testing.T) {
const domain = "example.com."
dst := netip.MustParseAddr("1.0.0.1")
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: testAppName,
Connectors: []string{"tag:woo"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
}}, arbitraryPools, nil)
c := newConn25(logger.Discard)
@@ -2954,10 +2959,11 @@ func TestMapDNSResponseUpdatesToken(t *testing.T) {
func TestMapDNSResponsePassesThroughUnattributableResponses(t *testing.T) {
const domain = "example.com."
dst := netip.MustParseAddr("1.0.0.1")
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: testAppName,
Connectors: []string{"tag:woo"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
}}, arbitraryPools, nil)
for _, tt := range []struct {
@@ -3073,16 +3079,18 @@ func TestHandleAddressAssignmentStoresTransitIPs(t *testing.T) {
}
defer ext.Shutdown()
sn := makeSelfNode(t, []appctype.Conn25Attr{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{
{
Name: "app1",
Connectors: []string{"tag:woo"},
Domains: []string{"woo.example.com"},
Mode: appctype.MagicIP,
},
{
Name: "app2",
Connectors: []string{"tag:hoo"},
Domains: []string{"hoo.example.com"},
Mode: appctype.MagicIP,
},
}, appctype.Conn25PoolsAttr{}, []string{})
@@ -3221,7 +3229,7 @@ func TestHandleAddressAssignmentStoresTransitIPs(t *testing.T) {
}
func TestClientTransitIPForMagicIP(t *testing.T) {
sn := makeSelfNode(t, []appctype.Conn25Attr{{Name: "app1"}}, appctype.Conn25PoolsAttr{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{Name: "app1", Mode: appctype.MagicIP}}, appctype.Conn25PoolsAttr{
V4MagicIPPool: []netipx.IPRange{v4RangeFrom("0", "10")}, // 100.64.0.0 - 100.64.0.10
V6MagicIPPool: []netipx.IPRange{v6RangeFrom("0", "10")},
}, []string{})
@@ -3316,7 +3324,7 @@ func TestClientTransitIPForMagicIP(t *testing.T) {
}
func TestConnectorRealIPForTransitIPConnection(t *testing.T) {
sn := makeSelfNode(t, []appctype.Conn25Attr{{Name: "app1"}}, appctype.Conn25PoolsAttr{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{Name: "app1", Mode: appctype.MagicIP}}, appctype.Conn25PoolsAttr{
V4TransitIPPool: []netipx.IPRange{v4RangeFrom("40", "50")}, // 100.64.0.40 - 100.64.0.50
}, []string{})
cfg := mustConfig(t, sn)
@@ -3388,10 +3396,11 @@ func TestConnectorRealIPForTransitIPConnection(t *testing.T) {
}
func TestGetMagicRange(t *testing.T) {
sn := makeSelfNode(t, []appctype.Conn25Attr{{
sn := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:woo"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
}}, appctype.Conn25PoolsAttr{
V4MagicIPPool: []netipx.IPRange{netipx.IPRangeFrom(netip.MustParseAddr("0.0.0.1"), netip.MustParseAddr("0.0.0.3"))},
V6MagicIPPool: []netipx.IPRange{netipx.IPRangeFrom(netip.MustParseAddr("::1"), netip.MustParseAddr("::3"))},
@@ -3438,10 +3447,11 @@ func TestGetMagicRange(t *testing.T) {
}
func TestPickConnector(t *testing.T) {
exampleApp := appctype.Conn25Attr{
exampleApp := appctype.AppConnectorAttr{
Name: "example",
Connectors: []string{"tag:example"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
}
nvWithConnectorSet := func(id tailcfg.NodeID, isConnector bool, tags ...string) tailcfg.NodeView {
@@ -3477,13 +3487,13 @@ func TestPickConnector(t *testing.T) {
for _, tt := range []struct {
name string
candidates []tailcfg.NodeView
app appctype.Conn25Attr
app appctype.AppConnectorAttr
want []tailcfg.NodeView
}{
{
name: "empty-everything",
candidates: []tailcfg.NodeView{},
app: appctype.Conn25Attr{},
app: appctype.AppConnectorAttr{},
want: nil,
},
{
@@ -3495,7 +3505,7 @@ func TestPickConnector(t *testing.T) {
{
name: "empty-app",
candidates: []tailcfg.NodeView{nv(1, "tag:example")},
app: appctype.Conn25Attr{},
app: appctype.AppConnectorAttr{},
want: nil,
},
{
@@ -3548,10 +3558,11 @@ func TestPickConnector(t *testing.T) {
{
name: "multi-matches",
candidates: []tailcfg.NodeView{nv(1, "tag:woo", "tag:hoo"), nv(2, "tag:woo", "tag:example"), nv(3, "tag:example1", "tag:example")},
app: appctype.Conn25Attr{
app: appctype.AppConnectorAttr{
Name: "example2",
Connectors: []string{"tag:example1", "tag:example"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
},
want: []tailcfg.NodeView{nv(2, "tag:woo", "tag:example"), nv(3, "tag:example1", "tag:example")},
},
@@ -3570,10 +3581,11 @@ func TestPickConnector(t *testing.T) {
nvWithConnectorSet(9, false),
nvWithConnectorSet(10, false),
},
app: appctype.Conn25Attr{
app: appctype.AppConnectorAttr{
Name: "example2",
Connectors: []string{"tag:example1", "tag:example", "tag:example2"},
Domains: []string{"example.com"},
Mode: appctype.MagicIP,
},
want: []tailcfg.NodeView{
nv(1, "tag:example1", "tag:example"),
@@ -3657,10 +3669,11 @@ func TestMakeNameChecker(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
app := appctype.Conn25Attr{
app := appctype.AppConnectorAttr{
Name: "testApp",
Domains: tt.domains,
Connectors: []string{"tag:connector"},
Mode: appctype.MagicIP,
}
checker := makeNameChecker(app)
@@ -3714,20 +3727,23 @@ func (fakePeerAPIHandler) Logf(format string, a ...any) {
func TestHandleHookReplyToDNSQueries(t *testing.T) {
t.Parallel()
exampleApp := appctype.Conn25Attr{
exampleApp := appctype.AppConnectorAttr{
Name: "example",
Connectors: []string{"tag:example"},
Domains: []string{"example.com", "*.example.com"},
Mode: appctype.MagicIP,
}
exactApp := appctype.Conn25Attr{
exactApp := appctype.AppConnectorAttr{
Name: "exact",
Connectors: []string{"tag:exact"},
Domains: []string{"exact.example.net"},
Mode: appctype.MagicIP,
}
wildcardApp := appctype.Conn25Attr{
wildcardApp := appctype.AppConnectorAttr{
Name: "wildcard",
Connectors: []string{"tag:wildcard"},
Domains: []string{"*.wildcard.example.net"},
Mode: appctype.MagicIP,
}
exampleAppPeerCap := tailcfg.PeerCapMap{
@@ -3753,7 +3769,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
tests := []struct {
name string
noAdvertiseConnector bool
apps []appctype.Conn25Attr
apps []appctype.AppConnectorAttr
tags []string
peerCap tailcfg.PeerCapMap
noQueryString bool
@@ -3763,7 +3779,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
}{
{
name: "normal",
apps: []appctype.Conn25Attr{exampleApp},
apps: []appctype.AppConnectorAttr{exampleApp},
tags: []string{"tag:example"},
peerCap: exampleAppPeerCap,
requestedApp: "example",
@@ -3788,7 +3804,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "exact",
apps: []appctype.Conn25Attr{exactApp},
apps: []appctype.AppConnectorAttr{exactApp},
tags: []string{"tag:exact"},
peerCap: exactAppPeerCap,
requestedApp: "exact",
@@ -3804,7 +3820,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "wildcard",
apps: []appctype.Conn25Attr{wildcardApp},
apps: []appctype.AppConnectorAttr{wildcardApp},
tags: []string{"tag:wildcard"},
peerCap: wildcardAppPeerCap,
requestedApp: "wildcard",
@@ -3820,7 +3836,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "multi-example",
apps: []appctype.Conn25Attr{exampleApp, exactApp, wildcardApp},
apps: []appctype.AppConnectorAttr{exampleApp, exactApp, wildcardApp},
tags: []string{"tag:example", "tag:exact", "tag:wildcard"},
peerCap: allAppPeerCap,
requestedApp: "example",
@@ -3837,7 +3853,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "multi-exact",
apps: []appctype.Conn25Attr{exampleApp, exactApp, wildcardApp},
apps: []appctype.AppConnectorAttr{exampleApp, exactApp, wildcardApp},
tags: []string{"tag:example", "tag:exact", "tag:wildcard"},
peerCap: allAppPeerCap,
requestedApp: "exact",
@@ -3853,7 +3869,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "wildcard",
apps: []appctype.Conn25Attr{exampleApp, exactApp, wildcardApp},
apps: []appctype.AppConnectorAttr{exampleApp, exactApp, wildcardApp},
tags: []string{"tag:example", "tag:exact", "tag:wildcard"},
peerCap: allAppPeerCap,
requestedApp: "wildcard",
@@ -3869,7 +3885,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "restricted-grant",
apps: []appctype.Conn25Attr{exampleApp},
apps: []appctype.AppConnectorAttr{exampleApp},
tags: []string{"tag:example"},
peerCap: exampleAppPeerCapRestrictive,
requestedApp: "example",
@@ -3887,7 +3903,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
{
name: "not-advertised",
noAdvertiseConnector: true,
apps: []appctype.Conn25Attr{exampleApp},
apps: []appctype.AppConnectorAttr{exampleApp},
tags: []string{"tag:example"},
peerCap: allAppPeerCap,
requestedApp: "example",
@@ -3895,7 +3911,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "no-apps",
apps: []appctype.Conn25Attr{},
apps: []appctype.AppConnectorAttr{},
tags: []string{"tag:example"},
peerCap: allAppPeerCap,
requestedApp: "example",
@@ -3903,7 +3919,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "not-connector-for-app",
apps: []appctype.Conn25Attr{exampleApp, exactApp},
apps: []appctype.AppConnectorAttr{exampleApp, exactApp},
tags: []string{"tag:exact"},
peerCap: allAppPeerCap,
requestedApp: "example",
@@ -3911,7 +3927,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "no-permission-for-app",
apps: []appctype.Conn25Attr{exampleApp, exactApp},
apps: []appctype.AppConnectorAttr{exampleApp, exactApp},
tags: []string{"tag:example", "tag:exact"},
peerCap: exampleAppPeerCap,
requestedApp: "exact",
@@ -3919,7 +3935,7 @@ func TestHandleHookReplyToDNSQueries(t *testing.T) {
},
{
name: "no-query-string",
apps: []appctype.Conn25Attr{exampleApp},
apps: []appctype.AppConnectorAttr{exampleApp},
tags: []string{"tag:example"},
peerCap: exampleAppPeerCap,
noQueryString: true,
@@ -3996,10 +4012,11 @@ func TestExtraDNSRoutesHook(t *testing.T) {
t.Errorf("routes before self node known = %v, want nil", got)
}
selfNode := makeSelfNode(t, []appctype.Conn25Attr{{
selfNode := makeSelfNode(t, []appctype.AppConnectorAttr{{
Name: "app1",
Connectors: []string{"tag:woo"},
Domains: []string{"example.com", "*.wild.example.com"},
Mode: appctype.MagicIP,
}}, appctype.Conn25PoolsAttr{}, nil)
ext.onSelfChange(selfNode)
ext.profileStateChange(ipn.LoginProfileView{}, testPrefsNotConnector, true)
+2 -2
View File
@@ -36,7 +36,7 @@ func TestConnectorExpireTransitIPs(t *testing.T) {
c := newConn25(logger.Discard)
c.reconfig(&config{
isConfigured: true,
appsByName: map[string]appctype.Conn25Attr{appName: {}},
appsByName: map[string]appctype.AppConnectorAttr{appName: {}},
ipSets: ipSets{v4Transit: mustIPSetFromPrefix("0.0.0.0/15")},
})
clock := tstest.NewClock(tstest.ClockOpts{Start: time.Now()})
@@ -143,7 +143,7 @@ func TestConnectorDisallowedDestinations(t *testing.T) {
c := newConn25(logger.Discard)
c.reconfig(&config{
isConfigured: true,
appsByName: map[string]appctype.Conn25Attr{appName: {}},
appsByName: map[string]appctype.AppConnectorAttr{appName: {}},
ipSets: ipSets{
v4Magic: mustIPSetFromPrefix("203.0.113.0/24"),
v4Transit: mustIPSetFromPrefix("198.51.100.0/24"),
-12
View File
@@ -116,18 +116,6 @@ type RouteUpdate struct {
Unadvertise []netip.Prefix
}
type Conn25Attr struct {
// Name is the name of this collection of domains.
Name string `json:"name,omitempty"`
// Domains enumerates the domains serviced by the specified app connectors.
// Domains can be of the form: example.com, or *.example.com.
Domains []string `json:"domains,omitempty"`
// Connectors enumerates the app connectors which service these domains.
// These can either be "*" to match any advertising connector, or a
// tag of the form tag:<tag-name>.
Connectors []string `json:"connectors,omitempty"`
}
type Conn25PoolsAttr struct {
V4MagicIPPool []netipx.IPRange `json:"v4MagicIPPool,omitempty"`
V4TransitIPPool []netipx.IPRange `json:"v4TransitIPPool,omitempty"`