From d3661204e7d487cf0211ebb83c7ce799134aa7cd Mon Sep 17 00:00:00 2001 From: hopleus Date: Thu, 17 Oct 2024 12:21:02 +0300 Subject: [PATCH] Corrected unit tests and integration tests --- hscontrol/db/node_test.go | 18 +++++++++--------- hscontrol/db/preauth_keys_test.go | 22 +++++++++++----------- hscontrol/db/routes_test.go | 8 ++++---- hscontrol/db/users_test.go | 6 +++--- integration/embedded_derp_test.go | 2 +- integration/general_test.go | 6 +++--- integration/scenario.go | 2 +- integration/scenario_test.go | 4 ++-- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/hscontrol/db/node_test.go b/hscontrol/db/node_test.go index 83490ac2..cdf1f688 100644 --- a/hscontrol/db/node_test.go +++ b/hscontrol/db/node_test.go @@ -88,7 +88,7 @@ func (s *Suite) TestGetNodeByAnyNodeKey(c *check.C) { user, err := db.CreateUser("test") 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) _, err = db.GetNodeByID(0) @@ -144,7 +144,7 @@ func (s *Suite) TestListPeers(c *check.C) { user, err := db.CreateUser("test") 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) _, err = db.GetNodeByID(0) @@ -238,7 +238,7 @@ func (s *Suite) TestGetACLFilteredPeers(c *check.C) { for _, name := range []string{"test", "admin"} { user, err := db.CreateUser(name) 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) stor = append(stor, base{user, pak}) } @@ -331,7 +331,7 @@ func (s *Suite) TestApprovedNode(c *check.C) { user, err := db.CreateUser("test") 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) _, err = db.getNode(types.UserID(user.ID), "testnode") @@ -371,7 +371,7 @@ func (s *Suite) TestExpireNode(c *check.C) { user, err := db.CreateUser("test") 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) _, err = db.getNode(types.UserID(user.ID), "testnode") @@ -412,7 +412,7 @@ func (s *Suite) TestSetTags(c *check.C) { user, err := db.CreateUser("test") 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) _, err = db.getNode(types.UserID(user.ID), "testnode") @@ -657,7 +657,7 @@ func TestAutoApproveRoutes(t *testing.T) { user, err := adb.CreateUser("test") 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) nodeKey := key.NewNode() @@ -798,10 +798,10 @@ func TestListEphemeralNodes(t *testing.T) { user, err := db.CreateUser("test") 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) - 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) node := types.Node{ diff --git a/hscontrol/db/preauth_keys_test.go b/hscontrol/db/preauth_keys_test.go index 618c3d89..c8e80001 100644 --- a/hscontrol/db/preauth_keys_test.go +++ b/hscontrol/db/preauth_keys_test.go @@ -12,13 +12,13 @@ import ( func (*Suite) TestCreatePreAuthKey(c *check.C) { // 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) user, err := db.CreateUser("test") 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) // Did we get a valid key? @@ -45,7 +45,7 @@ func (*Suite) TestExpiredPreAuthKey(c *check.C) { c.Assert(err, check.IsNil) 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) key, err := db.ValidatePreAuthKey(pak.Key) @@ -73,7 +73,7 @@ func (*Suite) TestValidateKeyOk(c *check.C) { user, err := db.CreateUser("test3") 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) key, err := db.ValidatePreAuthKey(pak.Key) @@ -85,7 +85,7 @@ func (*Suite) TestAlreadyUsedKey(c *check.C) { user, err := db.CreateUser("test4") 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) node := types.Node{ @@ -107,7 +107,7 @@ func (*Suite) TestReusableBeingUsedKey(c *check.C) { user, err := db.CreateUser("test5") 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) node := types.Node{ @@ -129,7 +129,7 @@ func (*Suite) TestNotReusableNotBeingUsedKey(c *check.C) { user, err := db.CreateUser("test6") 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) key, err := db.ValidatePreAuthKey(pak.Key) @@ -141,7 +141,7 @@ func (*Suite) TestExpirePreauthKey(c *check.C) { user, err := db.CreateUser("test3") 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(pak.Expiration, check.IsNil) @@ -158,7 +158,7 @@ func (*Suite) TestNotReusableMarkedAsUsed(c *check.C) { user, err := db.CreateUser("test6") 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) pak.Used = true db.DB.Save(&pak) @@ -171,12 +171,12 @@ func (*Suite) TestPreAuthKeyACLTags(c *check.C) { user, err := db.CreateUser("test8") 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 tags := []string{"tag:test1", "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) listedPaks, err := db.ListPreAuthKeys(types.UserID(user.ID)) diff --git a/hscontrol/db/routes_test.go b/hscontrol/db/routes_test.go index 57984015..412a256e 100644 --- a/hscontrol/db/routes_test.go +++ b/hscontrol/db/routes_test.go @@ -35,7 +35,7 @@ func (s *Suite) TestGetRoutes(c *check.C) { user, err := db.CreateUser("test") 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) _, 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") 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) _, 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") 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) _, 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") 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) _, err = db.getNode(types.UserID(user.ID), "test_enable_route_node") diff --git a/hscontrol/db/users_test.go b/hscontrol/db/users_test.go index 05cbb505..e34111bd 100644 --- a/hscontrol/db/users_test.go +++ b/hscontrol/db/users_test.go @@ -33,7 +33,7 @@ func (s *Suite) TestDestroyUserErrors(c *check.C) { user, err := db.CreateUser("test") 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) err = db.DestroyUser(types.UserID(user.ID)) @@ -46,7 +46,7 @@ func (s *Suite) TestDestroyUserErrors(c *check.C) { user, err = db.CreateUser("test") 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) node := types.Node{ @@ -104,7 +104,7 @@ func (s *Suite) TestSetMachineUser(c *check.C) { newUser, err := db.CreateUser("new") 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) node := types.Node{ diff --git a/integration/embedded_derp_test.go b/integration/embedded_derp_test.go index c5a4ad85..c187f2ba 100644 --- a/integration/embedded_derp_test.go +++ b/integration/embedded_derp_test.go @@ -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 { return err } diff --git a/integration/general_test.go b/integration/general_test.go index 90f8e96a..c7c962d1 100644 --- a/integration/general_test.go +++ b/integration/general_test.go @@ -176,7 +176,7 @@ func TestAuthKeyLogoutAndRelogin(t *testing.T) { } for userName := range spec { - key, err := scenario.CreatePreAuthKey(userName, true, true, false) + key, err := scenario.CreatePreAuthKey(userName, true, false, false) if err != nil { 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) } - key, err := scenario.CreatePreAuthKey(userName, true, true, true) + key, err := scenario.CreatePreAuthKey(userName, true, false, true) if err != nil { 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) } - key, err := scenario.CreatePreAuthKey(userName, true, true, true) + key, err := scenario.CreatePreAuthKey(userName, true, false, true) if err != nil { t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err) } diff --git a/integration/scenario.go b/integration/scenario.go index 854bcde4..c40fd366 100644 --- a/integration/scenario.go +++ b/integration/scenario.go @@ -514,7 +514,7 @@ func (s *Scenario) CreateHeadscaleEnv( return err } - key, err := s.CreatePreAuthKey(userName, true, true, false) + key, err := s.CreatePreAuthKey(userName, true, false, false) if err != nil { return err } diff --git a/integration/scenario_test.go b/integration/scenario_test.go index caf11c90..5193ad63 100644 --- a/integration/scenario_test.go +++ b/integration/scenario_test.go @@ -61,7 +61,7 @@ func TestHeadscale(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 { 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) { - key, err := scenario.CreatePreAuthKey(user, true, true, false) + key, err := scenario.CreatePreAuthKey(user, true, false, false) if err != nil { t.Fatalf("failed to create preauthkey: %s", err) }