mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 17:31:30 +00:00
7ff2e2de08
Phase 3.5 atomic conversion. The five legacy admin-gated handlers (bulk_revocation, admin_crl_cache, admin_scep_intune, admin_est, intermediate_ca) had their in-body auth.IsAdmin checks removed; the gate moved to router.go via auth.RequirePermission middleware wrapping each route. Non-admin operators with the right scoped permission can now reach these endpoints; legacy in-body admin checks no longer block them.
Migration 000030_rbac_admin_perms.up.sql ships five admin-only fine-grained permissions: cert.bulk_revoke, crl.admin, scep.admin, est.admin, ca.hierarchy.manage. All five are seeded into r-admin only; operator/viewer/agent/mcp/cli/auditor do not receive them by default. Operators can grant any of these to a custom role via the Phase 4 RBAC API. Idempotent + transaction-wrapped.
internal/domain/auth/validate.go::CanonicalPermissions extended with the five new entries so RoleService.AddPermission accepts them.
internal/api/router/router.go: HandlerRegistry gains a Checker field (auth.PermissionChecker). New rbacGate(checker, perm, handler) helper wraps a handler with auth.RequirePermission middleware; nil-checker fall-through preserves test/demo deployments without the RBAC stack. 12 admin routes wrapped: cert.bulk_revoke (POST /api/v1/certificates/bulk-revoke + POST /api/v1/est/certificates/bulk-revoke), crl.admin (GET /api/v1/admin/crl/cache), scep.admin (GET /api/v1/admin/scep/profiles + GET /api/v1/admin/scep/intune/stats + POST /api/v1/admin/scep/intune/reload-trust), est.admin (GET /api/v1/admin/est/profiles + POST /api/v1/admin/est/reload-trust), ca.hierarchy.manage (POST /api/v1/issuers/{id}/intermediates + GET /api/v1/issuers/{id}/intermediates + POST /api/v1/intermediates/{id}/retire + GET /api/v1/intermediates/{id}).
cmd/server/main.go: HandlerRegistry.Checker wired with the same authPermissionCheckerAdapter shim Phase 4 introduced for AuthHandler. Same adapter; one source of truth.
Handler bodies: removed eight in-body auth.IsAdmin checks across the 5 files. bulk_revocation.go's BulkRevoke + BulkRevokeEST, admin_crl_cache.go::ListCache, admin_scep_intune.go's three methods, admin_est.go's two methods, intermediate_ca.go's four methods. Replaced each with a comment naming the new gate location. Unused 'github.com/certctl-io/certctl/internal/auth' imports removed.
Test triplet rewrite: deleted obsolete _NonAdmin_Returns403 and _AdminExplicitFalse_Returns403 tests across 6 test files (5 handler tests + bulk_revocation_est_test.go) — they tested the now-removed in-body gate. _AdminPermitted_ForwardsActor tests stay intact: they pin the actor-passthrough invariant which is still relevant. Added internal/api/router/rbac_gate_integration_test.go with four router-level integration tests pinning the new gate: deny → 403 + handler not reached, permit → 200 + handler reached, nil-checker → fall-through, no-actor → 401.
M-008 admin-gate registry: AdminGatedHandlers map now empty (Phase 3.5 invariant: zero in-handler auth.IsAdmin call sites; only health.go's informational caller remains). m008_admin_gate_test.go retains the scan to enforce the invariant going forward; new admin-gated routes must wrap at router.go::rbacGate, not gate in-handler. Updated error message to direct future contributors to the new pattern.
Verifications: gofmt clean across all touched files; go vet ./... clean; go test -short across internal/auth, internal/service/auth, internal/api/handler, internal/api/router, cmd/server all green.
Branch: dev/auth-bundle-1. Commit chain: 99a012e (Phase 0 extract) -> 19497ee (Phase 1 schema + repo) -> bd54d5f (Phase 2 service) -> d473398 (Phase 3 primitive) -> b169f25 (Phase 4 + 5) -> THIS (Phase 3.5 conversion). Phase 6+ (bootstrap, scope-down, auditor, approval-bypass closure, GUI, docs) on subsequent sessions.
176 lines
6.4 KiB
Go
176 lines
6.4 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/certctl-io/certctl/internal/service"
|
|
)
|
|
|
|
// EST RFC 7030 hardening master bundle Phase 7.2 — admin observability
|
|
// endpoints for the EST Administration GUI.
|
|
//
|
|
// Endpoints:
|
|
//
|
|
// GET /api/v1/admin/est/profiles — Phase 7.2 (per-profile snapshot)
|
|
// POST /api/v1/admin/est/reload-trust — Phase 7.2 (JSON body: {"path_id":"corp"})
|
|
//
|
|
// All endpoints are admin-gated (M-008 pattern). Non-admin Bearer
|
|
// callers get 403 — the profiles endpoint reveals the operator's
|
|
// profile set + trust-anchor expiries (sensitive operational metadata),
|
|
// the reload endpoint is a privileged action that swaps the in-memory
|
|
// trust pool.
|
|
|
|
// AdminESTService is the slice of the per-profile ESTService set the
|
|
// admin handler needs. The handler depends on this narrow interface
|
|
// rather than the concrete *service.ESTService set so wiring stays
|
|
// service-side and the handler stays test-friendly.
|
|
type AdminESTService interface {
|
|
// Profiles returns one snapshot per configured EST profile. Walks
|
|
// the per-PathID service map under the hood.
|
|
Profiles(ctx context.Context, now time.Time) ([]service.ESTStatsSnapshot, error)
|
|
|
|
// ReloadTrust triggers the SIGHUP-equivalent Reload on the named
|
|
// profile's trust holder. Returns ErrAdminESTProfileNotFound if the
|
|
// PathID isn't known, or service.ErrESTMTLSDisabled if the profile
|
|
// exists but mTLS isn't configured, or the underlying parse error
|
|
// from trustanchor.LoadBundle on a bad reload (the holder retains
|
|
// the OLD pool either way — fail-safe enforced one layer down).
|
|
ReloadTrust(ctx context.Context, pathID string) error
|
|
}
|
|
|
|
// ErrAdminESTProfileNotFound is returned by AdminESTService implementations
|
|
// when the operator targets a PathID that doesn't map to any configured
|
|
// EST profile. The handler maps this to HTTP 404.
|
|
var ErrAdminESTProfileNotFound = errors.New("admin est: profile not found for the given path_id")
|
|
|
|
// AdminESTHandler serves the per-profile EST observability endpoints.
|
|
type AdminESTHandler struct {
|
|
svc AdminESTService
|
|
}
|
|
|
|
// NewAdminESTHandler creates a new admin handler.
|
|
func NewAdminESTHandler(svc AdminESTService) AdminESTHandler {
|
|
return AdminESTHandler{svc: svc}
|
|
}
|
|
|
|
// adminESTReloadRequest is the POST body shape for the reload-trust
|
|
// endpoint. PathID="" targets the legacy /.well-known/est root profile
|
|
// (the one with empty PathID), matching the convention used elsewhere
|
|
// in the per-profile dispatch.
|
|
type adminESTReloadRequest struct {
|
|
PathID string `json:"path_id"`
|
|
}
|
|
|
|
// Profiles handles GET /api/v1/admin/est/profiles.
|
|
//
|
|
// Mirrors AdminSCEPIntuneHandler.Profiles. Returns one snapshot per
|
|
// configured EST profile in ESTStatsSnapshot shape (always-present
|
|
// per-profile fields + optional trust-anchor sub-block).
|
|
func (h AdminESTHandler) Profiles(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
// Bundle 1 Phase 3.5: gate moved to router.go (RequirePermission middleware).
|
|
|
|
now := time.Now()
|
|
rows, err := h.svc.Profiles(r.Context(), now)
|
|
if err != nil {
|
|
Error(w, http.StatusInternalServerError, "Failed to read EST profiles")
|
|
return
|
|
}
|
|
if rows == nil {
|
|
// Avoid serialising as `null` — the GUI expects an array.
|
|
rows = []service.ESTStatsSnapshot{}
|
|
}
|
|
_ = JSON(w, http.StatusOK, map[string]any{
|
|
"profiles": rows,
|
|
"profile_count": len(rows),
|
|
"generated_at": now.UTC(),
|
|
})
|
|
}
|
|
|
|
// ReloadTrust handles POST /api/v1/admin/est/reload-trust.
|
|
func (h AdminESTHandler) ReloadTrust(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
// Bundle 1 Phase 3.5: gate moved to router.go (RequirePermission middleware).
|
|
|
|
var body adminESTReloadRequest
|
|
// An empty body is permitted: it implicitly targets the legacy
|
|
// /.well-known/est root profile (PathID=""). Operators with multi-
|
|
// profile deploys MUST supply a path_id JSON field.
|
|
if r.ContentLength > 0 {
|
|
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
|
Error(w, http.StatusBadRequest, "Invalid JSON body: "+err.Error())
|
|
return
|
|
}
|
|
}
|
|
|
|
err := h.svc.ReloadTrust(r.Context(), body.PathID)
|
|
switch {
|
|
case err == nil:
|
|
_ = JSON(w, http.StatusOK, map[string]any{
|
|
"reloaded": true,
|
|
"path_id": body.PathID,
|
|
"reloaded_at": time.Now().UTC(),
|
|
})
|
|
case errors.Is(err, ErrAdminESTProfileNotFound):
|
|
Error(w, http.StatusNotFound, "EST profile not found for path_id="+body.PathID)
|
|
case errors.Is(err, service.ErrESTMTLSDisabled):
|
|
// 409 Conflict: profile exists but mTLS isn't enabled, so
|
|
// there's no trust anchor to reload. Distinct from 404 so the
|
|
// operator can correct the request without re-checking the
|
|
// profile list.
|
|
Error(w, http.StatusConflict, "EST profile path_id="+body.PathID+" does not have mTLS enabled")
|
|
default:
|
|
// Underlying trustanchor.LoadBundle errors (parse failure,
|
|
// expired cert, missing file). The holder retains its previous
|
|
// pool — the operator's enrollments keep working off the old
|
|
// trust anchor while the operator fixes the file.
|
|
Error(w, http.StatusInternalServerError, "Trust anchor reload failed: "+err.Error())
|
|
}
|
|
}
|
|
|
|
// AdminESTServiceImpl is the production implementation of AdminESTService.
|
|
// Walks the per-profile ESTService set built by cmd/server/main.go.
|
|
type AdminESTServiceImpl struct {
|
|
services map[string]*service.ESTService
|
|
}
|
|
|
|
// NewAdminESTServiceImpl constructs the handler-side service from the
|
|
// per-profile ESTService map built at startup.
|
|
func NewAdminESTServiceImpl(services map[string]*service.ESTService) *AdminESTServiceImpl {
|
|
if services == nil {
|
|
services = map[string]*service.ESTService{}
|
|
}
|
|
return &AdminESTServiceImpl{services: services}
|
|
}
|
|
|
|
// Profiles implements AdminESTService.
|
|
func (s *AdminESTServiceImpl) Profiles(_ context.Context, now time.Time) ([]service.ESTStatsSnapshot, error) {
|
|
out := make([]service.ESTStatsSnapshot, 0, len(s.services))
|
|
for _, svc := range s.services {
|
|
out = append(out, svc.Stats(now))
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// ReloadTrust implements AdminESTService.
|
|
func (s *AdminESTServiceImpl) ReloadTrust(ctx context.Context, pathID string) error {
|
|
svc, ok := s.services[pathID]
|
|
if !ok {
|
|
return ErrAdminESTProfileNotFound
|
|
}
|
|
return svc.ReloadTrust(ctx)
|
|
}
|
|
|
|
// Compile-time interface check.
|
|
var _ AdminESTService = (*AdminESTServiceImpl)(nil)
|