Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-08-10 13:46:46 +02:00
Code Issues Projects Releases Wiki Activity

Merge e54bb9763c into b904276f2b

Browse Source
This commit is contained in:
tevinflores 2025-07-08 21:06:13 +02:00 committed by GitHub
commit e0e3976104
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 227 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/headscale/cli/debug.go
View File

@ -27,17 +27,11 @@ func init() {
if err != nil {
log.Fatal().Err(err).Msg("")
}
createNodeCmd.Flags().StringP("user", "u", "", "User")
usernameAndIDFlag(createNodeCmd)
createNodeCmd.Flags().StringP("namespace", "n", "", "User")
createNodeNamespaceFlag := createNodeCmd.Flags().Lookup("namespace")
createNodeNamespaceFlag.Deprecated = deprecateNamespaceMessage
createNodeNamespaceFlag.Hidden = true
err = createNodeCmd.MarkFlagRequired("user")
if err != nil {
log.Fatal().Err(err).Msg("")
}
createNodeCmd.Flags().StringP("key", "k", "", "Key")
err = createNodeCmd.MarkFlagRequired("key")
if err != nil {
@ -61,15 +55,16 @@ var createNodeCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
user, err := cmd.Flags().GetString("user")
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error getting user: %s", err), output)
}
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
user, err := findSingleUser(ctx, client, cmd, "debug-createNodeCmd", output)
if err != nil {
// The helper already calls ErrorOutput, so we can just return
return
}
name, err := cmd.Flags().GetString("name")
if err != nil {
ErrorOutput(
@ -109,7 +104,7 @@ var createNodeCmd = &cobra.Command{
request := &v1.DebugCreateNodeRequest{
Key: registrationID,
Name: name,
User: user,
User: user.GetName(),
Routes: routes,
}

127
cmd/headscale/cli/nodes.go
View File

@ -21,84 +21,58 @@ import (
func init() {
rootCmd.AddCommand(nodeCmd)
listNodesCmd.Flags().StringP("user", "u", "", "Filter by user")
listNodesCmd.Flags().BoolP("tags", "t", false, "Show tags")
listNodesCmd.Flags().StringP("namespace", "n", "", "User")
listNodesNamespaceFlag := listNodesCmd.Flags().Lookup("namespace")
listNodesNamespaceFlag.Deprecated = deprecateNamespaceMessage
listNodesNamespaceFlag.Hidden = true
usernameAndIDFlag(listNodesCmd)
nodeCmd.AddCommand(listNodesCmd)
listNodeRoutesCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
listNodeRoutesCmd.Flags().Uint64P("node-id", "n", 0, "Node identifier (ID)")
nodeCmd.AddCommand(listNodeRoutesCmd)
registerNodeCmd.Flags().StringP("user", "u", "", "User")
registerNodeCmd.Flags().StringP("namespace", "n", "", "User")
registerNodeNamespaceFlag := registerNodeCmd.Flags().Lookup("namespace")
registerNodeNamespaceFlag.Deprecated = deprecateNamespaceMessage
registerNodeNamespaceFlag.Hidden = true
err := registerNodeCmd.MarkFlagRequired("user")
if err != nil {
log.Fatal(err.Error())
}
usernameAndIDFlag(registerNodeCmd)
registerNodeCmd.Flags().StringP("key", "k", "", "Key")
err = registerNodeCmd.MarkFlagRequired("key")
err := registerNodeCmd.MarkFlagRequired("key")
if err != nil {
log.Fatal(err.Error())
}
nodeCmd.AddCommand(registerNodeCmd)
expireNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
err = expireNodeCmd.MarkFlagRequired("identifier")
expireNodeCmd.Flags().Uint64P("node-id", "n", 0, "Node identifier (ID)")
err = expireNodeCmd.MarkFlagRequired("node-id")
if err != nil {
log.Fatal(err.Error())
}
nodeCmd.AddCommand(expireNodeCmd)
renameNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
err = renameNodeCmd.MarkFlagRequired("identifier")
renameNodeCmd.Flags().Uint64P("node-id", "n", 0, "Node identifier (ID)")
err = renameNodeCmd.MarkFlagRequired("node-id")
if err != nil {
log.Fatal(err.Error())
}
nodeCmd.AddCommand(renameNodeCmd)
deleteNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
err = deleteNodeCmd.MarkFlagRequired("identifier")
deleteNodeCmd.Flags().Uint64P("node-id", "n", 0, "Node identifier (ID)")
err = deleteNodeCmd.MarkFlagRequired("node-id")
if err != nil {
log.Fatal(err.Error())
}
nodeCmd.AddCommand(deleteNodeCmd)
moveNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
moveNodeCmd.Flags().Uint64P("node-id", "n", 0, "Node identifier (ID)")
err = moveNodeCmd.MarkFlagRequired("identifier")
err = moveNodeCmd.MarkFlagRequired("node-id")
if err != nil {
log.Fatal(err.Error())
}
moveNodeCmd.Flags().Uint64P("user", "u", 0, "New user")
usernameAndIDFlag(moveNodeCmd, "Target user ID to move the node to", "Target username to move the node to")
moveNodeCmd.Flags().StringP("namespace", "n", "", "User")
moveNodeNamespaceFlag := moveNodeCmd.Flags().Lookup("namespace")
moveNodeNamespaceFlag.Deprecated = deprecateNamespaceMessage
moveNodeNamespaceFlag.Hidden = true
err = moveNodeCmd.MarkFlagRequired("user")
if err != nil {
log.Fatal(err.Error())
}
nodeCmd.AddCommand(moveNodeCmd)
tagCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
tagCmd.MarkFlagRequired("identifier")
tagCmd.Flags().Uint64P("node-id", "n", 0, "Node identifier (ID)")
tagCmd.MarkFlagRequired("node-id")
tagCmd.Flags().StringSliceP("tags", "t", []string{}, "List of tags to add to the node")
nodeCmd.AddCommand(tagCmd)
approveRoutesCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
approveRoutesCmd.MarkFlagRequired("identifier")
approveRoutesCmd.Flags().Uint64P("node-id", "n", 0, "Node identifier (ID)")
approveRoutesCmd.MarkFlagRequired("node-id")
approveRoutesCmd.Flags().StringSliceP("routes", "r", []string{}, `List of routes that will be approved (comma-separated, e.g. "10.0.0.0/8,192.168.0.0/24" or empty string to remove all approved routes)`)
nodeCmd.AddCommand(approveRoutesCmd)
@ -116,15 +90,17 @@ var registerNodeCmd = &cobra.Command{
Short: "Registers a node to your network",
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
user, err := cmd.Flags().GetString("user")
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error getting user: %s", err), output)
}
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
user, err := findSingleUser(ctx, client, cmd, "registerNodeCmd", output)
if err != nil {
// The helper already calls ErrorOutput, so we can just return
return
}
registrationID, err := cmd.Flags().GetString("key")
if err != nil {
ErrorOutput(
@ -136,7 +112,7 @@ var registerNodeCmd = &cobra.Command{
request := &v1.RegisterNodeRequest{
Key: registrationID,
User: user,
User: user.GetName(),
}
response, err := client.RegisterNode(ctx, request)
@ -163,10 +139,6 @@ var listNodesCmd = &cobra.Command{
Aliases: []string{"ls", "show"},
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
user, err := cmd.Flags().GetString("user")
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error getting user: %s", err), output)
}
showTags, err := cmd.Flags().GetBool("tags")
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error getting tags flag: %s", err), output)
@ -176,8 +148,20 @@ var listNodesCmd = &cobra.Command{
defer cancel()
defer conn.Close()
request := &v1.ListNodesRequest{
User: user,
// Check if user identifier flags are provided
id, _ := cmd.Flags().GetInt64("identifier")
username, _ := cmd.Flags().GetString("user")
request := &v1.ListNodesRequest{}
// Only filter by user if user flags are provided
if id >= 0 || username != "" {
user, err := findSingleUser(ctx, client, cmd, "listNodesCmd", output)
if err != nil {
// The helper already calls ErrorOutput, so we can just return
return
}
request.User = user.GetName()
}
response, err := client.ListNodes(ctx, request)
@ -193,7 +177,7 @@ var listNodesCmd = &cobra.Command{
SuccessOutput(response.GetNodes(), "", output)
}
tableData, err := nodesToPtables(user, showTags, response.GetNodes())
tableData, err := nodesToPtables(request.User, showTags, response.GetNodes())
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error converting to table: %s", err), output)
}
@ -215,7 +199,7 @@ var listNodeRoutesCmd = &cobra.Command{
Aliases: []string{"lsr", "routes"},
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
identifier, err := cmd.Flags().GetUint64("identifier")
identifier, err := cmd.Flags().GetUint64("node-id")
if err != nil {
ErrorOutput(
err,
@ -283,7 +267,7 @@ var expireNodeCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
identifier, err := cmd.Flags().GetUint64("identifier")
identifier, err := cmd.Flags().GetUint64("node-id")
if err != nil {
ErrorOutput(
err,
@ -326,7 +310,7 @@ var renameNodeCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
identifier, err := cmd.Flags().GetUint64("identifier")
identifier, err := cmd.Flags().GetUint64("node-id")
if err != nil {
ErrorOutput(
err,
@ -375,7 +359,7 @@ var deleteNodeCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
identifier, err := cmd.Flags().GetUint64("identifier")
identifier, err := cmd.Flags().GetUint64("node-id")
if err != nil {
ErrorOutput(
err,
@ -464,7 +448,7 @@ var moveNodeCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
identifier, err := cmd.Flags().GetUint64("identifier")
identifier, err := cmd.Flags().GetUint64("node-id")
if err != nil {
ErrorOutput(
err,
@ -475,21 +459,16 @@ var moveNodeCmd = &cobra.Command{
return
}
user, err := cmd.Flags().GetUint64("user")
if err != nil {
ErrorOutput(
err,
fmt.Sprintf("Error getting user: %s", err),
output,
)
return
}
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
user, err := findSingleUser(ctx, client, cmd, "moveNodeCmd", output)
if err != nil {
// The helper already calls ErrorOutput, so we can just return
return
}
getRequest := &v1.GetNodeRequest{
NodeId: identifier,
}
@ -510,7 +489,7 @@ var moveNodeCmd = &cobra.Command{
moveRequest := &v1.MoveNodeRequest{
NodeId: identifier,
User: user,
User: user.GetId(),
}
moveResponse, err := client.MoveNode(ctx, moveRequest)
@ -766,7 +745,7 @@ var tagCmd = &cobra.Command{
defer conn.Close()
// retrieve flags from CLI
identifier, err := cmd.Flags().GetUint64("identifier")
identifier, err := cmd.Flags().GetUint64("node-id")
if err != nil {
ErrorOutput(
err,
@ -823,7 +802,7 @@ var approveRoutesCmd = &cobra.Command{
defer conn.Close()
// retrieve flags from CLI
identifier, err := cmd.Flags().GetUint64("identifier")
identifier, err := cmd.Flags().GetUint64("node-id")
if err != nil {
ErrorOutput(
err,

52
cmd/headscale/cli/preauthkeys.go
View File

@ -20,20 +20,20 @@ const (
func init() {
rootCmd.AddCommand(preauthkeysCmd)
preauthkeysCmd.PersistentFlags().Uint64P("user", "u", 0, "User identifier (ID)")
preauthkeysCmd.PersistentFlags().StringP("namespace", "n", "", "User")
preauthkeysCmd.PersistentFlags().String("namespace", "", "User")
pakNamespaceFlag := preauthkeysCmd.PersistentFlags().Lookup("namespace")
pakNamespaceFlag.Deprecated = deprecateNamespaceMessage
pakNamespaceFlag.Hidden = true
err := preauthkeysCmd.MarkPersistentFlagRequired("user")
if err != nil {
log.Fatal().Err(err).Msg("")
}
preauthkeysCmd.AddCommand(listPreAuthKeys)
preauthkeysCmd.AddCommand(createPreAuthKeyCmd)
preauthkeysCmd.AddCommand(expirePreAuthKeyCmd)
usernameAndIDFlag(listPreAuthKeys)
usernameAndIDFlag(createPreAuthKeyCmd)
usernameAndIDFlag(expirePreAuthKeyCmd)
createPreAuthKeyCmd.PersistentFlags().
Bool("reusable", false, "Make the preauthkey reusable")
createPreAuthKeyCmd.PersistentFlags().
@ -57,17 +57,18 @@ var listPreAuthKeys = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
user, err := cmd.Flags().GetUint64("user")
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error getting user: %s", err), output)
}
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
user, err := findSingleUser(ctx, client, cmd, "listPreAuthKeys", output)
if err != nil {
// The helper already calls ErrorOutput, so we can just return
return
}
request := &v1.ListPreAuthKeysRequest{
User: user,
User: user.GetId(),
}
response, err := client.ListPreAuthKeys(ctx, request)
@ -141,9 +142,14 @@ var createPreAuthKeyCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
user, err := cmd.Flags().GetUint64("user")
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
user, err := findSingleUser(ctx, client, cmd, "createPreAuthKeyCmd", output)
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error getting user: %s", err), output)
// The helper already calls ErrorOutput, so we can just return
return
}
reusable, _ := cmd.Flags().GetBool("reusable")
@ -151,7 +157,7 @@ var createPreAuthKeyCmd = &cobra.Command{
tags, _ := cmd.Flags().GetStringSlice("tags")
request := &v1.CreatePreAuthKeyRequest{
User: user,
User: user.GetId(),
Reusable: reusable,
Ephemeral: ephemeral,
AclTags: tags,
@ -176,10 +182,6 @@ var createPreAuthKeyCmd = &cobra.Command{
request.Expiration = timestamppb.New(expiration)
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
response, err := client.CreatePreAuthKey(ctx, request)
if err != nil {
ErrorOutput(
@ -206,17 +208,19 @@ var expirePreAuthKeyCmd = &cobra.Command{
},
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
user, err := cmd.Flags().GetUint64("user")
if err != nil {
ErrorOutput(err, fmt.Sprintf("Error getting user: %s", err), output)
}
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
user, err := findSingleUser(ctx, client, cmd, "expirePreAuthKeyCmd", output)
if err != nil {
// The helper already calls ErrorOutput, so we can just return
return
}
request := &v1.ExpirePreAuthKeyRequest{
User: user,
User: user.GetId(),
Key: args[0],
}

84
cmd/headscale/cli/user_helpers.go Normal file
View File

@ -0,0 +1,84 @@
package cli
import (
"context"
"errors"
"fmt"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/spf13/cobra"
"google.golang.org/grpc/status"
)
// usernameAndIDFlag adds the common user identification flags to a command
func usernameAndIDFlag(cmd *cobra.Command, opts ...string) {
idHelp := "User identifier (ID)"
nameHelp := "Username"
if len(opts) > 0 && opts[0] != "" {
idHelp = opts[0]
}
if len(opts) > 1 && opts[1] != "" {
nameHelp = opts[1]
}
cmd.PersistentFlags().Int64P("identifier", "i", -1, idHelp)
cmd.PersistentFlags().StringP("user", "u", "", nameHelp)
}
// usernameAndIDFromFlag returns the username and ID from the flags of the command.
// If both are empty, it will exit the program with an error.
func usernameAndIDFromFlag(cmd *cobra.Command) (uint64, string) {
username, _ := cmd.Flags().GetString("user")
identifier, _ := cmd.Flags().GetInt64("identifier")
if username == "" && identifier < 0 {
err := errors.New("--user or --identifier flag is required")
ErrorOutput(
err,
fmt.Sprintf(
"User identification error: %s",
status.Convert(err).Message(),
),
"",
)
}
return uint64(identifier), username
}
// findSingleUser takes command flags and returns a single user
// It handles all error checking and ensures exactly one user is found
func findSingleUser(
ctx context.Context,
client v1.HeadscaleServiceClient,
cmd *cobra.Command,
operationName string,
output string,
) (*v1.User, error) {
id, username := usernameAndIDFromFlag(cmd)
listReq := &v1.ListUsersRequest{
Name: username,
Id: id,
}
users, err := client.ListUsers(ctx, listReq)
if err != nil {
ErrorOutput(
err,
fmt.Sprintf("Error: %s", status.Convert(err).Message()),
output,
)
return nil, err
}
if len(users.GetUsers()) != 1 {
err := fmt.Errorf("Unable to determine user for %s", operationName)
ErrorOutput(
err,
fmt.Sprintf("Error: %s", status.Convert(err).Message()),
output,
)
return nil, err
}
return users.GetUsers()[0], nil
}

79
cmd/headscale/cli/users.go
View File

@ -13,31 +13,6 @@ import (
"google.golang.org/grpc/status"
)
func usernameAndIDFlag(cmd *cobra.Command) {
cmd.Flags().Int64P("identifier", "i", -1, "User identifier (ID)")
cmd.Flags().StringP("name", "n", "", "Username")
}
// usernameAndIDFromFlag returns the username and ID from the flags of the command.
// If both are empty, it will exit the program with an error.
func usernameAndIDFromFlag(cmd *cobra.Command) (uint64, string) {
username, _ := cmd.Flags().GetString("name")
identifier, _ := cmd.Flags().GetInt64("identifier")
if username == "" && identifier < 0 {
err := errors.New("--name or --identifier flag is required")
ErrorOutput(
err,
fmt.Sprintf(
"Cannot rename user: %s",
status.Convert(err).Message(),
),
"",
)
}
return uint64(identifier), username
}
func init() {
rootCmd.AddCommand(userCmd)
userCmd.AddCommand(createUserCmd)
@ -133,36 +108,16 @@ var destroyUserCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
output, _ := cmd.Flags().GetString("output")
id, username := usernameAndIDFromFlag(cmd)
request := &v1.ListUsersRequest{
Name: username,
Id: id,
}
ctx, client, conn, cancel := newHeadscaleCLIWithConfig()
defer cancel()
defer conn.Close()
users, err := client.ListUsers(ctx, request)
user, err := findSingleUser(ctx, client, cmd, "destroyUserCmd", output)
if err != nil {
ErrorOutput(
err,
fmt.Sprintf("Error: %s", status.Convert(err).Message()),
output,
)
// The helper already calls ErrorOutput, so we can just return
return
}
if len(users.GetUsers()) != 1 {
err := fmt.Errorf("Unable to determine user to delete, query returned multiple users, use ID")
ErrorOutput(
err,
fmt.Sprintf("Error: %s", status.Convert(err).Message()),
output,
)
}
user := users.GetUsers()[0]
confirm := false
force, _ := cmd.Flags().GetBool("force")
if !force {
@ -213,7 +168,7 @@ var listUsersCmd = &cobra.Command{
request := &v1.ListUsersRequest{}
id, _ := cmd.Flags().GetInt64("identifier")
username, _ := cmd.Flags().GetString("name")
username, _ := cmd.Flags().GetString("user")
email, _ := cmd.Flags().GetString("email")
// filter by one param at most
@ -277,34 +232,16 @@ var renameUserCmd = &cobra.Command{
defer cancel()
defer conn.Close()
id, username := usernameAndIDFromFlag(cmd)
listReq := &v1.ListUsersRequest{
Name: username,
Id: id,
}
users, err := client.ListUsers(ctx, listReq)
user, err := findSingleUser(ctx, client, cmd, "renameUserCmd", output)
if err != nil {
ErrorOutput(
err,
fmt.Sprintf("Error: %s", status.Convert(err).Message()),
output,
)
}
if len(users.GetUsers()) != 1 {
err := fmt.Errorf("Unable to determine user to delete, query returned multiple users, use ID")
ErrorOutput(
err,
fmt.Sprintf("Error: %s", status.Convert(err).Message()),
output,
)
// The helper already calls ErrorOutput, so we can just return
return
}
newName, _ := cmd.Flags().GetString("new-name")
renameReq := &v1.RenameUserRequest{
OldId: id,
OldId: user.GetId(),
NewName: newName,
}

2
integration/auth_key_test.go
View File

@ -342,7 +342,7 @@ func TestAuthKeyLogoutAndReloginSameUserExpiredKey(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"--identifier",
strconv.FormatUint(userMap[userName].GetId(), 10),
"expire",
key.Key,

58
integration/cli_test.go
View File

@ -18,8 +18,8 @@ import (
"github.com/juanfont/headscale/integration/tsic"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"tailscale.com/tailcfg"
"golang.org/x/exp/slices"
"tailscale.com/tailcfg"
)
func executeAndUnmarshal[T any](headscale ControlServer, command []string, result T) error {
@ -128,7 +128,7 @@ func TestUserCommand(t *testing.T) {
"list",
"--output",
"json",
"--name=user1",
"--user=user1",
},
&listByUsername,
)
@ -219,7 +219,7 @@ func TestUserCommand(t *testing.T) {
"users",
"destroy",
"--force",
"--name=newname",
"--user=newname",
},
)
assert.Nil(t, err)
@ -272,7 +272,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"create",
"--reusable",
@ -298,7 +298,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"list",
"--output",
@ -355,7 +355,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"expire",
listedPreAuthKeys[1].GetKey(),
@ -369,7 +369,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"list",
"--output",
@ -409,7 +409,7 @@ func TestPreAuthKeyCommandWithoutExpiry(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"create",
"--reusable",
@ -426,7 +426,7 @@ func TestPreAuthKeyCommandWithoutExpiry(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"list",
"--output",
@ -471,7 +471,7 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"create",
"--reusable=true",
@ -488,7 +488,7 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"create",
"--ephemeral=true",
@ -508,7 +508,7 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
"1",
"list",
"--output",
@ -559,7 +559,7 @@ func TestPreAuthKeyCorrectUserLoggedInCommand(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"-i",
strconv.FormatUint(u2.GetId(), 10),
"create",
"--reusable",
@ -860,7 +860,7 @@ func TestNodeTagCommand(t *testing.T) {
"headscale",
"nodes",
"tag",
"-i", "1",
"-n", "1",
"-t", "tag:test",
"--output", "json",
},
@ -875,7 +875,7 @@ func TestNodeTagCommand(t *testing.T) {
"headscale",
"nodes",
"tag",
"-i", "2",
"-n", "2",
"-t", "wrong-tag",
"--output", "json",
},
@ -913,8 +913,6 @@ func TestNodeTagCommand(t *testing.T) {
)
}
func TestNodeAdvertiseTagCommand(t *testing.T) {
IntegrationSkip(t)
t.Parallel()
@ -1250,7 +1248,7 @@ func TestNodeCommand(t *testing.T) {
"headscale",
"nodes",
"delete",
"--identifier",
"--node-id",
// Delete the last added machine
"4",
"--output",
@ -1376,7 +1374,7 @@ func TestNodeExpireCommand(t *testing.T) {
"headscale",
"nodes",
"expire",
"--identifier",
"--node-id",
fmt.Sprintf("%d", listAll[idx].GetId()),
},
)
@ -1503,7 +1501,7 @@ func TestNodeRenameCommand(t *testing.T) {
"headscale",
"nodes",
"rename",
"--identifier",
"--node-id",
fmt.Sprintf("%d", listAll[idx].GetId()),
fmt.Sprintf("newnode-%d", idx+1),
},
@ -1541,7 +1539,7 @@ func TestNodeRenameCommand(t *testing.T) {
"headscale",
"nodes",
"rename",
"--identifier",
"--node-id",
fmt.Sprintf("%d", listAll[4].GetId()),
strings.Repeat("t", 64),
},
@ -1642,9 +1640,9 @@ func TestNodeMoveCommand(t *testing.T) {
"headscale",
"nodes",
"move",
"--identifier",
"--node-id",
strconv.FormatUint(node.GetId(), 10),
"--user",
"--identifier",
strconv.FormatUint(userMap["new-user"].GetId(), 10),
"--output",
"json",
@ -1680,9 +1678,9 @@ func TestNodeMoveCommand(t *testing.T) {
"headscale",
"nodes",
"move",
"--identifier",
"--node-id",
nodeID,
"--user",
"--identifier",
"999",
"--output",
"json",
@ -1691,7 +1689,7 @@ func TestNodeMoveCommand(t *testing.T) {
assert.ErrorContains(
t,
err,
"user not found",
"Unable to determine user",
)
assert.Equal(t, node.GetUser().GetName(), "new-user")
@ -1701,9 +1699,9 @@ func TestNodeMoveCommand(t *testing.T) {
"headscale",
"nodes",
"move",
"--identifier",
"--node-id",
nodeID,
"--user",
"--identifier",
strconv.FormatUint(userMap["old-user"].GetId(), 10),
"--output",
"json",
@ -1720,9 +1718,9 @@ func TestNodeMoveCommand(t *testing.T) {
"headscale",
"nodes",
"move",
"--identifier",
"--node-id",
nodeID,
"--user",
"--identifier",
strconv.FormatUint(userMap["old-user"].GetId(), 10),
"--output",
"json",

6
integration/general_test.go
View File

@ -597,7 +597,7 @@ func TestUpdateHostnameFromClient(t *testing.T) {
"node",
"rename",
givenName,
"--identifier",
"--node-id",
strconv.FormatUint(node.GetId(), 10),
})
assertNoErr(t, err)
@ -693,7 +693,7 @@ func TestExpireNode(t *testing.T) {
// TODO(kradalby): This is Headscale specific and would not play nicely
// with other implementations of the ControlServer interface
result, err := headscale.Execute([]string{
"headscale", "nodes", "expire", "--identifier", "1", "--output", "json",
"headscale", "nodes", "expire", "--node-id", "1", "--output", "json",
})
assertNoErr(t, err)
@ -1032,7 +1032,7 @@ func Test2118DeletingOnlineNodePanics(t *testing.T) {
"headscale",
"nodes",
"delete",
"--identifier",
"--node-id",
// Delete the last added machine
fmt.Sprintf("%d", nodeList[0].GetId()),
"--output",

14
integration/hsic/hsic.go
View File

@ -458,6 +458,16 @@ func New(
}
}
// Create necessary directories in the container
_, _, err = dockertestutil.ExecuteCommand(
container,
[]string{"mkdir", "-p", "/tmp/mapresponses"},
[]string{},
)
if err != nil {
log.Printf("Warning: Could not create /tmp/mapresponses directory: %v", err)
}
return hsic, nil
}
@ -850,7 +860,7 @@ func (t *HeadscaleInContainer) CreateAuthKey(
) (*v1.PreAuthKey, error) {
command := []string{
"headscale",
"--user",
"-i",
strconv.FormatUint(user, 10),
"preauthkeys",
"create",
@ -1120,7 +1130,7 @@ func (t *HeadscaleInContainer) ApproveRoutes(id uint64, routes []netip.Prefix) (
command := []string{
"headscale", "nodes", "approve-routes",
"--output", "json",
"--identifier", strconv.FormatUint(id, 10),
"--node-id", strconv.FormatUint(id, 10),
fmt.Sprintf("--routes=%s", strings.Join(util.PrefixesToString(routes), ",")),
}

4
integration/scenario.go
View File

@ -438,13 +438,13 @@ func (s *Scenario) CreatePreAuthKey(
if headscale, err := s.Headscale(); err == nil {
key, err := headscale.CreateAuthKey(user, reusable, ephemeral)
if err != nil {
return nil, fmt.Errorf("failed to create user: %w", err)
return nil, fmt.Errorf("failed to create preauthkey: %w", err)
}
return key, nil
}
return nil, fmt.Errorf("failed to create user: %w", errNoHeadscaleAvailable)
return nil, fmt.Errorf("failed to create preauthkey: %w", errNoHeadscaleAvailable)
}
// CreateUser creates a User to be created in the