Skip to content

Commit

Permalink
Corrected existing integration tests. New integration tests added
Browse files Browse the repository at this point in the history
  • Loading branch information
hopleus committed Oct 17, 2024
1 parent 806c3bf commit 85966d2
Show file tree
Hide file tree
Showing 10 changed files with 382 additions and 9 deletions.
281 changes: 281 additions & 0 deletions integration/auth_approval_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,281 @@
package integration

import (
"context"
"fmt"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/juanfont/headscale/integration/hsic"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"io"
"log"
"net/http"
"net/netip"
"net/url"
"strings"
"testing"
)

type AuthApprovalScenario struct {
*Scenario
}

func TestAuthNodeApproval(t *testing.T) {
IntegrationSkip(t)
t.Parallel()

baseScenario, err := NewScenario(dockertestMaxWait())
assertNoErr(t, err)

scenario := AuthApprovalScenario{
Scenario: baseScenario,
}
defer scenario.ShutdownAssertNoPanics(t)

spec := map[string]int{
"user1": len(MustTestVersions),
}

err = scenario.CreateHeadscaleEnv(
spec,
hsic.WithTestName("approval"),
hsic.WithManualApproveNewNode(),
)
assertNoErrHeadscaleEnv(t, err)

allClients, err := scenario.ListTailscaleClients()
assertNoErrListClients(t, err)

err = scenario.WaitForTailscaleSyncWithPeerCount(0)
assertNoErrSync(t, err)

for _, client := range allClients {
status, err := client.Status()
assertNoErr(t, err)
assert.Equal(t, "NeedsMachineAuth", status.BackendState)
assert.Len(t, status.Peers(), 0)
}

headscale, err := scenario.Headscale()
assertNoErr(t, err)

var allNodes []*v1.Node
err = executeAndUnmarshal(
headscale,
[]string{
"headscale",
"nodes",
"list",
"--output",
"json",
},
&allNodes,
)
assert.Nil(t, err)

for _, node := range allNodes {
_, err = headscale.Execute([]string{
"headscale", "nodes", "approve", "--identifier", fmt.Sprintf("%d", node.Id),
})
assertNoErr(t, err)
}

for _, client := range allClients {
err = client.Logout()
if err != nil {
t.Fatalf("failed to logout client %s: %s", client.Hostname(), err)
}
}

err = scenario.WaitForTailscaleLogout()
assertNoErrLogout(t, err)

t.Logf("all clients logged out")

for userName := range spec {
err = scenario.runTailscaleUp(userName, headscale.GetEndpoint(), true)
if err != nil {
t.Fatalf("failed to run tailscale up: %s", err)
}
}

t.Logf("all clients logged in again")

allClients, err = scenario.ListTailscaleClients()
assertNoErrListClients(t, err)

allIps, err := scenario.ListTailscaleClientsIPs()
assertNoErrListClientIPs(t, err)

err = scenario.WaitForTailscaleSync()
assertNoErrSync(t, err)

//assertClientsState(t, allClients)

allAddrs := lo.Map(allIps, func(x netip.Addr, index int) string {
return x.String()
})

success := pingAllHelper(t, allClients, allAddrs)
t.Logf("before expire: %d successful pings out of %d", success, len(allClients)*len(allIps))

for _, client := range allClients {
status, err := client.Status()
assertNoErr(t, err)

// Assert that we have the original count - self
assert.Len(t, status.Peers(), len(MustTestVersions)-1)
}
}

func (s *AuthApprovalScenario) CreateHeadscaleEnv(
users map[string]int,
opts ...hsic.Option,
) error {
headscale, err := s.Headscale(opts...)
if err != nil {
return err
}

err = headscale.WaitForRunning()
if err != nil {
return err
}

for userName, clientCount := range users {
log.Printf("creating user %s with %d clients", userName, clientCount)
err = s.CreateUser(userName)
if err != nil {
return err
}

err = s.CreateTailscaleNodesInUser(userName, "all", clientCount)
if err != nil {
return err
}

err = s.runTailscaleUp(userName, headscale.GetEndpoint(), false)
if err != nil {
return err
}
}

return nil
}

func (s *AuthApprovalScenario) runTailscaleUp(
userStr, loginServer string,
withApproved bool,
) error {
log.Printf("running tailscale up for user %s", userStr)
if user, ok := s.users[userStr]; ok {
for _, client := range user.Clients {
c := client
user.joinWaitGroup.Go(func() error {
loginURL, err := c.LoginWithURL(loginServer)
if err != nil {
log.Printf("failed to run tailscale up (%s): %s", c.Hostname(), err)

return err
}

err = s.runHeadscaleRegister(userStr, loginURL)
if err != nil {
log.Printf("failed to register client (%s): %s", c.Hostname(), err)

return err
}

return nil
})

if withApproved {
err := client.WaitForRunning()
if err != nil {
log.Printf("error waiting for client %s to be approval: %s", client.Hostname(), err)
}
} else {
err := client.WaitForNeedsApprove()
if err != nil {
log.Printf("error waiting for client %s to be approval: %s", client.Hostname(), err)
}
}
}

if err := user.joinWaitGroup.Wait(); err != nil {
return err
}

for _, client := range user.Clients {
if withApproved {
err := client.WaitForRunning()
if err != nil {
return fmt.Errorf("%s failed to up tailscale node: %w", client.Hostname(), err)
}
} else {
err := client.WaitForNeedsApprove()
if err != nil {
return fmt.Errorf("%s failed to up tailscale node: %w", client.Hostname(), err)
}
}
}

return nil
}

return fmt.Errorf("failed to up tailscale node: %w", errNoUserAvailable)
}

func (s *AuthApprovalScenario) runHeadscaleRegister(userStr string, loginURL *url.URL) error {
headscale, err := s.Headscale()
if err != nil {
return err
}

log.Printf("loginURL: %s", loginURL)
loginURL.Host = fmt.Sprintf("%s:8080", headscale.GetIP())
loginURL.Scheme = "http"

httpClient := &http.Client{}
ctx := context.Background()
req, _ := http.NewRequestWithContext(ctx, http.MethodGet, loginURL.String(), nil)
resp, err := httpClient.Do(req)
if err != nil {
return err
}

body, err := io.ReadAll(resp.Body)
if err != nil {
return err
}

defer resp.Body.Close()

// see api.go HTML template
codeSep := strings.Split(string(body), "</code>")
if len(codeSep) != 2 {
return errParseAuthPage
}

keySep := strings.Split(codeSep[0], "key ")
if len(keySep) != 2 {
return errParseAuthPage
}
key := keySep[1]
log.Printf("registering node %s", key)

if headscale, err := s.Headscale(); err == nil {
_, err = headscale.Execute(
[]string{"headscale", "nodes", "register", "--user", userStr, "--key", key},
)
if err != nil {
log.Printf("failed to register node: %s", err)

return err
}

return nil
}

return fmt.Errorf("failed to find headscale: %w", errNoHeadscaleAvailable)
}
56 changes: 56 additions & 0 deletions integration/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,62 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
assert.Len(t, listedPreAuthKeys, 3)
}

func TestPreAuthKeyCommandPreApproved(t *testing.T) {
IntegrationSkip(t)
t.Parallel()

user := "pre-auth-key-pre-approved-user"

scenario, err := NewScenario(dockertestMaxWait())
assertNoErr(t, err)
defer scenario.ShutdownAssertNoPanics(t)

spec := map[string]int{
user: 0,
}

err = scenario.CreateHeadscaleEnv(spec, []tsic.Option{}, hsic.WithTestName("clipakresueeph"))
assertNoErr(t, err)

headscale, err := scenario.Headscale()
assertNoErr(t, err)

var preAuthGeneralKey v1.PreAuthKey
err = executeAndUnmarshal(
headscale,
[]string{
"headscale",
"preauthkeys",
"--user",
user,
"create",
"--output",
"json",
},
&preAuthGeneralKey,
)
assertNoErr(t, err)
assert.False(t, preAuthGeneralKey.GetPreApproved())

var preAuthPreApprovedKey v1.PreAuthKey
err = executeAndUnmarshal(
headscale,
[]string{
"headscale",
"preauthkeys",
"--user",
user,
"create",
"--pre-approved",
"--output",
"json",
},
&preAuthPreApprovedKey,
)
assertNoErr(t, err)
assert.True(t, preAuthPreApprovedKey.GetPreApproved())
}

func TestPreAuthKeyCorrectUserLoggedInCommand(t *testing.T) {
IntegrationSkip(t)
t.Parallel()
Expand Down
2 changes: 1 addition & 1 deletion integration/control.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type ControlServer interface {
GetEndpoint() string
WaitForRunning() error
CreateUser(user string) error
CreateAuthKey(user string, reusable bool, ephemeral bool) (*v1.PreAuthKey, error)
CreateAuthKey(user string, reusable bool, preApproved bool, ephemeral bool) (*v1.PreAuthKey, error)
ListNodesInUser(user string) ([]*v1.Node, error)
GetCert() []byte
GetHostname() string
Expand Down
2 changes: 1 addition & 1 deletion integration/embedded_derp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func (s *EmbeddedDERPServerScenario) CreateHeadscaleEnv(
}
}

key, err := s.CreatePreAuthKey(userName, true, false)
key, err := s.CreatePreAuthKey(userName, true, true, false)
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions integration/general_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func TestAuthKeyLogoutAndRelogin(t *testing.T) {
}

for userName := range spec {
key, err := scenario.CreatePreAuthKey(userName, true, false)
key, err := scenario.CreatePreAuthKey(userName, true, true, false)
if err != nil {
t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
}
Expand Down Expand Up @@ -272,7 +272,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)
key, err := scenario.CreatePreAuthKey(userName, true, true, true)
if err != nil {
t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
}
Expand Down Expand Up @@ -362,7 +362,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)
key, err := scenario.CreatePreAuthKey(userName, true, true, true)
if err != nil {
t.Fatalf("failed to create pre-auth key for user %s: %s", userName, err)
}
Expand Down
Loading

0 comments on commit 85966d2

Please sign in to comment.