Merge branch 'kradalby-patch-2' of github.com:juanfont/headscale into kradalby-patch-2

This commit is contained in:
Kristoffer Dalby 2021-11-28 11:00:43 +00:00
commit 2d2ae62176

View file

@ -9,6 +9,16 @@ import (
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
) )
const (
keyLength = 64
errPreAuthKeyTooShort = Error("key too short, must be 64 hexadecimal characters")
)
// Error is used to compare errors as per https://dave.cheney.net/2016/04/07/constant-errors
type Error string
func (e Error) Error() string { return string(e) }
func init() { func init() {
rootCmd.AddCommand(debugCmd) rootCmd.AddCommand(debugCmd)
@ -77,6 +87,16 @@ var createNodeCmd = &cobra.Command{
return return
} }
if len(machineKey) != keyLength {
err = errPreAuthKeyTooShort
ErrorOutput(
err,
fmt.Sprintf("Error: %s", err),
output,
)
return
}
routes, err := cmd.Flags().GetStringSlice("route") routes, err := cmd.Flags().GetStringSlice("route")
if err != nil { if err != nil {