mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 18:01:37 +00:00
5b67ff3944
Phase 9 follow-up to the SCEP RFC 8894 + Intune master bundle. The
Phase 9.4 GUI shipped 'SCEP Intune Monitoring' at /scep/intune, which
made the per-profile observability surface look Intune-only — operators
running EJBCA + Jamf would never click that nav link expecting per-
profile RA cert + mTLS observability. The page is per-profile keyed
under the hood; this commit rebrands + restructures so the surface
matches what operators actually need.
Spec: cowork/scep-gui-restructure-prompt.md.
User-visible change:
- Nav link renamed: 'SCEP Intune' → 'SCEP Admin'.
- Route: /scep is the new canonical path; /scep/intune kept as a
backward-compat alias that lands directly on the Intune tab.
- Page header: 'SCEP Administration'.
- Three tabs:
* Profiles (default) — per-profile lean cards with RA cert
expiry countdown, mTLS sibling-route status badge, Intune
enabled/disabled badge, challenge-password-set indicator.
'View Intune details →' link on Intune-enabled cards
deep-links into the Intune tab.
* Intune Monitoring — the existing Phase 9.4 deep-dive
(per-status counters, trust anchor expiry, recent failures
table, reload-trust button + confirmation modal).
* Recent Activity — full SCEP audit log filter merging all
four action codes (scep_pkcsreq + scep_renewalreq +
scep_pkcsreq_intune + scep_renewalreq_intune); chip filters
for All / Initial / Renewal / Intune / Static.
Backend:
* internal/service/scep.go — new SCEPProfileStatsSnapshot type +
IntuneSection sub-block + ProfileStats(now) accessor. Adds
raCertSubject/raCertNotBefore/raCertNotAfter + mtlsEnabled +
mtlsTrustBundlePath fields with SetRACert + SetMTLSConfig setters.
Existing IntuneStatsSnapshot + IntuneStats(now) preserved
UNCHANGED for /admin/scep/intune/stats backward compat (the
JSON shape stays byte-stable for external consumers — the
aliasing approach the prompt initially suggested doesn't work
because the new shape nests Intune while the old one is flat).
ChallengePasswordSet is derived from challengePassword != ''
(the secret value itself is never surfaced).
* internal/api/handler/admin_scep_intune.go — new Profiles handler
method on AdminSCEPIntuneHandler with the same M-008 admin gate.
AdminSCEPIntuneServiceImpl extended (in place; same
map[string]*service.SCEPService) to satisfy the new
AdminSCEPProfileService interface. Single handler file gets the
third method so the M-008 pin entry count stays steady (no new
file, no new triplet of admin-gate test files — just three new
Profiles tests inside the existing test file).
* internal/api/router/router.go — one new route
'GET /api/v1/admin/scep/profiles' registered to
reg.AdminSCEPIntune.Profiles. HandlerRegistry unchanged.
* api/openapi.yaml — new operation 'listSCEPProfiles' documenting
the request body / response shape / error mapping. Existing
Intune entries unchanged.
* cmd/server/main.go — per-profile loop now calls
scepService.SetMTLSConfig(profile.MTLSEnabled,
profile.MTLSClientCATrustBundlePath) right after SetPathID, and
scepService.SetRACert(raCert) right after loadSCEPRAPair returns
the leaf cert. Both setters are nil-safe.
* internal/api/handler/m008_admin_gate_test.go — extended the
existing admin_scep_intune.go entry's justification to mention
the third endpoint. No new map entry needed (file already
listed).
Backend tests (8 new):
* TestAdminSCEPProfiles_NonAdmin_Returns403
* TestAdminSCEPProfiles_AdminExplicitFalse_Returns403
* TestAdminSCEPProfiles_AdminPermitted_ForwardsActor — also pins
that Intune-enabled profiles emit an 'intune' sub-block while
Intune-disabled profiles OMIT it.
* TestAdminSCEPProfiles_RejectsNonGetMethod
* TestAdminSCEPProfiles_PropagatesServiceError
* TestAdminSCEPProfilesServiceImpl_NilMapReturnsEmpty
* (existing 16 Phase 9 admin tests still pass — backward-compat
preserved)
Frontend:
* web/src/api/types.ts — new SCEPProfileStatsSnapshot +
IntuneSection + SCEPProfilesResponse types. Existing
IntuneStatsSnapshot et al unchanged.
* web/src/api/client.ts — new getAdminSCEPProfiles helper.
* web/src/pages/SCEPAdminPage.tsx — full rewrite as the tabbed
surface. Reuses the existing ConfirmReloadModal and Intune
deep-dive card components verbatim; adds ProfileSummaryCard
(lean card for the Profiles tab) and ActivityTab. URL state
sync via useSearchParams so deep links survive reloads + browser
back/forward. The legacy /scep/intune route alias defaults the
activeTab to 'intune' on mount.
* web/src/main.tsx — new <Route path='scep' /> + preserved
<Route path='scep/intune' /> alias. Both render SCEPAdminPage.
* web/src/components/Layout.tsx — nav link rebranded:
label 'SCEP Intune' → 'SCEP Admin', to '/scep/intune' → '/scep'.
Frontend tests (20 — full rebuild):
* Admin gate (non-admin sees gated banner + zero admin API calls)
* Profiles tab default + Intune tab tabswitch + ?tab=intune deep
link + legacy /scep/intune alias all land on Intune
* Profiles tab status badges (Intune + mTLS + challenge-set)
reflect each profile's flags
* RA cert expiry tone bands (good ≥30d / warn 7-30d / bad <7d /
EXPIRED) verified across three fixture profiles
* 'View Intune details →' only renders for Intune-enabled
profiles AND switches tabs on click
* Empty-state banner when no profiles configured
* Intune tab counters render with the existing Phase 9 deep-dive
shape; reload modal Open/Confirm/Cancel/Error paths all pinned
* Recent Activity tab merges all four SCEP audit actions across
four parallel useQuery calls; filter chips
(all/initial/renewal/intune/static) narrow correctly
* Error path surfaces ErrorState on the active tab
Docs:
* docs/scep-intune.md — Operational monitoring section heading
expanded to '(SCEP Administration → Intune Monitoring tab)'.
Page-surface description rewritten for the tabbed shape;
admin-endpoints list extended with the new /admin/scep/profiles
entry.
* docs/architecture.md — Microsoft Intune Connector trust anchor
subsection updated to reference the Intune Monitoring tab inside
the SCEP Administration page + lists all three admin endpoints.
* docs/legacy-est-scep.md — forward-ref expanded with a parallel
sentence for the per-profile observability surface (independent
of Intune).
* README.md — Enrollment Protocols bullet for Intune updated to
'admin GUI SCEP Administration page at /scep' with the three
tabs called out.
Verification:
* gofmt clean on touched files
* go vet ./... clean
* staticcheck on intune+service+handler+router+cmd-server clean
* go test -short across intune+service+handler+router+cmd-server:
all green (existing Phase 9 tests + new Profiles tests)
* Frontend tsc --noEmit clean
* Vitest: 20/20 SCEPAdminPage tests + 3/3 sibling AuditPage tests
pass
* G-3 docs-drift CI guard reproduced locally: clean (no new env
vars; existing CERTCTL_SCEP_ allowlist prefix covers everything)
* M-009 hard-zero useMutation guard reproduced locally: clean
(the existing reload mutation already used useTrackedMutation
from the Phase 9 follow-up commit 96e81b6)
* openapi-parity test green (new GET /api/v1/admin/scep/profiles
operation documented)
* M-008 admin-gate scanner green (existing admin_scep_intune.go
entry covers all three handler methods; the test scanner
enforces the triplet by file, not by endpoint, and the new
Profiles triplet was added to the existing test file)
Backward compat preserved:
* /api/v1/admin/scep/intune/stats unchanged — same JSON shape,
same error codes, same M-008 gate
* /api/v1/admin/scep/intune/reload-trust unchanged
* /scep/intune route still works (alias to /scep with activeTab=intune)
* IntuneStatsSnapshot Go type unchanged
* IntuneStats(now) accessor unchanged
Refs: cowork/scep-gui-restructure-prompt.md
cowork/scep-rfc8894-intune-master-prompt.md::Phase 9
Phase 11.5 (SCEP probe in scanner — opt-in) and Phase 12
(release prep + tag) of the master bundle resume after this.
247 lines
9.2 KiB
Go
247 lines
9.2 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/shankar0123/certctl/internal/api/middleware"
|
|
"github.com/shankar0123/certctl/internal/service"
|
|
)
|
|
|
|
// AdminSCEPIntuneService is the slice of the per-profile SCEPService set
|
|
// the admin endpoint needs. The handler depends on this narrow interface
|
|
// rather than the concrete *service.SCEPService set so wiring stays
|
|
// service-side and the handler stays test-friendly.
|
|
//
|
|
// SCEP RFC 8894 + Intune master bundle Phase 9.1, extended in the
|
|
// Phase 9 follow-up (cowork/scep-gui-restructure-prompt.md) with
|
|
// Profiles for the per-profile SCEP Administration tab.
|
|
type AdminSCEPIntuneService interface {
|
|
// Stats returns one snapshot per configured SCEP profile (Intune-
|
|
// enabled or not) in the Phase 9.1 flat shape. Backward-compat for
|
|
// the existing /admin/scep/intune/stats endpoint.
|
|
Stats(ctx context.Context, now time.Time) ([]service.IntuneStatsSnapshot, error)
|
|
|
|
// Profiles returns one snapshot per configured SCEP profile in the
|
|
// new shape (always-present per-profile fields + optional Intune
|
|
// sub-block). Backs the new /admin/scep/profiles endpoint.
|
|
Profiles(ctx context.Context, now time.Time) ([]service.SCEPProfileStatsSnapshot, error)
|
|
|
|
// ReloadTrust triggers the SIGHUP-equivalent Reload on the named
|
|
// profile's trust holder. Returns ErrAdminSCEPProfileNotFound if
|
|
// the PathID isn't known, or ErrSCEPProfileIntuneDisabled if the
|
|
// profile exists but doesn't have Intune turned on, or the
|
|
// underlying parse error from intune.LoadTrustAnchor on a bad
|
|
// reload (the holder retains the OLD pool either way — the
|
|
// fail-safe is enforced one layer down).
|
|
ReloadTrust(ctx context.Context, pathID string) error
|
|
}
|
|
|
|
// ErrAdminSCEPProfileNotFound is returned by AdminSCEPIntuneService
|
|
// implementations when the operator targets a PathID that doesn't map
|
|
// to any configured profile. The handler maps this to HTTP 404.
|
|
var ErrAdminSCEPProfileNotFound = errors.New("admin scep intune: profile not found for the given path_id")
|
|
|
|
// AdminSCEPIntuneHandler serves the per-profile SCEP observability
|
|
// endpoints for the GUI SCEP Administration page.
|
|
//
|
|
// Endpoints:
|
|
//
|
|
// GET /api/v1/admin/scep/profiles — Phase 9 follow-up
|
|
// GET /api/v1/admin/scep/intune/stats — Phase 9.2
|
|
// POST /api/v1/admin/scep/intune/reload-trust — Phase 9.2 (JSON body: {"path_id": "corp"})
|
|
//
|
|
// All three endpoints are admin-gated (M-008 pattern). Non-admin Bearer
|
|
// callers get 403 — the stats endpoint reveals the operator's profile
|
|
// set + trust anchor expiries (sensitive operational metadata), the
|
|
// profiles endpoint additionally reveals RA cert expiries + mTLS bundle
|
|
// paths, and the reload endpoint is a privileged action.
|
|
type AdminSCEPIntuneHandler struct {
|
|
svc AdminSCEPIntuneService
|
|
}
|
|
|
|
// NewAdminSCEPIntuneHandler creates a new admin handler.
|
|
func NewAdminSCEPIntuneHandler(svc AdminSCEPIntuneService) AdminSCEPIntuneHandler {
|
|
return AdminSCEPIntuneHandler{svc: svc}
|
|
}
|
|
|
|
// adminScepIntuneReloadRequest is the POST body shape for the reload-
|
|
// trust endpoint. PathID="" targets the legacy /scep root profile (the
|
|
// one with empty PathID), matching the convention used elsewhere in the
|
|
// per-profile dispatch.
|
|
type adminScepIntuneReloadRequest struct {
|
|
PathID string `json:"path_id"`
|
|
}
|
|
|
|
// Profiles handles GET /api/v1/admin/scep/profiles.
|
|
//
|
|
// Phase 9 follow-up endpoint backing the SCEP Administration page's
|
|
// Profiles tab. Returns one snapshot per configured SCEP profile in
|
|
// the SCEPProfileStatsSnapshot shape (always-present per-profile
|
|
// fields + optional Intune sub-block).
|
|
//
|
|
// Same M-008 admin gate as Stats. Profiles where Intune is disabled
|
|
// appear with Intune=null in the response.
|
|
func (h AdminSCEPIntuneHandler) Profiles(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
if !middleware.IsAdmin(r.Context()) {
|
|
Error(w, http.StatusForbidden, "Admin access required")
|
|
return
|
|
}
|
|
|
|
now := time.Now()
|
|
rows, err := h.svc.Profiles(r.Context(), now)
|
|
if err != nil {
|
|
Error(w, http.StatusInternalServerError, "Failed to read SCEP profiles")
|
|
return
|
|
}
|
|
if rows == nil {
|
|
// Avoid serialising as `null` — the GUI expects an array.
|
|
rows = []service.SCEPProfileStatsSnapshot{}
|
|
}
|
|
_ = JSON(w, http.StatusOK, map[string]any{
|
|
"profiles": rows,
|
|
"profile_count": len(rows),
|
|
"generated_at": now.UTC(),
|
|
})
|
|
}
|
|
|
|
// Stats handles GET /api/v1/admin/scep/intune/stats.
|
|
func (h AdminSCEPIntuneHandler) Stats(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
if !middleware.IsAdmin(r.Context()) {
|
|
Error(w, http.StatusForbidden, "Admin access required")
|
|
return
|
|
}
|
|
|
|
now := time.Now()
|
|
rows, err := h.svc.Stats(r.Context(), now)
|
|
if err != nil {
|
|
Error(w, http.StatusInternalServerError, "Failed to read SCEP Intune stats")
|
|
return
|
|
}
|
|
if rows == nil {
|
|
// Avoid serialising as `null` — the GUI expects an array.
|
|
rows = []service.IntuneStatsSnapshot{}
|
|
}
|
|
_ = JSON(w, http.StatusOK, map[string]any{
|
|
"profiles": rows,
|
|
"profile_count": len(rows),
|
|
"generated_at": now.UTC(),
|
|
})
|
|
}
|
|
|
|
// ReloadTrust handles POST /api/v1/admin/scep/intune/reload-trust.
|
|
func (h AdminSCEPIntuneHandler) ReloadTrust(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
if !middleware.IsAdmin(r.Context()) {
|
|
Error(w, http.StatusForbidden, "Admin access required")
|
|
return
|
|
}
|
|
|
|
var body adminScepIntuneReloadRequest
|
|
// An empty body is permitted: it implicitly targets the legacy
|
|
// /scep 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, ErrAdminSCEPProfileNotFound):
|
|
Error(w, http.StatusNotFound, "SCEP profile not found for path_id="+body.PathID)
|
|
case errors.Is(err, service.ErrSCEPProfileIntuneDisabled):
|
|
// 409 Conflict: the profile exists but Intune isn't turned on,
|
|
// 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, "SCEP profile path_id="+body.PathID+" does not have Intune enabled")
|
|
default:
|
|
// Underlying intune.LoadTrustAnchor 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())
|
|
}
|
|
}
|
|
|
|
// AdminSCEPIntuneServiceImpl is the production implementation of
|
|
// AdminSCEPIntuneService. It walks the per-profile SCEPService set
|
|
// supplied by the caller (cmd/server/main.go) and aggregates the
|
|
// per-profile snapshots.
|
|
//
|
|
// Lives in the handler package because it's a thin handler-side
|
|
// composition; the heavy lifting is the per-service IntuneStats /
|
|
// ReloadIntuneTrust methods that already encapsulate the policy.
|
|
type AdminSCEPIntuneServiceImpl struct {
|
|
// services is keyed by SCEP profile PathID (empty string = legacy
|
|
// /scep root). Built once at server startup; the slice/map shape
|
|
// matches the per-profile SCEPService construction loop in
|
|
// cmd/server/main.go.
|
|
services map[string]*service.SCEPService
|
|
}
|
|
|
|
// NewAdminSCEPIntuneServiceImpl constructs the handler-side service
|
|
// from the per-profile SCEPService map built at startup.
|
|
func NewAdminSCEPIntuneServiceImpl(services map[string]*service.SCEPService) *AdminSCEPIntuneServiceImpl {
|
|
if services == nil {
|
|
services = map[string]*service.SCEPService{}
|
|
}
|
|
return &AdminSCEPIntuneServiceImpl{services: services}
|
|
}
|
|
|
|
// Stats implements AdminSCEPIntuneService.
|
|
func (s *AdminSCEPIntuneServiceImpl) Stats(_ context.Context, now time.Time) ([]service.IntuneStatsSnapshot, error) {
|
|
out := make([]service.IntuneStatsSnapshot, 0, len(s.services))
|
|
for _, svc := range s.services {
|
|
out = append(out, svc.IntuneStats(now))
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// Profiles implements AdminSCEPIntuneService for the new
|
|
// /admin/scep/profiles endpoint. Walks the same per-profile SCEPService
|
|
// map but emits the SCEPProfileStatsSnapshot shape (always-present
|
|
// fields + optional Intune sub-block).
|
|
func (s *AdminSCEPIntuneServiceImpl) Profiles(_ context.Context, now time.Time) ([]service.SCEPProfileStatsSnapshot, error) {
|
|
out := make([]service.SCEPProfileStatsSnapshot, 0, len(s.services))
|
|
for _, svc := range s.services {
|
|
out = append(out, svc.ProfileStats(now))
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// ReloadTrust implements AdminSCEPIntuneService.
|
|
func (s *AdminSCEPIntuneServiceImpl) ReloadTrust(_ context.Context, pathID string) error {
|
|
svc, ok := s.services[pathID]
|
|
if !ok {
|
|
return ErrAdminSCEPProfileNotFound
|
|
}
|
|
return svc.ReloadIntuneTrust()
|
|
}
|
|
|
|
// Compile-time interface check.
|
|
var _ AdminSCEPIntuneService = (*AdminSCEPIntuneServiceImpl)(nil)
|