hscontrol/policy: fix test assertions and expectations

Fix several test issues exposed by the ResolvedAddresses refactor:

- TestTagUserMutualExclusivity: remove incorrect ACL rule that was
  testing the wrong invariant. The test now correctly validates that
  without an explicit cross-identity grant, user-owned nodes cannot
  reach tagged nodes. Add TestUserToTagCrossIdentityGrant to verify
  that explicit user@ -> tag:X ACL rules produce valid filter rules.

- TestResolvePolicy/wildcard-alias: update expected prefixes to match
  the CGNAT range minus ChromeOS VM range (multiple prefixes instead
  of the encompassing 100.64.0.0/10).

- TestApproveRoutesWithPolicy: fix user Name fields from "testuser@"
  to "testuser" to match how resolveUser trims the @ suffix before
  comparing against stored names.

Updates #2180

hscontrol/policy/policy_autoapprove_test.go

@@ -19,11 +19,11 @@ import (
 func TestApproveRoutesWithPolicy_NeverRemovesApprovedRoutes(t *testing.T) {
 	user1 := types.User{
 		Model: gorm.Model{ID: 1},
-		Name:  "testuser@",
+		Name:  "testuser",
 	}
 	user2 := types.User{
 		Model: gorm.Model{ID: 2},
-		Name:  "otheruser@",
+		Name:  "otheruser",
 	}
 	users := []types.User{user1, user2}
 

hscontrol/policy/v2/filter_test.go

@@ -1442,8 +1442,9 @@ func TestCompileFilterRulesForNodeWithAutogroupSelf(t *testing.T) {
 	}
 }
 
-// TestTagUserMutualExclusivity tests that user-owned nodes and tagged nodes
+// TestTagUserMutualExclusivity tests that without explicit cross-identity ACL
-// are treated as separate identity classes and cannot inadvertently access each other.
+// rules, user-owned nodes and tagged nodes are isolated from each other.
+// It also verifies that tag-to-tag rules work correctly.
 func TestTagUserMutualExclusivity(t *testing.T) {
 	users := types.Users{
 		{Model: gorm.Model{ID: 1}, Name: "user1"},
@@ -1473,21 +1474,13 @@ func TestTagUserMutualExclusivity(t *testing.T) {
 		},
 	}
 
-	policy := &Policy{
+	pol := &Policy{
 		TagOwners: TagOwners{
 			Tag("tag:server"):   Owners{new(Username("user1@"))},
 			Tag("tag:database"): Owners{new(Username("user2@"))},
 		},
 		ACLs: []ACL{
-			// Rule 1: user1 (user-owned) should NOT be able to reach tagged nodes
+			// Only tag-to-tag rule, no user-to-tag rules.
-			{
-				Action:  "accept",
-				Sources: []Alias{up("user1@")},
-				Destinations: []AliasWithPorts{
-					aliasWithPorts(tp("tag:server"), tailcfg.PortRangeAny),
-				},
-			},
-			// Rule 2: tag:server should be able to reach tag:database
 			{
 				Action:  "accept",
 				Sources: []Alias{tp("tag:server")},
@@ -1498,63 +1491,134 @@ func TestTagUserMutualExclusivity(t *testing.T) {
 		},
 	}
 
-	err := policy.validate()
+	err := pol.validate()
-	if err != nil {
+	require.NoError(t, err)
-		t.Fatalf("policy validation failed: %v", err)
-	}
 
-	// Test user1's user-owned node (100.64.0.1)
+	// User1's user-owned node should have no rules reaching tagged nodes
+	// since there is no explicit user→tag ACL rule.
 	userNode := nodes[0].View()
 
-	userRules, err := policy.compileFilterRulesForNode(users, userNode, nodes.ViewSlice())
+	userRules, err := pol.compileFilterRulesForNode(users, userNode, nodes.ViewSlice())
-	if err != nil {
+	require.NoError(t, err)
-		t.Fatalf("unexpected error for user node: %v", err)
-	}
 
-	// User1's user-owned node should NOT reach tag:server (100.64.0.10)
-	// because user1@ as a source only matches user1's user-owned devices, NOT tagged devices
 	for _, rule := range userRules {
 		for _, dst := range rule.DstPorts {
-			if dst.IP == "100.64.0.10" {
+			ipSet, parseErr := util.ParseIPSet(dst.IP, nil)
-				t.Errorf("SECURITY: user-owned node should NOT reach tagged node (got dest %s in rule)", dst.IP)
+			require.NoError(t, parseErr)
+
+			if ipSet.Contains(netip.MustParseAddr("100.64.0.10")) {
+				t.Errorf("user-owned node should not reach tag:server without explicit grant (got dest %s)", dst.IP)
+			}
+
+			if ipSet.Contains(netip.MustParseAddr("100.64.0.11")) {
+				t.Errorf("user-owned node should not reach tag:database without explicit grant (got dest %s)", dst.IP)
 			}
 		}
 	}
 
-	// Test tag:server node (100.64.0.10)
+	// Tag:server should be able to reach tag:database via the tag-to-tag rule.
-	// compileFilterRulesForNode returns rules for what the node can ACCESS (as source)
 	taggedNode := nodes[2].View()
 
-	taggedRules, err := policy.compileFilterRulesForNode(users, taggedNode, nodes.ViewSlice())
+	taggedRules, err := pol.compileFilterRulesForNode(users, taggedNode, nodes.ViewSlice())
-	if err != nil {
+	require.NoError(t, err)
-		t.Fatalf("unexpected error for tagged node: %v", err)
-	}
 
-	// Tag:server (as source) should be able to reach tag:database (100.64.0.11)
-	// Check destinations in the rules for this node
 	foundDatabaseDest := false
 
 	for _, rule := range taggedRules {
-		// Check if this rule applies to tag:server as source
-		if !slices.Contains(rule.SrcIPs, "100.64.0.10/32") {
-			continue
-		}
-
-		// Check if tag:database is in destinations
 		for _, dst := range rule.DstPorts {
-			if dst.IP == "100.64.0.11/32" {
+			ipSet, parseErr := util.ParseIPSet(dst.IP, nil)
+			require.NoError(t, parseErr)
+
+			if ipSet.Contains(netip.MustParseAddr("100.64.0.11")) {
 				foundDatabaseDest = true
 				break
 			}
 		}
+	}
 
-		if foundDatabaseDest {
+	assert.True(t, foundDatabaseDest, "tag:server should reach tag:database")
-			break
+}
+
+// TestUserToTagCrossIdentityGrant tests that an explicit ACL rule granting
+// user-owned nodes access to tagged nodes works correctly. The tags-as-identity
+// model separates identity classes, but explicit ACL grants across classes
+// are valid and should produce filter rules.
+func TestUserToTagCrossIdentityGrant(t *testing.T) {
+	users := types.Users{
+		{Model: gorm.Model{ID: 1}, Name: "user1"},
+		{Model: gorm.Model{ID: 2}, Name: "user2"},
+	}
+
+	nodes := types.Nodes{
+		{
+			User: new(users[0]),
+			IPv4: ap("100.64.0.1"),
+		},
+		{
+			User: new(users[1]),
+			IPv4: ap("100.64.0.2"),
+		},
+		{
+			User: &users[0], // "created by" tracking
+			IPv4: ap("100.64.0.10"),
+			Tags: []string{"tag:server"},
+		},
+	}
+
+	pol := &Policy{
+		TagOwners: TagOwners{
+			Tag("tag:server"): Owners{new(Username("user1@"))},
+		},
+		ACLs: []ACL{
+			// Explicit cross-identity grant: user1's devices can reach tag:server.
+			{
+				Action:  "accept",
+				Sources: []Alias{up("user1@")},
+				Destinations: []AliasWithPorts{
+					aliasWithPorts(tp("tag:server"), tailcfg.PortRangeAny),
+				},
+			},
+		},
+	}
+
+	err := pol.validate()
+	require.NoError(t, err)
+
+	// Compile rules for the tag:server node — it is the destination,
+	// so the filter should include user1's IP as source.
+	taggedNode := nodes[2].View()
+
+	rules, err := pol.compileFilterRulesForNode(users, taggedNode, nodes.ViewSlice())
+	require.NoError(t, err)
+
+	// user1's IP should appear as a source that can reach tag:server.
+	foundUser1Src := false
+
+	for _, rule := range rules {
+		for _, srcEntry := range rule.SrcIPs {
+			ipSet, parseErr := util.ParseIPSet(srcEntry, nil)
+			require.NoError(t, parseErr)
+
+			if ipSet.Contains(netip.MustParseAddr("100.64.0.1")) {
+				foundUser1Src = true
+				break
+			}
 		}
 	}
 
-	if !foundDatabaseDest {
+	assert.True(t, foundUser1Src,
-		t.Errorf("tag:server should reach tag:database but didn't find 100.64.0.11 in destinations")
+		"explicit user1@ -> tag:server ACL should allow user1 devices to reach tagged node")
+
+	// user2 should NOT appear as a source.
+	for _, rule := range rules {
+		for _, srcEntry := range rule.SrcIPs {
+			ipSet, parseErr := util.ParseIPSet(srcEntry, nil)
+			require.NoError(t, parseErr)
+
+			if ipSet.Contains(netip.MustParseAddr("100.64.0.2")) {
+				t.Errorf("user2 should not reach tag:server (found in SrcIP %s)", srcEntry)
+			}
+		}
 	}
 }
 

hscontrol/policy/v2/types_test.go

@@ -2378,7 +2378,22 @@ func TestResolvePolicy(t *testing.T) {
 		{
 			name:      "wildcard-alias",
 			toResolve: Wildcard,
-			want:      []netip.Prefix{tsaddr.CGNATRange(), tsaddr.TailscaleULARange()},
+			want: []netip.Prefix{
+				mp("100.64.0.0/11"),
+				mp("100.96.0.0/12"),
+				mp("100.112.0.0/15"),
+				mp("100.114.0.0/16"),
+				mp("100.115.0.0/18"),
+				mp("100.115.64.0/20"),
+				mp("100.115.80.0/21"),
+				mp("100.115.88.0/22"),
+				mp("100.115.94.0/23"),
+				mp("100.115.96.0/19"),
+				mp("100.115.128.0/17"),
+				mp("100.116.0.0/14"),
+				mp("100.120.0.0/13"),
+				tsaddr.TailscaleULARange(),
+			},
 		},
 		{
 			name:      "autogroup-member-comprehensive",