Add nodes.delete with reauth, activity logs, and Administrators editing.
Allow deleting managed hosts with mandatory inline re-auth, record node mutations in an audit log with a sidebar Logs view, and let Administrators group permissions be edited from the Groups tab.
This commit is contained in:
@@ -0,0 +1,77 @@
|
||||
package settings
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
// MaxNodeAuditEvents is the retention cap for node-audit.json.
|
||||
const MaxNodeAuditEvents = 1000
|
||||
|
||||
// LoadNodeAudit reads and parses node-audit.json from dir.
|
||||
func LoadNodeAudit(dir string) (NodeAuditStore, error) {
|
||||
path := filepath.Join(dir, NodeAuditFileName)
|
||||
payload, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return NodeAuditStore{}, err
|
||||
}
|
||||
|
||||
var store NodeAuditStore
|
||||
if err := json.Unmarshal(payload, &store); err != nil {
|
||||
return NodeAuditStore{}, fmt.Errorf("parse node audit: %w", err)
|
||||
}
|
||||
if store.Events == nil {
|
||||
store.Events = []NodeAuditEvent{}
|
||||
}
|
||||
return store, nil
|
||||
}
|
||||
|
||||
// LoadNodeAuditOrEmpty returns an empty store when node-audit.json is missing.
|
||||
func LoadNodeAuditOrEmpty(dir string) (NodeAuditStore, error) {
|
||||
store, err := LoadNodeAudit(dir)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return NodeAuditStore{Events: []NodeAuditEvent{}}, nil
|
||||
}
|
||||
return NodeAuditStore{}, err
|
||||
}
|
||||
return store, nil
|
||||
}
|
||||
|
||||
// SaveNodeAudit writes node-audit.json to dir with mode 0640.
|
||||
func SaveNodeAudit(dir string, store NodeAuditStore) error {
|
||||
if err := ensureConfigDir(dir); err != nil {
|
||||
return err
|
||||
}
|
||||
if store.Events == nil {
|
||||
store.Events = []NodeAuditEvent{}
|
||||
}
|
||||
|
||||
payload, err := json.MarshalIndent(store, "", " ")
|
||||
if err != nil {
|
||||
return fmt.Errorf("encode node audit: %w", err)
|
||||
}
|
||||
payload = append(payload, '\n')
|
||||
|
||||
path := filepath.Join(dir, NodeAuditFileName)
|
||||
if err := os.WriteFile(path, payload, 0o640); err != nil {
|
||||
return fmt.Errorf("write node audit: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// AppendNodeAuditEvent appends event and trims to MaxNodeAuditEvents (newest kept).
|
||||
func AppendNodeAuditEvent(dir string, event NodeAuditEvent) error {
|
||||
store, err := LoadNodeAuditOrEmpty(dir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
store.Events = append(store.Events, event)
|
||||
if len(store.Events) > MaxNodeAuditEvents {
|
||||
store.Events = store.Events[len(store.Events)-MaxNodeAuditEvents:]
|
||||
}
|
||||
return SaveNodeAudit(dir, store)
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
package settings
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestNodeAuditRoundTripAndCap(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
|
||||
store, err := LoadNodeAuditOrEmpty(dir)
|
||||
if err != nil {
|
||||
t.Fatalf("LoadNodeAuditOrEmpty: %v", err)
|
||||
}
|
||||
if len(store.Events) != 0 {
|
||||
t.Fatalf("expected empty, got %d", len(store.Events))
|
||||
}
|
||||
|
||||
event := NodeAuditEvent{
|
||||
ID: "evt-1",
|
||||
At: time.Now().UTC(),
|
||||
Action: NodeAuditActionCreate,
|
||||
Actor: "admin",
|
||||
NodeID: "aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee",
|
||||
NodeName: "ct1",
|
||||
NodeKind: NodeKindContainer,
|
||||
}
|
||||
if err := AppendNodeAuditEvent(dir, event); err != nil {
|
||||
t.Fatalf("AppendNodeAuditEvent: %v", err)
|
||||
}
|
||||
|
||||
loaded, err := LoadNodeAudit(dir)
|
||||
if err != nil {
|
||||
t.Fatalf("LoadNodeAudit: %v", err)
|
||||
}
|
||||
if len(loaded.Events) != 1 || loaded.Events[0].Action != NodeAuditActionCreate {
|
||||
t.Fatalf("loaded = %+v", loaded)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppendNodeAuditEventTrimsToCap(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
originalCap := MaxNodeAuditEvents
|
||||
// Use a small synthetic store by appending more than the cap.
|
||||
store := NodeAuditStore{Events: make([]NodeAuditEvent, 0, MaxNodeAuditEvents+5)}
|
||||
for index := 0; index < MaxNodeAuditEvents+5; index++ {
|
||||
store.Events = append(store.Events, NodeAuditEvent{
|
||||
ID: "evt",
|
||||
At: time.Now().UTC(),
|
||||
Action: NodeAuditActionCreate,
|
||||
Actor: "admin",
|
||||
NodeID: "id",
|
||||
NodeName: "n",
|
||||
NodeKind: NodeKindVM,
|
||||
Detail: string(rune('a' + (index % 26))),
|
||||
})
|
||||
}
|
||||
if err := SaveNodeAudit(dir, store); err != nil {
|
||||
t.Fatalf("SaveNodeAudit: %v", err)
|
||||
}
|
||||
if err := AppendNodeAuditEvent(dir, NodeAuditEvent{
|
||||
ID: "newest",
|
||||
At: time.Now().UTC(),
|
||||
Action: NodeAuditActionDelete,
|
||||
Actor: "admin",
|
||||
NodeID: "id",
|
||||
NodeName: "n",
|
||||
NodeKind: NodeKindVM,
|
||||
}); err != nil {
|
||||
t.Fatalf("AppendNodeAuditEvent: %v", err)
|
||||
}
|
||||
loaded, err := LoadNodeAudit(dir)
|
||||
if err != nil {
|
||||
t.Fatalf("LoadNodeAudit: %v", err)
|
||||
}
|
||||
if len(loaded.Events) != originalCap {
|
||||
t.Fatalf("len = %d, want %d", len(loaded.Events), originalCap)
|
||||
}
|
||||
if loaded.Events[len(loaded.Events)-1].ID != "newest" {
|
||||
t.Fatalf("last id = %q", loaded.Events[len(loaded.Events)-1].ID)
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,7 @@ const (
|
||||
SessionsFileName = "sessions.enc"
|
||||
NodesFileName = "nodes.json"
|
||||
NodeKeysFileName = "node-keys.enc"
|
||||
NodeAuditFileName = "node-audit.json"
|
||||
)
|
||||
|
||||
// ResolveDir returns the config directory using precedence:
|
||||
|
||||
@@ -127,6 +127,33 @@ type NodeKeyStore struct {
|
||||
Keys []NodeKeyEntry `json:"keys"`
|
||||
}
|
||||
|
||||
// NodeAuditAction identifies a recorded node mutation.
|
||||
type NodeAuditAction string
|
||||
|
||||
const (
|
||||
NodeAuditActionCreate NodeAuditAction = "create"
|
||||
NodeAuditActionDelete NodeAuditAction = "delete"
|
||||
NodeAuditActionTestSSH NodeAuditAction = "test_ssh"
|
||||
NodeAuditActionUpdate NodeAuditAction = "update"
|
||||
)
|
||||
|
||||
// NodeAuditEvent is one append-only record of a node mutation.
|
||||
type NodeAuditEvent struct {
|
||||
ID string `json:"id"`
|
||||
At time.Time `json:"at"`
|
||||
Action NodeAuditAction `json:"action"`
|
||||
Actor string `json:"actor"`
|
||||
NodeID string `json:"node_id"`
|
||||
NodeName string `json:"node_name"`
|
||||
NodeKind NodeKind `json:"node_kind"`
|
||||
Detail string `json:"detail,omitempty"`
|
||||
}
|
||||
|
||||
// NodeAuditStore is the plain JSON payload in node-audit.json.
|
||||
type NodeAuditStore struct {
|
||||
Events []NodeAuditEvent `json:"events"`
|
||||
}
|
||||
|
||||
// UserCredential is one account stored in passwords.enc.
|
||||
type UserCredential struct {
|
||||
ID string `json:"id"`
|
||||
|
||||
Reference in New Issue
Block a user