Upgrade Go 1.21, Tailscale 1.50 and add Capability version support (#1563)

hscontrol/mapper/tail.go

@@ -15,18 +15,22 @@ import (
 
 func tailNodes(
 	nodes types.Nodes,
+	capVer tailcfg.CapabilityVersion,
 	pol *policy.ACLPolicy,
 	dnsConfig *tailcfg.DNSConfig,
 	baseDomain string,
+	randomClientPort bool,
 ) ([]*tailcfg.Node, error) {
 	tNodes := make([]*tailcfg.Node, len(nodes))
 
 	for index, node := range nodes {
 		node, err := tailNode(
 			node,
+			capVer,
 			pol,
 			dnsConfig,
 			baseDomain,
+			randomClientPort,
 		)
 		if err != nil {
 			return nil, err
@@ -42,9 +46,11 @@ func tailNodes(
 // as per the expected behaviour in the official SaaS.
 func tailNode(
 	node *types.Node,
+	capVer tailcfg.CapabilityVersion,
 	pol *policy.ACLPolicy,
 	dnsConfig *tailcfg.DNSConfig,
 	baseDomain string,
+	randomClientPort bool,
 ) (*tailcfg.Node, error) {
 	nodeKey, err := node.NodePublicKey()
 	if err != nil {
@@ -133,14 +139,35 @@ func tailNode(
 
 		LastSeen:          node.LastSeen,
 		Online:            &online,
-		KeepAlive:         true,
 		MachineAuthorized: !node.IsExpired(),
+	}
 
-		Capabilities: []string{
+	//   - 74: 2023-09-18: Client understands NodeCapMap
+	if capVer >= 74 {
+		tNode.CapMap = tailcfg.NodeCapMap{
+			tailcfg.CapabilityFileSharing: []tailcfg.RawMessage{},
+			tailcfg.CapabilityAdmin:       []tailcfg.RawMessage{},
+			tailcfg.CapabilitySSH:         []tailcfg.RawMessage{},
+		}
+
+		if randomClientPort {
+			tNode.CapMap[tailcfg.NodeAttrRandomizeClientPort] = []tailcfg.RawMessage{}
+		}
+	} else {
+		tNode.Capabilities = []tailcfg.NodeCapability{
 			tailcfg.CapabilityFileSharing,
 			tailcfg.CapabilityAdmin,
 			tailcfg.CapabilitySSH,
-		},
+		}
+
+		if randomClientPort {
+			tNode.Capabilities = append(tNode.Capabilities, tailcfg.NodeAttrRandomizeClientPort)
+		}
+	}
+
+	//   - 72: 2023-08-23: TS-2023-006 UPnP issue fixed; UPnP can now be used again
+	if capVer < 72 {
+		tNode.Capabilities = append(tNode.Capabilities, tailcfg.NodeAttrDisableUPnP)
 	}
 
 	return &tNode, nil