mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 14:01:36 +00:00
f5ba17114d
Audit 2026-05-10 HIGH-6 partial closure (silence leg). The audit
identified two distinct gaps in the auth surface's audit-emit pattern:
(1) silence — `_ = audit.RecordEventWithCategory(...)` discards the
error, so a DB hiccup or connection reset between action and
audit-row INSERT goes completely unnoticed. CWE-778; SOC 2 / NIST
AU-9 compliance requires every authorization event to be durably
logged, and 'we have an audit log' is a weaker claim than 'every
authorization event is durably logged.'
(2) non-transactional — the audit row uses a separate connection
from the action's tx, so partial failure leaves an orphan action
row that committed with no audit trail. Decision 8 of the
auth-bundles-index requires action + audit row atomic.
This commit closes leg (1) fully across all six audit-emit call sites
in the auth surface:
- internal/service/auth/actor_role_service.go::recordAudit
- internal/service/auth/role_service.go::recordAudit
- internal/auth/bootstrap/service.go::ValidateAndMint
- internal/auth/breakglass/service.go::recordAudit
- internal/auth/session/service.go::recordAudit
- internal/api/handler/auth_session_oidc.go::recordAudit
- internal/service/profile.go::Update (Phase 9 approval-bypass)
Each `_ = ...` swallow is replaced with:
if err := audit.RecordEventWithCategory(...); err != nil {
slog.WarnContext(ctx, '<surface> audit write failed (action
committed; audit row may be missing)',
'action', action, 'actor_id', actor, 'resource_id', resource,
'err', err)
}
Operators monitoring audit-write failures now see structured WARN
logs with action + actor + resource attribution; missing audit rows
can be cross-referenced against monitoring without manual SELECT-from-
audit-table.
Infrastructure for leg (2) (transactional commit) is also landed in
this commit:
- service.AuditService.RecordEventWithCategoryWithTx (new method;
accepts repository.Querier from postgres.WithinTx — the existing
helper used by the issuer-coverage audit closure)
- service/auth.AuditService interface declares the new method
- test stub fakeAudit.RecordEventWithCategoryWithTx satisfies the
extended interface
The eight per-path WithinTx-refactors documented in
cowork/auth-bundles-fixes-2026-05-10/10-high-6-atomic-audit-commit.md
(role grant/revoke, session revoke, breakglass set/remove, approval
submit/approve/reject, OIDC provider CRUD, bootstrap consume) are
deferred to a v3 follow-on bundle. Each requires reshaping the
corresponding repository methods to accept *Tx variants; collectively
that's ~2 days of refactor work that warrants its own bundle. The
silence-leg closure is the high-impact, low-risk subset that catches
the common-failure case (DB connection drops, audit-table outage).
Refs: cowork/auth-bundles-audit-2026-05-10.md HIGH-6
Spec: cowork/auth-bundles-fixes-2026-05-10/10-high-6-atomic-audit-commit.md
214 lines
8.3 KiB
Go
214 lines
8.3 KiB
Go
package bootstrap
|
|
|
|
import (
|
|
"context"
|
|
"crypto/rand"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"log/slog"
|
|
"regexp"
|
|
"time"
|
|
|
|
"github.com/certctl-io/certctl/internal/domain"
|
|
authdomain "github.com/certctl-io/certctl/internal/domain/auth"
|
|
)
|
|
|
|
// actorNameRe matches the operator-supplied admin-key name. Constraints:
|
|
// 3-64 chars, lowercase alphanumeric + hyphen + underscore. Strict
|
|
// charset prevents audit-attribution shenanigans (control characters,
|
|
// log-injection sequences, mixed-case look-alikes for an existing
|
|
// admin actor's name).
|
|
var actorNameRe = regexp.MustCompile(`^[a-z0-9][a-z0-9_-]{2,63}$`)
|
|
|
|
// APIKeyMinter is the slice of APIKeyRepository the bootstrap service
|
|
// needs. Pulled out as a small interface so the service can be unit-
|
|
// tested with an in-memory fake.
|
|
type APIKeyMinter interface {
|
|
Create(ctx context.Context, key *authdomain.APIKey) error
|
|
GetByName(ctx context.Context, name string) (*authdomain.APIKey, error)
|
|
}
|
|
|
|
// RoleGranter is the slice of ActorRoleRepository the bootstrap
|
|
// service needs.
|
|
type RoleGranter interface {
|
|
Grant(ctx context.Context, ar *authdomain.ActorRole) error
|
|
}
|
|
|
|
// AuditRecorder is the slice of AuditService the bootstrap service
|
|
// needs. Phase 8 ships RecordEventWithCategory which classifies the
|
|
// row's event_category column directly; the bootstrap path always
|
|
// emits with category=auth.
|
|
type AuditRecorder interface {
|
|
RecordEventWithCategory(ctx context.Context, actor string, actorType domain.ActorType, action, eventCategory, resourceType, resourceID string, details map[string]interface{}) error
|
|
}
|
|
|
|
// KeyStoreAdder is the runtime hook the bootstrap service uses to
|
|
// register the just-minted key with the auth middleware so the next
|
|
// request authenticates without a process restart. The HTTP-layer
|
|
// auth middleware exposes this via internal/auth.MutableKeyStore.
|
|
type KeyStoreAdder interface {
|
|
AddHashed(name, hashHex string, admin bool)
|
|
}
|
|
|
|
// Service ties the bootstrap Strategy to the persistence layer. Kept
|
|
// separate from the HTTP handler so unit tests can drive it without
|
|
// httptest, and so the same service can back a future
|
|
// `certctl auth bootstrap` CLI command.
|
|
type Service struct {
|
|
strategy Strategy
|
|
keys APIKeyMinter
|
|
roles RoleGranter
|
|
audit AuditRecorder
|
|
keyStore KeyStoreAdder
|
|
hashAPIKey func(string) string // injected so the auth package's HashAPIKey doesn't import this package
|
|
}
|
|
|
|
// NewService constructs a bootstrap Service.
|
|
//
|
|
// hashAPIKey takes the plaintext key and returns the SHA-256 hex used
|
|
// by the auth middleware's keystore lookup. Pass internal/auth.HashAPIKey
|
|
// at the production wire site; tests can pass a deterministic hash for
|
|
// matching against MutableKeyStore lookups.
|
|
//
|
|
// keyStore is optional. Production wires the same MutableKeyStore the
|
|
// auth middleware reads from so the minted key authenticates the next
|
|
// request; when nil the bootstrap still persists the key to the DB
|
|
// but the operator must restart to pick it up via the boot loader.
|
|
func NewService(strategy Strategy, keys APIKeyMinter, roles RoleGranter, audit AuditRecorder, keyStore KeyStoreAdder, hashAPIKey func(string) string) *Service {
|
|
return &Service{
|
|
strategy: strategy,
|
|
keys: keys,
|
|
roles: roles,
|
|
audit: audit,
|
|
keyStore: keyStore,
|
|
hashAPIKey: hashAPIKey,
|
|
}
|
|
}
|
|
|
|
// MintResult is the success payload returned to the HTTP handler. Key
|
|
// is the plaintext value the operator must capture before the response
|
|
// is dropped — the server holds it for ~milliseconds and never logs it.
|
|
type MintResult struct {
|
|
APIKey *authdomain.APIKey
|
|
KeyValue string
|
|
}
|
|
|
|
// Available reports whether the bootstrap endpoint is currently
|
|
// callable. Returns the strategy's verdict plus a sentinel
|
|
// (ErrDisabled) when not. The HTTP handler maps the sentinel to 410
|
|
// Gone before reading any token from the request body so a probing
|
|
// attacker can't distinguish "no token configured" from "wrong
|
|
// token".
|
|
func (s *Service) Available(ctx context.Context) (bool, error) {
|
|
if s == nil || s.strategy == nil {
|
|
return false, ErrDisabled
|
|
}
|
|
return s.strategy.Available(ctx)
|
|
}
|
|
|
|
// ValidateAndMint consumes the strategy's credential and persists the
|
|
// first admin API key. The response carries the plaintext key value
|
|
// once; the operator MUST capture it before the response goes out the
|
|
// wire. Subsequent calls return ErrDisabled (one-shot semantics).
|
|
//
|
|
// Side effects:
|
|
// 1. Strategy.Validate atomically flips its consumed state.
|
|
// 2. A new row is written to api_keys (id, name, sha256(key), admin=true).
|
|
// 3. A new row is written to actor_roles (actor=name, role=r-admin).
|
|
// 4. The MutableKeyStore (if wired) gains a runtime entry so the next
|
|
// request authenticates without a restart.
|
|
// 5. An audit event records the bootstrap consumption with
|
|
// event_category=auth, action=bootstrap.consume.
|
|
//
|
|
// The plaintext key is NEVER logged. It exists in three places:
|
|
// - the random buffer this function generates,
|
|
// - the MintResult.KeyValue field (the handler writes it to the
|
|
// response then discards),
|
|
// - the HTTP response body itself.
|
|
//
|
|
// If the persistence calls fail AFTER the strategy is consumed, the
|
|
// service does NOT roll back the strategy state — by design. A failed
|
|
// ValidateAndMint call leaves bootstrap closed; the operator must
|
|
// recover via DB seeding (insert into actor_roles directly) rather
|
|
// than retry. The alternative (retry) opens a window for a successful
|
|
// validate-then-fail sequence to mint two admin keys on retry, which
|
|
// silently widens the trust radius.
|
|
func (s *Service) ValidateAndMint(ctx context.Context, token, actorName string) (*MintResult, error) {
|
|
if s == nil || s.strategy == nil || s.keys == nil || s.roles == nil {
|
|
return nil, ErrDisabled
|
|
}
|
|
if !actorNameRe.MatchString(actorName) {
|
|
return nil, ErrInvalidActorName
|
|
}
|
|
if err := s.strategy.Validate(ctx, token); err != nil {
|
|
return nil, err
|
|
}
|
|
// Strategy is now consumed; if anything below fails the operator
|
|
// has to recover via DB. See the docstring on MintFirstAdmin.
|
|
keyValue, err := generateAPIKey()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("bootstrap: random key generation: %w", err)
|
|
}
|
|
keyHash := s.hashAPIKey(keyValue)
|
|
now := time.Now().UTC()
|
|
apiKey := &authdomain.APIKey{
|
|
Name: actorName,
|
|
KeyHash: keyHash,
|
|
TenantID: authdomain.DefaultTenantID,
|
|
Admin: true,
|
|
CreatedBy: "bootstrap",
|
|
CreatedAt: now,
|
|
}
|
|
if err := s.keys.Create(ctx, apiKey); err != nil {
|
|
return nil, fmt.Errorf("bootstrap: persist key: %w", err)
|
|
}
|
|
if err := s.roles.Grant(ctx, &authdomain.ActorRole{
|
|
ActorID: actorName,
|
|
ActorType: authdomain.ActorTypeValue(domain.ActorTypeAPIKey),
|
|
RoleID: authdomain.RoleIDAdmin,
|
|
TenantID: authdomain.DefaultTenantID,
|
|
GrantedBy: "bootstrap",
|
|
}); err != nil {
|
|
return nil, fmt.Errorf("bootstrap: grant admin role: %w", err)
|
|
}
|
|
if s.keyStore != nil {
|
|
s.keyStore.AddHashed(actorName, keyHash, true)
|
|
}
|
|
if s.audit != nil {
|
|
// Phase 8 promotes event_category to a first-class column.
|
|
// Bootstrap is unambiguously an auth event. Errors from the
|
|
// audit write are intentionally ignored: the bootstrap mint
|
|
// succeeded and the consequent audit-row miss is preferable
|
|
// to surfacing a 500 to the operator after the admin-key
|
|
// already landed in the DB. The audit-row gap is detectable
|
|
// in monitoring (every successful mint should have a paired
|
|
// bootstrap.consume row).
|
|
// Audit 2026-05-10 HIGH-6 partial closure — emit WARN on audit-
|
|
// write failure so the silent-row-miss is observable. The
|
|
// transactional-leg WithinTx refactor is a v3 follow-on.
|
|
if err := s.audit.RecordEventWithCategory(ctx, "bootstrap-token", domain.ActorTypeSystem,
|
|
"bootstrap.consume", domain.EventCategoryAuth, "api_key", apiKey.ID,
|
|
map[string]interface{}{
|
|
"actor_name": actorName,
|
|
"role_id": authdomain.RoleIDAdmin,
|
|
}); err != nil {
|
|
slog.WarnContext(ctx, "bootstrap.consume audit write failed (admin key minted; audit row may be missing)",
|
|
"actor_name", actorName,
|
|
"api_key_id", apiKey.ID,
|
|
"err", err)
|
|
}
|
|
}
|
|
return &MintResult{APIKey: apiKey, KeyValue: keyValue}, nil
|
|
}
|
|
|
|
// generateAPIKey returns 32 random bytes hex-encoded (64-char output).
|
|
// Same entropy budget as `openssl rand -hex 32` which the agent
|
|
// bootstrap docs recommend.
|
|
func generateAPIKey() (string, error) {
|
|
buf := make([]byte, 32)
|
|
if _, err := rand.Read(buf); err != nil {
|
|
return "", err
|
|
}
|
|
return hex.EncodeToString(buf), nil
|
|
}
|