mirror of
https://github.com/juanfont/headscale.git
synced 2024-12-20 19:09:07 +01:00
c7f3e0632b
a nil value, instead of the default value (1h). This resulted in the preauthkey being created with expiration key '0001-01-01 00:00:00', which meant the key would not work, because it was already expired. This commit applies the default expiration time (1h) when a preauthkey is created without a specific expiration. It also updates an integration test to make sure this bug does not reoccur.
216 lines
5.0 KiB
Go
216 lines
5.0 KiB
Go
package cli
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"time"
|
|
|
|
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
|
|
"github.com/pterm/pterm"
|
|
"github.com/rs/zerolog/log"
|
|
"github.com/spf13/cobra"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
)
|
|
|
|
const (
|
|
DefaultPreAuthKeyExpiry = 1 * time.Hour
|
|
)
|
|
|
|
func init() {
|
|
rootCmd.AddCommand(preauthkeysCmd)
|
|
preauthkeysCmd.PersistentFlags().StringP("namespace", "n", "", "Namespace")
|
|
err := preauthkeysCmd.MarkPersistentFlagRequired("namespace")
|
|
if err != nil {
|
|
log.Fatal().Err(err).Msg("")
|
|
}
|
|
preauthkeysCmd.AddCommand(listPreAuthKeys)
|
|
preauthkeysCmd.AddCommand(createPreAuthKeyCmd)
|
|
preauthkeysCmd.AddCommand(expirePreAuthKeyCmd)
|
|
createPreAuthKeyCmd.PersistentFlags().
|
|
Bool("reusable", false, "Make the preauthkey reusable")
|
|
createPreAuthKeyCmd.PersistentFlags().
|
|
Bool("ephemeral", false, "Preauthkey for ephemeral nodes")
|
|
createPreAuthKeyCmd.Flags().
|
|
DurationP("expiration", "e", DefaultPreAuthKeyExpiry, "Human-readable expiration of the key (30m, 24h, 365d...)")
|
|
}
|
|
|
|
var preauthkeysCmd = &cobra.Command{
|
|
Use: "preauthkeys",
|
|
Short: "Handle the preauthkeys in Headscale",
|
|
}
|
|
|
|
var listPreAuthKeys = &cobra.Command{
|
|
Use: "list",
|
|
Short: "List the preauthkeys for this namespace",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
output, _ := cmd.Flags().GetString("output")
|
|
|
|
namespace, err := cmd.Flags().GetString("namespace")
|
|
if err != nil {
|
|
ErrorOutput(err, fmt.Sprintf("Error getting namespace: %s", err), output)
|
|
|
|
return
|
|
}
|
|
|
|
ctx, client, conn, cancel := getHeadscaleCLIClient()
|
|
defer cancel()
|
|
defer conn.Close()
|
|
|
|
request := &v1.ListPreAuthKeysRequest{
|
|
Namespace: namespace,
|
|
}
|
|
|
|
response, err := client.ListPreAuthKeys(ctx, request)
|
|
if err != nil {
|
|
ErrorOutput(
|
|
err,
|
|
fmt.Sprintf("Error getting the list of keys: %s", err),
|
|
output,
|
|
)
|
|
|
|
return
|
|
}
|
|
|
|
if output != "" {
|
|
SuccessOutput(response.PreAuthKeys, "", output)
|
|
|
|
return
|
|
}
|
|
|
|
tableData := pterm.TableData{
|
|
{"ID", "Key", "Reusable", "Ephemeral", "Used", "Expiration", "Created"},
|
|
}
|
|
for _, key := range response.PreAuthKeys {
|
|
expiration := "-"
|
|
if key.GetExpiration() != nil {
|
|
expiration = key.Expiration.AsTime().Format("2006-01-02 15:04:05")
|
|
}
|
|
|
|
var reusable string
|
|
if key.GetEphemeral() {
|
|
reusable = "N/A"
|
|
} else {
|
|
reusable = fmt.Sprintf("%v", key.GetReusable())
|
|
}
|
|
|
|
tableData = append(tableData, []string{
|
|
key.GetId(),
|
|
key.GetKey(),
|
|
reusable,
|
|
strconv.FormatBool(key.GetEphemeral()),
|
|
strconv.FormatBool(key.GetUsed()),
|
|
expiration,
|
|
key.GetCreatedAt().AsTime().Format("2006-01-02 15:04:05"),
|
|
})
|
|
|
|
}
|
|
err = pterm.DefaultTable.WithHasHeader().WithData(tableData).Render()
|
|
if err != nil {
|
|
ErrorOutput(
|
|
err,
|
|
fmt.Sprintf("Failed to render pterm table: %s", err),
|
|
output,
|
|
)
|
|
|
|
return
|
|
}
|
|
},
|
|
}
|
|
|
|
var createPreAuthKeyCmd = &cobra.Command{
|
|
Use: "create",
|
|
Short: "Creates a new preauthkey in the specified namespace",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
output, _ := cmd.Flags().GetString("output")
|
|
|
|
namespace, err := cmd.Flags().GetString("namespace")
|
|
if err != nil {
|
|
ErrorOutput(err, fmt.Sprintf("Error getting namespace: %s", err), output)
|
|
|
|
return
|
|
}
|
|
|
|
reusable, _ := cmd.Flags().GetBool("reusable")
|
|
ephemeral, _ := cmd.Flags().GetBool("ephemeral")
|
|
|
|
log.Trace().
|
|
Bool("reusable", reusable).
|
|
Bool("ephemeral", ephemeral).
|
|
Str("namespace", namespace).
|
|
Msg("Preparing to create preauthkey")
|
|
|
|
request := &v1.CreatePreAuthKeyRequest{
|
|
Namespace: namespace,
|
|
Reusable: reusable,
|
|
Ephemeral: ephemeral,
|
|
}
|
|
|
|
duration, _ := cmd.Flags().GetDuration("expiration")
|
|
expiration := time.Now().UTC().Add(duration)
|
|
|
|
log.Trace().Dur("expiration", duration).Msg("expiration has been set")
|
|
|
|
request.Expiration = timestamppb.New(expiration)
|
|
|
|
ctx, client, conn, cancel := getHeadscaleCLIClient()
|
|
defer cancel()
|
|
defer conn.Close()
|
|
|
|
response, err := client.CreatePreAuthKey(ctx, request)
|
|
if err != nil {
|
|
ErrorOutput(
|
|
err,
|
|
fmt.Sprintf("Cannot create Pre Auth Key: %s\n", err),
|
|
output,
|
|
)
|
|
|
|
return
|
|
}
|
|
|
|
SuccessOutput(response.PreAuthKey, response.PreAuthKey.Key, output)
|
|
},
|
|
}
|
|
|
|
var expirePreAuthKeyCmd = &cobra.Command{
|
|
Use: "expire KEY",
|
|
Short: "Expire a preauthkey",
|
|
Args: func(cmd *cobra.Command, args []string) error {
|
|
if len(args) < 1 {
|
|
return errMissingParameter
|
|
}
|
|
|
|
return nil
|
|
},
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
output, _ := cmd.Flags().GetString("output")
|
|
namespace, err := cmd.Flags().GetString("namespace")
|
|
if err != nil {
|
|
ErrorOutput(err, fmt.Sprintf("Error getting namespace: %s", err), output)
|
|
|
|
return
|
|
}
|
|
|
|
ctx, client, conn, cancel := getHeadscaleCLIClient()
|
|
defer cancel()
|
|
defer conn.Close()
|
|
|
|
request := &v1.ExpirePreAuthKeyRequest{
|
|
Namespace: namespace,
|
|
Key: args[0],
|
|
}
|
|
|
|
response, err := client.ExpirePreAuthKey(ctx, request)
|
|
if err != nil {
|
|
ErrorOutput(
|
|
err,
|
|
fmt.Sprintf("Cannot expire Pre Auth Key: %s\n", err),
|
|
output,
|
|
)
|
|
|
|
return
|
|
}
|
|
|
|
SuccessOutput(response, "Key expired", output)
|
|
},
|
|
}
|