server: populate audit UserID on credential mutations + slog prune push errors
Switch handleSetHostCredentials, handleSetAdminCredentials, and handleDeleteAdminCredentials from authedUser (bool) to requireUser (*store.User) so AuditEntry.UserID and Actor are populated correctly. Add slog.Warn on the non-ErrNotFound pushAdminCredsToAgent path in handleRunRepoPrune so decrypt/send failures surface in the server log rather than appearing as a generic host_offline 503.
This commit is contained in:
@@ -86,7 +86,8 @@ type hostRepoCredsRequest struct {
|
|||||||
// preserved. Re-encrypts under host_id and pushes a config.update
|
// preserved. Re-encrypts under host_id and pushes a config.update
|
||||||
// over the WS if the agent is connected.
|
// over the WS if the agent is connected.
|
||||||
func (s *Server) handleSetHostCredentials(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
func (s *Server) handleSetHostCredentials(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||||
if !s.authedUser(r) {
|
user, ok := s.requireUser(r)
|
||||||
|
if !ok {
|
||||||
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -147,6 +148,7 @@ func (s *Server) handleSetHostCredentials(w stdhttp.ResponseWriter, r *stdhttp.R
|
|||||||
|
|
||||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||||
ID: ulid.Make().String(),
|
ID: ulid.Make().String(),
|
||||||
|
UserID: &user.ID,
|
||||||
Actor: "user",
|
Actor: "user",
|
||||||
Action: "host.repo_credentials_set",
|
Action: "host.repo_credentials_set",
|
||||||
TargetKind: ptr("host"),
|
TargetKind: ptr("host"),
|
||||||
@@ -230,7 +232,8 @@ func (s *Server) handleGetAdminCredentials(w stdhttp.ResponseWriter, r *stdhttp.
|
|||||||
// persisting, pushes a config.update with Slot:"admin" over the WS if
|
// persisting, pushes a config.update with Slot:"admin" over the WS if
|
||||||
// the agent is connected.
|
// the agent is connected.
|
||||||
func (s *Server) handleSetAdminCredentials(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
func (s *Server) handleSetAdminCredentials(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||||
if !s.authedUser(r) {
|
user, ok := s.requireUser(r)
|
||||||
|
if !ok {
|
||||||
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -292,6 +295,7 @@ func (s *Server) handleSetAdminCredentials(w stdhttp.ResponseWriter, r *stdhttp.
|
|||||||
|
|
||||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||||
ID: ulid.Make().String(),
|
ID: ulid.Make().String(),
|
||||||
|
UserID: &user.ID,
|
||||||
Actor: "user",
|
Actor: "user",
|
||||||
Action: "host.admin_credentials_set",
|
Action: "host.admin_credentials_set",
|
||||||
TargetKind: ptr("host"),
|
TargetKind: ptr("host"),
|
||||||
@@ -313,7 +317,8 @@ func (s *Server) handleSetAdminCredentials(w stdhttp.ResponseWriter, r *stdhttp.
|
|||||||
// a deletion to the agent — the agent's local admin slot stays as-is
|
// a deletion to the agent — the agent's local admin slot stays as-is
|
||||||
// until the next deployment/reinstall.
|
// until the next deployment/reinstall.
|
||||||
func (s *Server) handleDeleteAdminCredentials(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
func (s *Server) handleDeleteAdminCredentials(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||||
if !s.authedUser(r) {
|
user, ok := s.requireUser(r)
|
||||||
|
if !ok {
|
||||||
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -340,6 +345,7 @@ func (s *Server) handleDeleteAdminCredentials(w stdhttp.ResponseWriter, r *stdht
|
|||||||
|
|
||||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||||
ID: ulid.Make().String(),
|
ID: ulid.Make().String(),
|
||||||
|
UserID: &user.ID,
|
||||||
Actor: "user",
|
Actor: "user",
|
||||||
Action: "host.admin_credentials_deleted",
|
Action: "host.admin_credentials_deleted",
|
||||||
TargetKind: ptr("host"),
|
TargetKind: ptr("host"),
|
||||||
|
|||||||
@@ -262,11 +262,12 @@ func TestAdminCredsPushOnSet(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TestDeleteAdminCredentialsAuditLogged checks that DELETE appends an
|
// TestDeleteAdminCredentialsAuditLogged checks that DELETE appends an
|
||||||
// audit row with action='host.admin_credentials_deleted'.
|
// audit row with action='host.admin_credentials_deleted' and that the
|
||||||
|
// row carries the acting user's ID.
|
||||||
func TestDeleteAdminCredentialsAuditLogged(t *testing.T) {
|
func TestDeleteAdminCredentialsAuditLogged(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
_, url, st := newTestServerWithHub(t)
|
_, url, st := newTestServerWithHub(t)
|
||||||
cookie := loginAsAdmin(t, st)
|
cookie, userID := loginAsAdminWithID(t, st)
|
||||||
hostID := makeHost(t, st, "audit-del-host")
|
hostID := makeHost(t, st, "audit-del-host")
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
@@ -287,9 +288,10 @@ func TestDeleteAdminCredentialsAuditLogged(t *testing.T) {
|
|||||||
t.Fatalf("delete: want 204, got %d", status)
|
t.Fatalf("delete: want 204, got %d", status)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Query audit_log for the host.
|
// Query audit_log for the delete row — action, user_id.
|
||||||
rows, err := st.DB().QueryContext(ctx,
|
rows, err := st.DB().QueryContext(ctx,
|
||||||
`SELECT action FROM audit_log WHERE target_id = ? AND target_kind = 'host'`, hostID)
|
`SELECT action, user_id FROM audit_log WHERE target_id = ? AND target_kind = 'host' AND action = 'host.admin_credentials_deleted'`,
|
||||||
|
hostID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("query audit: %v", err)
|
t.Fatalf("query audit: %v", err)
|
||||||
}
|
}
|
||||||
@@ -298,11 +300,15 @@ func TestDeleteAdminCredentialsAuditLogged(t *testing.T) {
|
|||||||
found := false
|
found := false
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var action string
|
var action string
|
||||||
if err := rows.Scan(&action); err != nil {
|
var gotUserID *string
|
||||||
|
if err := rows.Scan(&action, &gotUserID); err != nil {
|
||||||
t.Fatalf("scan: %v", err)
|
t.Fatalf("scan: %v", err)
|
||||||
}
|
}
|
||||||
if action == "host.admin_credentials_deleted" {
|
found = true
|
||||||
found = true
|
if gotUserID == nil {
|
||||||
|
t.Error("audit row: user_id is NULL, want non-nil")
|
||||||
|
} else if *gotUserID != userID {
|
||||||
|
t.Errorf("audit row: user_id=%q, want %q", *gotUserID, userID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err := rows.Err(); err != nil {
|
if err := rows.Err(); err != nil {
|
||||||
@@ -312,3 +318,53 @@ func TestDeleteAdminCredentialsAuditLogged(t *testing.T) {
|
|||||||
t.Error("audit row with action='host.admin_credentials_deleted' not found")
|
t.Error("audit row with action='host.admin_credentials_deleted' not found")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestSetAdminCredentialsAuditCarriesUserID checks that PUT
|
||||||
|
// /api/hosts/{id}/admin-credentials appends an audit row with the
|
||||||
|
// correct action and a non-nil UserID matching the acting session.
|
||||||
|
func TestSetAdminCredentialsAuditCarriesUserID(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
_, url, st := newTestServerWithHub(t)
|
||||||
|
cookie, userID := loginAsAdminWithID(t, st)
|
||||||
|
hostID := makeHost(t, st, "audit-set-admin-host")
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
status, body := doJSON(t, url, "PUT", "/api/hosts/"+hostID+"/admin-credentials",
|
||||||
|
map[string]any{
|
||||||
|
"repo_url": "rest:http://admin.example/h",
|
||||||
|
"repo_password": "s3cr3t",
|
||||||
|
}, cookie)
|
||||||
|
if status != 204 {
|
||||||
|
t.Fatalf("set: want 204, got %d body=%+v", status, body)
|
||||||
|
}
|
||||||
|
|
||||||
|
rows, err := st.DB().QueryContext(ctx,
|
||||||
|
`SELECT action, user_id FROM audit_log WHERE target_id = ? AND target_kind = 'host' AND action = 'host.admin_credentials_set'`,
|
||||||
|
hostID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("query audit: %v", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
found := false
|
||||||
|
for rows.Next() {
|
||||||
|
var action string
|
||||||
|
var gotUserID *string
|
||||||
|
if err := rows.Scan(&action, &gotUserID); err != nil {
|
||||||
|
t.Fatalf("scan: %v", err)
|
||||||
|
}
|
||||||
|
found = true
|
||||||
|
if gotUserID == nil {
|
||||||
|
t.Error("audit row: user_id is NULL, want non-nil")
|
||||||
|
} else if *gotUserID != userID {
|
||||||
|
t.Errorf("audit row: user_id=%q, want %q", *gotUserID, userID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
t.Fatalf("rows: %v", err)
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Error("audit row with action='host.admin_credentials_set' not found")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -47,6 +47,32 @@ func loginAsAdmin(t *testing.T, st *store.Store) *stdhttp.Cookie {
|
|||||||
return &stdhttp.Cookie{Name: sessionCookieName, Value: tok}
|
return &stdhttp.Cookie{Name: sessionCookieName, Value: tok}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// loginAsAdminWithID is like loginAsAdmin but also returns the user ID.
|
||||||
|
// Use this when tests need to assert that the user ID was recorded
|
||||||
|
// (e.g. on audit entries).
|
||||||
|
func loginAsAdminWithID(t *testing.T, st *store.Store) (*stdhttp.Cookie, string) {
|
||||||
|
t.Helper()
|
||||||
|
ctx := context.Background()
|
||||||
|
uid := ulid.Make().String()
|
||||||
|
hash, _ := auth.HashPassword("very-long-test-password")
|
||||||
|
if err := st.CreateUser(ctx, store.User{
|
||||||
|
ID: uid, Username: "tester-" + uid[:6],
|
||||||
|
PasswordHash: hash, Role: store.RoleAdmin,
|
||||||
|
CreatedAt: time.Now().UTC(),
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("create user: %v", err)
|
||||||
|
}
|
||||||
|
tok, _ := auth.NewToken()
|
||||||
|
if err := st.CreateSession(ctx, store.Session{
|
||||||
|
UserID: uid,
|
||||||
|
CreatedAt: time.Now().UTC(),
|
||||||
|
ExpiresAt: time.Now().Add(time.Hour).UTC(),
|
||||||
|
}, auth.HashToken(tok)); err != nil {
|
||||||
|
t.Fatalf("create session: %v", err)
|
||||||
|
}
|
||||||
|
return &stdhttp.Cookie{Name: sessionCookieName, Value: tok}, uid
|
||||||
|
}
|
||||||
|
|
||||||
// makeHost inserts a minimal Host row directly via the store. Used by
|
// makeHost inserts a minimal Host row directly via the store. Used by
|
||||||
// HTTP-level tests that don't want to go through the full enrollment
|
// HTTP-level tests that don't want to go through the full enrollment
|
||||||
// path. Returns the host id.
|
// path. Returns the host id.
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ package http
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"log/slog"
|
||||||
stdhttp "net/http"
|
stdhttp "net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
@@ -45,6 +46,7 @@ func (s *Server) handleRunRepoPrune(w stdhttp.ResponseWriter, r *stdhttp.Request
|
|||||||
// Hub.Send failure (offline) or decrypt failure — surface a
|
// Hub.Send failure (offline) or decrypt failure — surface a
|
||||||
// generic offline message so the operator retries when the
|
// generic offline message so the operator retries when the
|
||||||
// agent is back.
|
// agent is back.
|
||||||
|
slog.Warn("prune: push admin creds failed", "host_id", hostID, "err", err)
|
||||||
s.runOpError(w, r, stdhttp.StatusServiceUnavailable, "host_offline",
|
s.runOpError(w, r, stdhttp.StatusServiceUnavailable, "host_offline",
|
||||||
"agent is not currently connected; try again when it reconnects")
|
"agent is not currently connected; try again when it reconnects")
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user