Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-10-28 10:51:44 +01:00
Code Issues Projects Releases Wiki Activity

Corrected unit tests and integration tests

Browse Source
This commit is contained in:
hopleus 2024-10-17 12:21:02 +03:00
parent a9dbbd349a
commit d3661204e7
8 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hscontrol/db/node_test.go
View File

@ -88,7 +88,7 @@ func (s *Suite) TestGetNodeByAnyNodeKey(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.GetNodeByID(0) _, err = db.GetNodeByID(0)
@ -144,7 +144,7 @@ func (s *Suite) TestListPeers(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.GetNodeByID(0) _, err = db.GetNodeByID(0)
@ -238,7 +238,7 @@ func (s *Suite) TestGetACLFilteredPeers(c *check.C) {
for _, name := range []string{"test", "admin"} { for _, name := range []string{"test", "admin"} {
user, err := db.CreateUser(name) user, err := db.CreateUser(name)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
stor = append(stor, base{user, pak}) stor = append(stor, base{user, pak})
} }
@ -331,7 +331,7 @@ func (s *Suite) TestApprovedNode(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, true, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.getNode(types.UserID(user.ID), "testnode") _, err = db.getNode(types.UserID(user.ID), "testnode")
@ -371,7 +371,7 @@ func (s *Suite) TestExpireNode(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.getNode(types.UserID(user.ID), "testnode") _, err = db.getNode(types.UserID(user.ID), "testnode")
@ -412,7 +412,7 @@ func (s *Suite) TestSetTags(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.getNode(types.UserID(user.ID), "testnode") _, err = db.getNode(types.UserID(user.ID), "testnode")
@ -657,7 +657,7 @@ func TestAutoApproveRoutes(t *testing.T) {
user, err := adb.CreateUser("test") user, err := adb.CreateUser("test")
require.NoError(t, err) require.NoError(t, err)
pak, err := adb.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := adb.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
require.NoError(t, err) require.NoError(t, err)
nodeKey := key.NewNode() nodeKey := key.NewNode()
@ -798,10 +798,10 @@ func TestListEphemeralNodes(t *testing.T) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
require.NoError(t, err) require.NoError(t, err)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
require.NoError(t, err) require.NoError(t, err)
pakEph, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, true, nil, nil) pakEph, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, true, nil, nil)
require.NoError(t, err) require.NoError(t, err)
node := types.Node{ node := types.Node{

22
hscontrol/db/preauth_keys_test.go
View File

@ -12,13 +12,13 @@ import (
func (*Suite) TestCreatePreAuthKey(c *check.C) { func (*Suite) TestCreatePreAuthKey(c *check.C) {
// ID does not exist // ID does not exist
_, err := db.CreatePreAuthKey(12345, true, true, false, nil, nil) _, err := db.CreatePreAuthKey(12345, true, false, false, nil, nil)
c.Assert(err, check.NotNil) c.Assert(err, check.NotNil)
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
key, err := db.CreatePreAuthKey(types.UserID(user.ID), true, true, false, nil, nil) key, err := db.CreatePreAuthKey(types.UserID(user.ID), true, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
// Did we get a valid key? // Did we get a valid key?
@ -45,7 +45,7 @@ func (*Suite) TestExpiredPreAuthKey(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
now := time.Now().Add(-5 * time.Second) now := time.Now().Add(-5 * time.Second)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, true, false, &now, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, false, false, &now, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
key, err := db.ValidatePreAuthKey(pak.Key) key, err := db.ValidatePreAuthKey(pak.Key)
@ -73,7 +73,7 @@ func (*Suite) TestValidateKeyOk(c *check.C) {
user, err := db.CreateUser("test3") user, err := db.CreateUser("test3")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
key, err := db.ValidatePreAuthKey(pak.Key) key, err := db.ValidatePreAuthKey(pak.Key)
@ -85,7 +85,7 @@ func (*Suite) TestAlreadyUsedKey(c *check.C) {
user, err := db.CreateUser("test4") user, err := db.CreateUser("test4")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
node := types.Node{ node := types.Node{
@ -107,7 +107,7 @@ func (*Suite) TestReusableBeingUsedKey(c *check.C) {
user, err := db.CreateUser("test5") user, err := db.CreateUser("test5")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
node := types.Node{ node := types.Node{
@ -129,7 +129,7 @@ func (*Suite) TestNotReusableNotBeingUsedKey(c *check.C) {
user, err := db.CreateUser("test6") user, err := db.CreateUser("test6")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
key, err := db.ValidatePreAuthKey(pak.Key) key, err := db.ValidatePreAuthKey(pak.Key)
@ -141,7 +141,7 @@ func (*Suite) TestExpirePreauthKey(c *check.C) {
user, err := db.CreateUser("test3") user, err := db.CreateUser("test3")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), true, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(pak.Expiration, check.IsNil) c.Assert(pak.Expiration, check.IsNil)
@ -158,7 +158,7 @@ func (*Suite) TestNotReusableMarkedAsUsed(c *check.C) {
user, err := db.CreateUser("test6") user, err := db.CreateUser("test6")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak.Used = true pak.Used = true
db.DB.Save(&pak) db.DB.Save(&pak)
@ -171,12 +171,12 @@ func (*Suite) TestPreAuthKeyACLTags(c *check.C) {
user, err := db.CreateUser("test8") user, err := db.CreateUser("test8")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, []string{"badtag"}) _, err = db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, []string{"badtag"})
c.Assert(err, check.NotNil) // Confirm that malformed tags are rejected c.Assert(err, check.NotNil) // Confirm that malformed tags are rejected
tags := []string{"tag:test1", "tag:test2"} tags := []string{"tag:test1", "tag:test2"}
tagsWithDuplicate := []string{"tag:test1", "tag:test2", "tag:test2"} tagsWithDuplicate := []string{"tag:test1", "tag:test2", "tag:test2"}
_, err = db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, tagsWithDuplicate) _, err = db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, tagsWithDuplicate)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
listedPaks, err := db.ListPreAuthKeys(types.UserID(user.ID)) listedPaks, err := db.ListPreAuthKeys(types.UserID(user.ID))

8
hscontrol/db/routes_test.go
View File

@ -35,7 +35,7 @@ func (s *Suite) TestGetRoutes(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.getNode(types.UserID(user.ID), "test_get_route_node") _, err = db.getNode(types.UserID(user.ID), "test_get_route_node")
@ -79,7 +79,7 @@ func (s *Suite) TestGetEnableRoutes(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.getNode(types.UserID(user.ID), "test_enable_route_node") _, err = db.getNode(types.UserID(user.ID), "test_enable_route_node")
@ -153,7 +153,7 @@ func (s *Suite) TestIsUniquePrefix(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.getNode(types.UserID(user.ID), "test_enable_route_node") _, err = db.getNode(types.UserID(user.ID), "test_enable_route_node")
@ -234,7 +234,7 @@ func (s *Suite) TestDeleteRoutes(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
_, err = db.getNode(types.UserID(user.ID), "test_enable_route_node") _, err = db.getNode(types.UserID(user.ID), "test_enable_route_node")

6
hscontrol/db/users_test.go
View File

@ -33,7 +33,7 @@ func (s *Suite) TestDestroyUserErrors(c *check.C) {
user, err := db.CreateUser("test") user, err := db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
err = db.DestroyUser(types.UserID(user.ID)) err = db.DestroyUser(types.UserID(user.ID))
@ -46,7 +46,7 @@ func (s *Suite) TestDestroyUserErrors(c *check.C) {
user, err = db.CreateUser("test") user, err = db.CreateUser("test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err = db.CreatePreAuthKey(types.UserID(user.ID), false, true, false, nil, nil) pak, err = db.CreatePreAuthKey(types.UserID(user.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
node := types.Node{ node := types.Node{
@ -104,7 +104,7 @@ func (s *Suite) TestSetMachineUser(c *check.C) {
newUser, err := db.CreateUser("new") newUser, err := db.CreateUser("new")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
pak, err := db.CreatePreAuthKey(types.UserID(oldUser.ID), false, true, false, nil, nil) pak, err := db.CreatePreAuthKey(types.UserID(oldUser.ID), false, false, false, nil, nil)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
node := types.Node{ node := types.Node{

2
integration/embedded_derp_test.go
View File

@ -254,7 +254,7 @@ func (s *EmbeddedDERPServerScenario) CreateHeadscaleEnv(
} }
} }
key, err := s.CreatePreAuthKey(userName, true, true, false) key, err := s.CreatePreAuthKey(userName, true, false, false)
if err != nil { if err != nil {
return err return err
} }

6
integration/general_test.go
View File

@ -176,7 +176,7 @@ func TestAuthKeyLogoutAndRelogin(t *testing.T) {
} }
for userName := range spec { for userName := range spec {
key, err := scenario.CreatePreAuthKey(userName, true, true, false) key, err := scenario.CreatePreAuthKey(userName, true, false, false)
if err != nil { if err != nil {
t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err) t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
} }
@ -279,7 +279,7 @@ func testEphemeralWithOptions(t *testing.T, opts ...hsic.Option) {
t.Fatalf("failed to create tailscale nodes in user %s: %s", userName, err) t.Fatalf("failed to create tailscale nodes in user %s: %s", userName, err)
} }
key, err := scenario.CreatePreAuthKey(userName, true, true, true) key, err := scenario.CreatePreAuthKey(userName, true, false, true)
if err != nil { if err != nil {
t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err) t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
} }
@ -369,7 +369,7 @@ func TestEphemeral2006DeletedTooQuickly(t *testing.T) {
t.Fatalf("failed to create tailscale nodes in user %s: %s", userName, err) t.Fatalf("failed to create tailscale nodes in user %s: %s", userName, err)
} }
key, err := scenario.CreatePreAuthKey(userName, true, true, true) key, err := scenario.CreatePreAuthKey(userName, true, false, true)
if err != nil { if err != nil {
t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err) t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
} }

2
integration/scenario.go
View File

@ -514,7 +514,7 @@ func (s *Scenario) CreateHeadscaleEnv(
return err return err
} }
key, err := s.CreatePreAuthKey(userName, true, true, false) key, err := s.CreatePreAuthKey(userName, true, false, false)
if err != nil { if err != nil {
return err return err
} }

4
integration/scenario_test.go
View File

@ -61,7 +61,7 @@ func TestHeadscale(t *testing.T) {
}) })
t.Run("create-auth-key", func(t *testing.T) { t.Run("create-auth-key", func(t *testing.T) {
_, err := scenario.CreatePreAuthKey(user, true, true, false) _, err := scenario.CreatePreAuthKey(user, true, false, false)
if err != nil { if err != nil {
t.Fatalf("failed to create preauthkey: %s", err) t.Fatalf("failed to create preauthkey: %s", err)
} }
@ -153,7 +153,7 @@ func TestTailscaleNodesJoiningHeadcale(t *testing.T) {
}) })
t.Run("join-headscale", func(t *testing.T) { t.Run("join-headscale", func(t *testing.T) {
key, err := scenario.CreatePreAuthKey(user, true, true, false) key, err := scenario.CreatePreAuthKey(user, true, false, false)
if err != nil { if err != nil {
t.Fatalf("failed to create preauthkey: %s", err) t.Fatalf("failed to create preauthkey: %s", err)
} }