cmd/headscale/cli: extract bypassDatabase helper and simplify policy file reads
Add bypassDatabase() to consolidate the repeated LoadServerConfig + NewHeadscaleDatabase pattern in getPolicy and setPolicy. Replace os.Open + io.ReadAll with os.ReadFile in setPolicy and checkPolicy, removing the manual file-handle management.
This commit is contained in:
parent
7460bec767
commit
af777f44f4
@ -3,7 +3,6 @@ package cli
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
|
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
|
||||||
@ -20,6 +19,23 @@ const (
|
|||||||
|
|
||||||
var errAborted = errors.New("command aborted by user")
|
var errAborted = errors.New("command aborted by user")
|
||||||
|
|
||||||
|
// bypassDatabase loads the server config and opens the database directly,
|
||||||
|
// bypassing the gRPC server. The caller is responsible for closing the
|
||||||
|
// returned database handle.
|
||||||
|
func bypassDatabase() (*db.HSDatabase, error) {
|
||||||
|
cfg, err := types.LoadServerConfig()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("loading config: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
d, err := db.NewHeadscaleDatabase(cfg, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("opening database: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return d, nil
|
||||||
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(policyCmd)
|
rootCmd.AddCommand(policyCmd)
|
||||||
|
|
||||||
@ -52,15 +68,67 @@ var getPolicy = &cobra.Command{
|
|||||||
return errAborted
|
return errAborted
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg, err := types.LoadServerConfig()
|
d, err := bypassDatabase()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("loading config: %w", err)
|
return err
|
||||||
|
}
|
||||||
|
defer d.Close()
|
||||||
|
|
||||||
|
pol, err := d.GetPolicy()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("loading policy from database: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
d, err := db.NewHeadscaleDatabase(cfg, nil)
|
policyData = pol.Data
|
||||||
|
} else {
|
||||||
|
ctx, client, conn, cancel, err := newHeadscaleCLIWithConfig()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("opening database: %w", err)
|
return fmt.Errorf("connecting to headscale: %w", err)
|
||||||
}
|
}
|
||||||
|
defer cancel()
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
response, err := client.GetPolicy(ctx, &v1.GetPolicyRequest{})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("loading ACL policy: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
policyData = response.GetPolicy()
|
||||||
|
}
|
||||||
|
|
||||||
|
// This does not pass output format as we don't support yaml, json or
|
||||||
|
// json-line output for this command. It is HuJSON already.
|
||||||
|
fmt.Println(policyData)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var setPolicy = &cobra.Command{
|
||||||
|
Use: "set",
|
||||||
|
Short: "Updates the ACL Policy",
|
||||||
|
Long: `
|
||||||
|
Updates the existing ACL Policy with the provided policy. The policy must be a valid HuJSON object.
|
||||||
|
This command only works when the acl.policy_mode is set to "db", and the policy will be stored in the database.`,
|
||||||
|
Aliases: []string{"put", "update"},
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
policyPath, _ := cmd.Flags().GetString("file")
|
||||||
|
|
||||||
|
policyBytes, err := os.ReadFile(policyPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("reading policy file: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if bypass, _ := cmd.Flags().GetBool(bypassFlag); bypass {
|
||||||
|
if !confirmAction(cmd, "DO NOT run this command if an instance of headscale is running, are you sure headscale is not running?") {
|
||||||
|
return errAborted
|
||||||
|
}
|
||||||
|
|
||||||
|
d, err := bypassDatabase()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer d.Close()
|
||||||
|
|
||||||
users, err := d.ListUsers()
|
users, err := d.ListUsers()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -104,13 +172,7 @@ var checkPolicy = &cobra.Command{
|
|||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
policyPath, _ := cmd.Flags().GetString("file")
|
policyPath, _ := cmd.Flags().GetString("file")
|
||||||
|
|
||||||
f, err := os.Open(policyPath)
|
policyBytes, err := os.ReadFile(policyPath)
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("opening policy file: %w", err)
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
policyBytes, err := io.ReadAll(f)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("reading policy file: %w", err)
|
return fmt.Errorf("reading policy file: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user