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.
169 lines
6.2 KiB
Go
169 lines
6.2 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
|
|
"github.com/certctl-io/certctl/internal/api/middleware"
|
|
"github.com/certctl-io/certctl/internal/domain"
|
|
)
|
|
|
|
// BulkRevocationService defines the service interface for bulk certificate revocation.
|
|
type BulkRevocationService interface {
|
|
BulkRevoke(ctx context.Context, criteria domain.BulkRevocationCriteria, reason string, actor string) (*domain.BulkRevocationResult, error)
|
|
}
|
|
|
|
// BulkRevocationHandler handles HTTP requests for bulk revocation operations.
|
|
type BulkRevocationHandler struct {
|
|
svc BulkRevocationService
|
|
}
|
|
|
|
// NewBulkRevocationHandler creates a new BulkRevocationHandler.
|
|
func NewBulkRevocationHandler(svc BulkRevocationService) BulkRevocationHandler {
|
|
return BulkRevocationHandler{svc: svc}
|
|
}
|
|
|
|
// bulkRevokeRequest represents the JSON request body for bulk revocation.
|
|
type bulkRevokeRequest struct {
|
|
Reason string `json:"reason"`
|
|
ProfileID string `json:"profile_id,omitempty"`
|
|
OwnerID string `json:"owner_id,omitempty"`
|
|
AgentID string `json:"agent_id,omitempty"`
|
|
IssuerID string `json:"issuer_id,omitempty"`
|
|
TeamID string `json:"team_id,omitempty"`
|
|
CertificateIDs []string `json:"certificate_ids,omitempty"`
|
|
}
|
|
|
|
// BulkRevoke handles bulk certificate revocation.
|
|
// POST /api/v1/certificates/bulk-revoke
|
|
//
|
|
// M-003: admin-only. Bulk revocation is a fleet-scale destructive operation —
|
|
// a non-admin caller must not be able to invalidate certificates across
|
|
// profiles/owners/agents. The gate is enforced here (before body parsing) so a
|
|
// non-admin never sees its request criteria evaluated.
|
|
func (h BulkRevocationHandler) BulkRevoke(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
// Bundle 1 Phase 3.5: M-003 admin-only gate moved to router.go.
|
|
// auth.RequirePermission(checker, "cert.bulk_revoke", nil) wraps
|
|
// this handler at registration time; non-admin callers without
|
|
// the cert.bulk_revoke permission get 403 from the middleware
|
|
// before reaching the handler body. The pre-3.5 in-body
|
|
// auth.IsAdmin check is gone.
|
|
|
|
var req bulkRevokeRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Invalid request body", requestID)
|
|
return
|
|
}
|
|
|
|
// Validate reason is present
|
|
if req.Reason == "" {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Revocation reason is required", requestID)
|
|
return
|
|
}
|
|
|
|
// Validate reason is a valid RFC 5280 code
|
|
if !domain.IsValidRevocationReason(req.Reason) {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Invalid revocation reason: "+req.Reason, requestID)
|
|
return
|
|
}
|
|
|
|
criteria := domain.BulkRevocationCriteria{
|
|
ProfileID: req.ProfileID,
|
|
OwnerID: req.OwnerID,
|
|
AgentID: req.AgentID,
|
|
IssuerID: req.IssuerID,
|
|
TeamID: req.TeamID,
|
|
CertificateIDs: req.CertificateIDs,
|
|
}
|
|
|
|
// Safety guard: at least one criterion required
|
|
if criteria.IsEmpty() {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "At least one filter criterion is required (profile_id, owner_id, agent_id, issuer_id, team_id, or certificate_ids)", requestID)
|
|
return
|
|
}
|
|
|
|
// Extract actor from auth context (M-002: named-key identity → audit trail)
|
|
actor := resolveActor(r.Context())
|
|
|
|
result, err := h.svc.BulkRevoke(r.Context(), criteria, req.Reason, actor)
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Bulk revocation failed: "+err.Error(), requestID)
|
|
return
|
|
}
|
|
|
|
JSON(w, http.StatusOK, result)
|
|
}
|
|
|
|
// BulkRevokeEST handles EST-source-scoped bulk certificate revocation.
|
|
// POST /api/v1/est/certificates/bulk-revoke
|
|
//
|
|
// EST RFC 7030 hardening master bundle Phase 11.2.
|
|
//
|
|
// Identical to BulkRevoke above but the Source criterion is pinned to
|
|
// CertificateSourceEST so the operation only affects certs the EST
|
|
// service stamped at issuance time. Operators who want to revoke
|
|
// "every cert this device family ever issued through EST" hit this
|
|
// endpoint with a profile_id / owner_id / etc. criterion + the
|
|
// handler narrows the result set to EST-only.
|
|
//
|
|
// Same M-008 admin-gate as the generic BulkRevoke. Audit action
|
|
// emitted by the service is `est_bulk_revoke` (typed code from Phase
|
|
// 11.3) so operators grep on the action string distinguishes
|
|
// EST-bulk-revoke from the generic bulk-revoke.
|
|
func (h BulkRevocationHandler) BulkRevokeEST(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
// Bundle 1 Phase 3.5: gate moved to router.go (cert.bulk_revoke perm).
|
|
var req bulkRevokeRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Invalid request body", requestID)
|
|
return
|
|
}
|
|
if req.Reason == "" {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Revocation reason is required", requestID)
|
|
return
|
|
}
|
|
if !domain.IsValidRevocationReason(req.Reason) {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Invalid revocation reason: "+req.Reason, requestID)
|
|
return
|
|
}
|
|
criteria := domain.BulkRevocationCriteria{
|
|
ProfileID: req.ProfileID,
|
|
OwnerID: req.OwnerID,
|
|
AgentID: req.AgentID,
|
|
IssuerID: req.IssuerID,
|
|
TeamID: req.TeamID,
|
|
CertificateIDs: req.CertificateIDs,
|
|
// Pin Source to EST — operators MUST also supply at least one
|
|
// narrower criterion (criteria.IsEmpty intentionally excludes
|
|
// Source so a Source-only request is still rejected as too
|
|
// broad). This protects against "revoke every EST cert in the
|
|
// fleet" via a malformed body.
|
|
Source: domain.CertificateSourceEST,
|
|
}
|
|
if criteria.IsEmpty() {
|
|
ErrorWithRequestID(w, http.StatusBadRequest,
|
|
"At least one narrower criterion is required (profile_id, owner_id, agent_id, issuer_id, team_id, or certificate_ids); EST bulk-revoke is implicitly Source-scoped to EST",
|
|
requestID)
|
|
return
|
|
}
|
|
actor := resolveActor(r.Context())
|
|
result, err := h.svc.BulkRevoke(r.Context(), criteria, req.Reason, actor)
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "EST bulk revocation failed: "+err.Error(), requestID)
|
|
return
|
|
}
|
|
JSON(w, http.StatusOK, result)
|
|
}
|