move to use tailscfg types over strings/custom types (#1612)

* rename database only fields Signed-off-by: Kristoffer Dalby <[email protected]> * use correct endpoint type over string list Signed-off-by: Kristoffer Dalby <[email protected]> * remove HostInfo wrapper Signed-off-by: Kristoffer Dalby <[email protected]> * wrap errors in database hooks Signed-off-by: Kristoffer Dalby <[email protected]> --------- Signed-off-by: Kristoffer Dalby <[email protected]>
juanfont · Nov 21, 2023 · b918aa0 · b918aa0
1 parent ed4e199
commit b918aa0
Show file tree

Hide file tree

Showing 13 changed files with 147 additions and 154 deletions.
diff --git a/hscontrol/db/node_test.go b/hscontrol/db/node_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/juanfont/headscale/hscontrol/types"
 	"github.com/juanfont/headscale/hscontrol/util"
 	"gopkg.in/check.v1"
+	"tailscale.com/tailcfg"
 	"tailscale.com/types/key"
 )
 
@@ -593,7 +594,7 @@ func (s *Suite) TestAutoApproveRoutes(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo: types.HostInfo{
+		Hostinfo: &tailcfg.Hostinfo{
 			RequestTags: []string{"tag:exit"},
 			RoutableIPs: []netip.Prefix{defaultRouteV4, defaultRouteV6, route1, route2},
 		},

diff --git a/hscontrol/db/routes.go b/hscontrol/db/routes.go
@@ -274,7 +274,7 @@ func (hsdb *HSDatabase) saveNodeRoutes(node *types.Node) error {
 	}
 
 	advertisedRoutes := map[netip.Prefix]bool{}
-	for _, prefix := range node.HostInfo.RoutableIPs {
+	for _, prefix := range node.Hostinfo.RoutableIPs {
 		advertisedRoutes[prefix] = false
 	}
 

diff --git a/hscontrol/db/routes_test.go b/hscontrol/db/routes_test.go
@@ -33,7 +33,7 @@ func (s *Suite) TestGetRoutes(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo:       types.HostInfo(hostInfo),
+		Hostinfo:       &hostInfo,
 	}
 	db.db.Save(&node)
 
@@ -81,7 +81,7 @@ func (s *Suite) TestGetEnableRoutes(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo:       types.HostInfo(hostInfo),
+		Hostinfo:       &hostInfo,
 	}
 	db.db.Save(&node)
 
@@ -152,7 +152,7 @@ func (s *Suite) TestIsUniquePrefix(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo:       types.HostInfo(hostInfo1),
+		Hostinfo:       &hostInfo1,
 	}
 	db.db.Save(&node1)
 
@@ -174,7 +174,7 @@ func (s *Suite) TestIsUniquePrefix(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo:       types.HostInfo(hostInfo2),
+		Hostinfo:       &hostInfo2,
 	}
 	db.db.Save(&node2)
 
@@ -232,7 +232,7 @@ func (s *Suite) TestSubnetFailover(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo:       types.HostInfo(hostInfo1),
+		Hostinfo:       &hostInfo1,
 		LastSeen:       &now,
 	}
 	db.db.Save(&node1)
@@ -266,7 +266,7 @@ func (s *Suite) TestSubnetFailover(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo:       types.HostInfo(hostInfo2),
+		Hostinfo:       &hostInfo2,
 		LastSeen:       &now,
 	}
 	db.db.Save(&node2)
@@ -313,9 +313,9 @@ func (s *Suite) TestSubnetFailover(c *check.C) {
 	c.Assert(err, check.IsNil)
 	c.Assert(len(routes), check.Equals, 1)
 
-	node2.HostInfo = types.HostInfo(tailcfg.Hostinfo{
+	node2.Hostinfo = &tailcfg.Hostinfo{
 		RoutableIPs: []netip.Prefix{prefix, prefix2},
-	})
+	}
 	err = db.db.Save(&node2).Error
 	c.Assert(err, check.IsNil)
 
@@ -368,7 +368,7 @@ func (s *Suite) TestDeleteRoutes(c *check.C) {
 		UserID:         user.ID,
 		RegisterMethod: util.RegisterMethodAuthKey,
 		AuthKeyID:      uint(pak.ID),
-		HostInfo:       types.HostInfo(hostInfo1),
+		Hostinfo:       &hostInfo1,
 		LastSeen:       &now,
 	}
 	db.db.Save(&node1)

diff --git a/hscontrol/grpcv1.go b/hscontrol/grpcv1.go
@@ -550,7 +550,7 @@ func (api headscaleV1APIServer) DebugCreateNode(
 		Expiry:   &time.Time{},
 		LastSeen: &time.Time{},
 
-		HostInfo: types.HostInfo(hostinfo),
+		Hostinfo: &hostinfo,
 	}
 
 	log.Debug().

diff --git a/hscontrol/mapper/mapper.go b/hscontrol/mapper/mapper.go
@@ -195,7 +195,7 @@ func addNextDNSMetadata(resolvers []*dnstype.Resolver, node *types.Node) {
 		if strings.HasPrefix(resolver.Addr, nextDNSDoHPrefix) {
 			attrs := url.Values{
 				"device_name":  []string{node.Hostname},
-				"device_model": []string{node.HostInfo.OS},
+				"device_model": []string{node.Hostinfo.OS},
 			}
 
 			if len(node.IPAddresses) > 0 {

diff --git a/hscontrol/mapper/mapper_test.go b/hscontrol/mapper/mapper_test.go
@@ -186,8 +186,7 @@ func Test_fullMapResponse(t *testing.T) {
 		AuthKey:     &types.PreAuthKey{},
 		LastSeen:    &lastSeen,
 		Expiry:      &expire,
-		HostInfo:    types.HostInfo{},
-		Endpoints:   []string{},
+		Hostinfo:    &tailcfg.Hostinfo{},
 		Routes: []types.Route{
 			{
 				Prefix:     types.IPPrefix(netip.MustParsePrefix("0.0.0.0/0")),
@@ -267,8 +266,7 @@ func Test_fullMapResponse(t *testing.T) {
 		ForcedTags:  []string{},
 		LastSeen:    &lastSeen,
 		Expiry:      &expire,
-		HostInfo:    types.HostInfo{},
-		Endpoints:   []string{},
+		Hostinfo:    &tailcfg.Hostinfo{},
 		Routes:      []types.Route{},
 		CreatedAt:   created,
 	}
@@ -324,8 +322,7 @@ func Test_fullMapResponse(t *testing.T) {
 		ForcedTags:  []string{},
 		LastSeen:    &lastSeen,
 		Expiry:      &expire,
-		HostInfo:    types.HostInfo{},
-		Endpoints:   []string{},
+		Hostinfo:    &tailcfg.Hostinfo{},
 		Routes:      []types.Route{},
 		CreatedAt:   created,
 	}

diff --git a/hscontrol/mapper/tail.go b/hscontrol/mapper/tail.go
@@ -72,8 +72,8 @@ func tailNode(
 	}
 
 	var derp string
-	if node.HostInfo.NetInfo != nil {
-		derp = fmt.Sprintf("127.3.3.40:%d", node.HostInfo.NetInfo.PreferredDERP)
+	if node.Hostinfo.NetInfo != nil {
+		derp = fmt.Sprintf("127.3.3.40:%d", node.Hostinfo.NetInfo.PreferredDERP)
 	} else {
 		derp = "127.3.3.40:0" // Zero means disconnected or unknown.
 	}
@@ -90,18 +90,11 @@ func tailNode(
 		return nil, err
 	}
 
-	hostInfo := node.GetHostInfo()
-
 	online := node.IsOnline()
 
 	tags, _ := pol.TagsOfNode(node)
 	tags = lo.Uniq(append(tags, node.ForcedTags...))
 
-	endpoints, err := node.EndpointsToAddrPort()
-	if err != nil {
-		return nil, err
-	}
-
 	tNode := tailcfg.Node{
 		ID: tailcfg.NodeID(node.ID), // this is the actual ID
 		StableID: tailcfg.StableNodeID(
@@ -118,9 +111,9 @@ func tailNode(
 		DiscoKey:   node.DiscoKey,
 		Addresses:  addrs,
 		AllowedIPs: allowedIPs,
-		Endpoints:  endpoints,
+		Endpoints:  node.Endpoints,
 		DERP:       derp,
-		Hostinfo:   hostInfo.View(),
+		Hostinfo:   node.Hostinfo.View(),
 		Created:    node.CreatedAt,
 
 		Tags: tags,

diff --git a/hscontrol/mapper/tail_test.go b/hscontrol/mapper/tail_test.go
@@ -53,8 +53,10 @@ func TestTailNode(t *testing.T) {
 		wantErr    bool
 	}{
 		{
-			name:       "empty-node",
-			node:       &types.Node{},
+			name: "empty-node",
+			node: &types.Node{
+				Hostinfo: &tailcfg.Hostinfo{},
+			},
 			pol:        &policy.ACLPolicy{},
 			dnsConfig:  &tailcfg.DNSConfig{},
 			baseDomain: "",
@@ -102,8 +104,7 @@ func TestTailNode(t *testing.T) {
 				AuthKey:    &types.PreAuthKey{},
 				LastSeen:   &lastSeen,
 				Expiry:     &expire,
-				HostInfo:   types.HostInfo{},
-				Endpoints:  []string{},
+				Hostinfo:   &tailcfg.Hostinfo{},
 				Routes: []types.Route{
 					{
 						Prefix:     types.IPPrefix(netip.MustParsePrefix("0.0.0.0/0")),

diff --git a/hscontrol/policy/acls.go b/hscontrol/policy/acls.go
@@ -596,10 +596,13 @@ func excludeCorrectlyTaggedNodes(
 	}
 	// for each node if tag is in tags list, don't append it.
 	for _, node := range nodes {
-		hi := node.GetHostInfo()
-
 		found := false
-		for _, t := range hi.RequestTags {
+
+		if node.Hostinfo == nil {
+			continue
+		}
+
+		for _, t := range node.Hostinfo.RequestTags {
 			if util.StringOrPrefixListContains(tags, t) {
 				found = true
 
@@ -787,8 +790,11 @@ func (pol *ACLPolicy) expandIPsFromTag(
 	for _, user := range owners {
 		nodes := filterNodesByUser(nodes, user)
 		for _, node := range nodes {
-			hi := node.GetHostInfo()
-			if util.StringOrPrefixListContains(hi.RequestTags, alias) {
+			if node.Hostinfo == nil {
+				continue
+			}
+
+			if util.StringOrPrefixListContains(node.Hostinfo.RequestTags, alias) {
 				node.IPAddresses.AppendToIPSet(&build)
 			}
 		}
@@ -882,7 +888,7 @@ func (pol *ACLPolicy) TagsOfNode(
 
 	validTagMap := make(map[string]bool)
 	invalidTagMap := make(map[string]bool)
-	for _, tag := range node.HostInfo.RequestTags {
+	for _, tag := range node.Hostinfo.RequestTags {
 		owners, err := expandOwnersFromTag(pol, tag)
 		if errors.Is(err, ErrInvalidTag) {
 			invalidTagMap[tag] = true