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

14
integration/ssh_test.go
View file

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