eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

allow users to be defined with @ in v1 (#2495)

Browse source 
* allow users to be defined with @ in v1

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* remove integration test rewrite hack

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* remove test rewrite hack

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* add @ to integration tests

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* a bit to agressive removeals

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* fix last test

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

---------

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2025-03-30 13:19:05 +02:00 • committed by GitHub
parent f52f15ff08
commit e3521be705
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 76 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

29
integration/cli_test.go
View file

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