Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-08-01 13:46:49 +02:00
Code Issues Projects Releases Wiki Activity

add @ to integration tests

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2025-03-24 16:42:21 +01:00
parent 868323f699
commit 95bd128f86
No known key found for this signature in database
8 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hscontrol/db/node_test.go
View File

@ -567,7 +567,7 @@ func TestEphemeralGarbageCollectorLoads(t *testing.T) {
}) })
go e.Start() go e.Start()
for i := 0; i < want; i++ { for i := range want {
go e.Schedule(types.NodeID(i), 1*time.Second) go e.Schedule(types.NodeID(i), 1*time.Second)
} }

4
hscontrol/util/dns.go
View File

@ -196,7 +196,7 @@ func GenerateIPv6DNSRootDomain(ipPrefix netip.Prefix) []dnsname.FQDN {
// and from what I can see, the generateMagicDNSRootDomains // and from what I can see, the generateMagicDNSRootDomains
// function is called only once over the lifetime of a server process. // function is called only once over the lifetime of a server process.
prefixConstantParts := []string{} prefixConstantParts := []string{}
for i := 0; i < maskBits/nibbleLen; i++ { for i := range maskBits / nibbleLen {
prefixConstantParts = append( prefixConstantParts = append(
[]string{string(nibbleStr[i])}, []string{string(nibbleStr[i])},
prefixConstantParts...) prefixConstantParts...)
@ -215,7 +215,7 @@ func GenerateIPv6DNSRootDomain(ipPrefix netip.Prefix) []dnsname.FQDN {
} else { } else {
domCount := 1 << (maskBits % nibbleLen) domCount := 1 << (maskBits % nibbleLen)
fqdns = make([]dnsname.FQDN, 0, domCount) fqdns = make([]dnsname.FQDN, 0, domCount)
for i := 0; i < domCount; i++ { for i := range domCount {
varNibble := fmt.Sprintf("%x", i) varNibble := fmt.Sprintf("%x", i)
dom, err := makeDomain(varNibble) dom, err := makeDomain(varNibble)
if err != nil { if err != nil {

2
hscontrol/util/string_test.go
View File

@ -8,7 +8,7 @@ import (
) )
func TestGenerateRandomStringDNSSafe(t *testing.T) { func TestGenerateRandomStringDNSSafe(t *testing.T) {
for i := 0; i < 100000; i++ { for range 100000 {
str, err := GenerateRandomStringDNSSafe(8) str, err := GenerateRandomStringDNSSafe(8)
require.NoError(t, err) require.NoError(t, err)
assert.Len(t, str, 8) assert.Len(t, str, 8)

68
integration/acl_test.go
View File

@ -137,13 +137,13 @@ func TestACLHostsInNetMapTable(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user1:*"}, Destinations: []string{"user1@:*"},
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user2"}, Sources: []string{"user2@"},
Destinations: []string{"user2:*"}, Destinations: []string{"user2@:*"},
}, },
}, },
}, want: map[string]int{ }, want: map[string]int{
@ -160,23 +160,23 @@ func TestACLHostsInNetMapTable(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user1:22"}, Destinations: []string{"user1@:22"},
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user2"}, Sources: []string{"user2@"},
Destinations: []string{"user2:22"}, Destinations: []string{"user2@:22"},
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user2:22"}, Destinations: []string{"user2@:22"},
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user2"}, Sources: []string{"user2@"},
Destinations: []string{"user1:22"}, Destinations: []string{"user1@:22"},
}, },
}, },
}, want: map[string]int{ }, want: map[string]int{
@ -194,18 +194,18 @@ func TestACLHostsInNetMapTable(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user1:*"}, Destinations: []string{"user1@:*"},
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user2"}, Sources: []string{"user2@"},
Destinations: []string{"user2:*"}, Destinations: []string{"user2@:*"},
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user2:*"}, Destinations: []string{"user2@:*"},
}, },
}, },
}, want: map[string]int{ }, want: map[string]int{
@ -219,18 +219,18 @@ func TestACLHostsInNetMapTable(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: append([]string{"user1:*"}, veryLargeDestination...), Destinations: append([]string{"user1@:*"}, veryLargeDestination...),
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user2"}, Sources: []string{"user2@"},
Destinations: append([]string{"user2:*"}, veryLargeDestination...), Destinations: append([]string{"user2@:*"}, veryLargeDestination...),
}, },
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: append([]string{"user2:*"}, veryLargeDestination...), Destinations: append([]string{"user2@:*"}, veryLargeDestination...),
}, },
}, },
}, want: map[string]int{ }, want: map[string]int{
@ -299,8 +299,8 @@ func TestACLAllowUser80Dst(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user2:80"}, Destinations: []string{"user2@:80"},
}, },
}, },
}, },
@ -351,7 +351,7 @@ func TestACLDenyAllPort80(t *testing.T) {
scenario := aclScenario(t, scenario := aclScenario(t,
&policyv1.ACLPolicy{ &policyv1.ACLPolicy{
Groups: map[string][]string{ Groups: map[string][]string{
"group:integration-acl-test": {"user1", "user2"}, "group:integration-acl-test": {"user1@", "user2@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
@ -400,8 +400,8 @@ func TestACLAllowUserDst(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user2:*"}, Destinations: []string{"user2@:*"},
}, },
}, },
}, },
@ -456,7 +456,7 @@ func TestACLAllowStarDst(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"*:*"}, Destinations: []string{"*:*"},
}, },
}, },
@ -912,8 +912,8 @@ func TestACLDevice1CanAccessDevice2(t *testing.T) {
"group": { "group": {
policy: policyv1.ACLPolicy{ policy: policyv1.ACLPolicy{
Groups: map[string][]string{ Groups: map[string][]string{
"group:one": {"user1"}, "group:one": {"user1@"},
"group:two": {"user2"}, "group:two": {"user2@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
@ -1079,8 +1079,8 @@ func TestPolicyUpdateWhileRunningWithCLIInDatabase(t *testing.T) {
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
Action: "accept", Action: "accept",
Sources: []string{"user1"}, Sources: []string{"user1@"},
Destinations: []string{"user2:*"}, Destinations: []string{"user2@:*"},
}, },
}, },
Hosts: policyv1.Hosts{}, Hosts: policyv1.Hosts{},

18
integration/cli_test.go
View File

@ -263,7 +263,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
keys := make([]*v1.PreAuthKey, count) keys := make([]*v1.PreAuthKey, count)
assertNoErr(t, err) assertNoErr(t, err)
for index := 0; index < count; index++ { for index := range count {
var preAuthKey v1.PreAuthKey var preAuthKey v1.PreAuthKey
err := executeAndUnmarshal( err := executeAndUnmarshal(
headscale, headscale,
@ -639,7 +639,7 @@ func TestApiKeyCommand(t *testing.T) {
keys := make([]string, count) keys := make([]string, count)
for idx := 0; idx < count; idx++ { for idx := range count {
apiResult, err := headscale.Execute( apiResult, err := headscale.Execute(
[]string{ []string{
"headscale", "headscale",
@ -716,7 +716,7 @@ func TestApiKeyCommand(t *testing.T) {
expiredPrefixes := make(map[string]bool) expiredPrefixes := make(map[string]bool)
// Expire three keys // Expire three keys
for idx := 0; idx < 3; idx++ { for idx := range 3 {
_, err := headscale.Execute( _, err := headscale.Execute(
[]string{ []string{
"headscale", "headscale",
@ -951,7 +951,7 @@ func TestNodeAdvertiseTagCommand(t *testing.T) {
}, },
}, },
TagOwners: map[string][]string{ TagOwners: map[string][]string{
"tag:test": {"user1"}, "tag:test": {"user1@"},
}, },
}, },
wantTag: true, wantTag: true,
@ -960,7 +960,7 @@ func TestNodeAdvertiseTagCommand(t *testing.T) {
name: "with-policy-groups", name: "with-policy-groups",
policy: &policyv1.ACLPolicy{ policy: &policyv1.ACLPolicy{
Groups: policyv1.Groups{ Groups: policyv1.Groups{
"group:admins": []string{"user1"}, "group:admins": []string{"user1@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
@ -1357,7 +1357,7 @@ func TestNodeExpireCommand(t *testing.T) {
assert.True(t, listAll[3].GetExpiry().AsTime().IsZero()) assert.True(t, listAll[3].GetExpiry().AsTime().IsZero())
assert.True(t, listAll[4].GetExpiry().AsTime().IsZero()) assert.True(t, listAll[4].GetExpiry().AsTime().IsZero())
for idx := 0; idx < 3; idx++ { for idx := range 3 {
_, err := headscale.Execute( _, err := headscale.Execute(
[]string{ []string{
"headscale", "headscale",
@ -1484,7 +1484,7 @@ func TestNodeRenameCommand(t *testing.T) {
assert.Contains(t, listAll[3].GetGivenName(), "node-4") assert.Contains(t, listAll[3].GetGivenName(), "node-4")
assert.Contains(t, listAll[4].GetGivenName(), "node-5") assert.Contains(t, listAll[4].GetGivenName(), "node-5")
for idx := 0; idx < 3; idx++ { for idx := range 3 {
res, err := headscale.Execute( res, err := headscale.Execute(
[]string{ []string{
"headscale", "headscale",
@ -1751,7 +1751,7 @@ func TestPolicyCommand(t *testing.T) {
}, },
}, },
TagOwners: map[string][]string{ TagOwners: map[string][]string{
"tag:exists": {"user1"}, "tag:exists": {"user1@"},
}, },
} }
@ -1837,7 +1837,7 @@ func TestPolicyBrokenConfigCommand(t *testing.T) {
}, },
}, },
TagOwners: map[string][]string{ TagOwners: map[string][]string{
"tag:exists": {"user1"}, "tag:exists": {"user1@"},
}, },
} }

2
integration/general_test.go
View File

@ -345,7 +345,7 @@ func TestTaildrop(t *testing.T) {
retry := func(times int, sleepInterval time.Duration, doWork func() error) error { retry := func(times int, sleepInterval time.Duration, doWork func() error) error {
var err error var err error
for attempts := 0; attempts < times; attempts++ { for range times {
err = doWork() err = doWork()
if err == nil { if err == nil {
return nil return nil

6
integration/route_test.go
View File

@ -796,7 +796,7 @@ func TestEnableDisableAutoApprovedRoute(t *testing.T) {
}, },
}, },
TagOwners: map[string][]string{ TagOwners: map[string][]string{
"tag:approve": {"user1"}, "tag:approve": {"user1@"},
}, },
AutoApprovers: policyv1.AutoApprovers{ AutoApprovers: policyv1.AutoApprovers{
Routes: map[string][]string{ Routes: map[string][]string{
@ -901,7 +901,7 @@ func TestAutoApprovedSubRoute2068(t *testing.T) {
}, },
}, },
TagOwners: map[string][]string{ TagOwners: map[string][]string{
"tag:approve": {user}, "tag:approve": {user + "@"},
}, },
AutoApprovers: policyv1.AutoApprovers{ AutoApprovers: policyv1.AutoApprovers{
Routes: map[string][]string{ Routes: map[string][]string{
@ -964,7 +964,7 @@ func TestSubnetRouteACL(t *testing.T) {
}, hsic.WithTestName("clienableroute"), hsic.WithACLPolicy( }, hsic.WithTestName("clienableroute"), hsic.WithACLPolicy(
&policyv1.ACLPolicy{ &policyv1.ACLPolicy{
Groups: policyv1.Groups{ Groups: policyv1.Groups{
"group:admins": {user}, "group:admins": {user + "@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {

14
integration/ssh_test.go
View File

@ -26,7 +26,7 @@ var retry = func(times int, sleepInterval time.Duration,
var stderr string var stderr string
var err error var err error
for attempts := 0; attempts < times; attempts++ { for range times {
tempResult, tempStderr, err := doWork() tempResult, tempStderr, err := doWork()
result += tempResult result += tempResult
@ -94,7 +94,7 @@ func TestSSHOneUserToAll(t *testing.T) {
scenario := sshScenario(t, scenario := sshScenario(t,
&policyv1.ACLPolicy{ &policyv1.ACLPolicy{
Groups: map[string][]string{ Groups: map[string][]string{
"group:integration-test": {"user1"}, "group:integration-test": {"user1@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
@ -159,7 +159,7 @@ func TestSSHMultipleUsersAllToAll(t *testing.T) {
scenario := sshScenario(t, scenario := sshScenario(t,
&policyv1.ACLPolicy{ &policyv1.ACLPolicy{
Groups: map[string][]string{ Groups: map[string][]string{
"group:integration-test": {"user1", "user2"}, "group:integration-test": {"user1@", "user2@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
@ -212,7 +212,7 @@ func TestSSHNoSSHConfigured(t *testing.T) {
scenario := sshScenario(t, scenario := sshScenario(t,
&policyv1.ACLPolicy{ &policyv1.ACLPolicy{
Groups: map[string][]string{ Groups: map[string][]string{
"group:integration-test": {"user1"}, "group:integration-test": {"user1@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
@ -254,7 +254,7 @@ func TestSSHIsBlockedInACL(t *testing.T) {
scenario := sshScenario(t, scenario := sshScenario(t,
&policyv1.ACLPolicy{ &policyv1.ACLPolicy{
Groups: map[string][]string{ Groups: map[string][]string{
"group:integration-test": {"user1"}, "group:integration-test": {"user1@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {
@ -303,8 +303,8 @@ func TestSSHUserOnlyIsolation(t *testing.T) {
scenario := sshScenario(t, scenario := sshScenario(t,
&policyv1.ACLPolicy{ &policyv1.ACLPolicy{
Groups: map[string][]string{ Groups: map[string][]string{
"group:ssh1": {"user1"}, "group:ssh1": {"user1@"},
"group:ssh2": {"user2"}, "group:ssh2": {"user2@"},
}, },
ACLs: []policyv1.ACL{ ACLs: []policyv1.ACL{
{ {