Files
certctl/internal/service/m11c_crypto_enforcement_test.go
T
shankar0123 01f6eb9d09 feat(scep): plumb CertificateProfile.MustStaple end-to-end through service layer
SCEP RFC 8894 + Intune master bundle Phase 5.6 follow-up.

Closes the 'lying field' gap from the original Phase 5.6 commit (b33b843).
That commit shipped CertificateProfile.MustStaple as a domain field +
IssuanceRequest.MustStaple as the issuer-interface field + the local
issuer's RFC 7633 extension generation + byte-exact tests against the
spec — but the service layer (SCEP + EST + agent + renewal) never read
profile.MustStaple and never set IssuanceRequest.MustStaple. Operators
who set the field got: a stored value, an API that returned it, docs
that promised it worked, and a cert with no extension. Worse than not
having the field at all.

Per the new operating rule landed in cowork/CLAUDE.md::Operating Rules
('Always take the complete path, not the easy path'), this commit closes
the wire end-to-end.

internal/service/renewal.go
  * IssuerConnector interface signature gains a mustStaple bool param on
    IssueCertificate + RenewCertificate. The original 'this is a wider
    refactor' framing was overstated — it's one extra arg threaded
    through six call sites, not a structural change.

internal/service/issuer_adapter.go
  * IssuerConnectorAdapter.IssueCertificate + RenewCertificate accept
    the new param + populate IssuanceRequest.MustStaple /
    RenewalRequest.MustStaple. Connectors that don't honor extension
    injection (Vault, EJBCA, ACME, etc.) silently ignore the field —
    the Phase 5.6 commit's docblock already noted this.

internal/service/scep.go
  * processEnrollment now reads profile.MustStaple alongside
    profile.MaxTTLSeconds and threads it through the IssueCertificate
    call. The SCEP path was the load-bearing one — the original Phase
    5.6 docs example showed exactly this code shape but the wire was
    never landed.

internal/service/est.go
  * Same pattern as SCEP: read profile.MustStaple + thread to
    IssueCertificate. Defense in depth so a deploy that mounts the
    same profile across SCEP + EST gets consistent extension behavior.

internal/service/agent.go
  * The fallback direct-issuer signing path in heartbeatPipeline reads
    profile + threads MustStaple through. Server-mode keygen + ad-hoc
    CSR submission paths both go through this.

internal/service/renewal.go (the renewal-loop side, not the interface)
  * Both renewal call sites (server-CSR-generated + agent-CSR-submitted)
    read profile.MustStaple + thread it through RenewCertificate. Renewed
    certs match their initial-issuance extension set when the bound
    profile changes mid-lifetime.

internal/service/scep_must_staple_test.go (new)
  * TestSCEPService_PKCSReq_PlumbsMustStapleToIssuer — end-to-end
    integration test: profile.MustStaple=true → SCEP service →
    mock IssuerConnector saw mustStaple=true. This is the test the
    original Phase 5.6 commit should have shipped — proves the wire
    reaches the connector.
  * TestSCEPService_PKCSReq_NoMustStaplePropagatesFalse — companion
    pinning the symmetric contract; the mock pre-sets LastMustStaple=true
    so a stuck-at-true bug surfaces.

internal/service/testutil_test.go +
internal/service/m11c_crypto_enforcement_test.go +
internal/service/issuer_adapter_test.go +
cmd/server/preflight_test.go
  * Mock + fake IssuerConnector implementations gain the new mustStaple
    bool param. mockIssuerConnector + capturingIssuerConnector also gain
    a LastMustStaple / lastMustStaple field used by the new integration
    tests to assert the wire reached the connector.
  * Existing test call sites for adapter.IssueCertificate /
    adapter.RenewCertificate gain a trailing 'false' arg (mechanical bulk
    edit, no behavior change).

Verification:
  * gofmt + go vet + staticcheck clean for all touched paths.
  * go test -short -count=1 green across cmd/agent / cmd/cli /
    cmd/mcp-server / cmd/server / api/handler / api/middleware /
    api/router / service / scheduler / pkcs7 / connector/issuer/local /
    every connector subpackage / domain / crypto / mcp / repository.
  * The new TestSCEPService_PKCSReq_PlumbsMustStapleToIssuer test passes,
    proving the wire works end-to-end.

The follow-up rule from cowork/CLAUDE.md::Operating Rules — 'can an
operator flip the configurable bit and observe the behavior change
end-to-end with no further code changes?' — is now YES for must-staple
on the SCEP + EST + agent + renewal paths.
2026-04-29 13:36:30 +00:00

412 lines
14 KiB
Go

package service
import (
"context"
"log/slog"
"os"
"strings"
"testing"
"time"
"github.com/shankar0123/certctl/internal/domain"
)
// m11cProfileRepo wraps the existing mockProfileRepo from profile_test.go with AddProfile helper.
// We reuse the existing mock and just create instances with pre-populated profiles.
func newM11cProfileRepo() *mockProfileRepo {
return &mockProfileRepo{
profiles: make(map[string]*domain.CertificateProfile),
}
}
// --- EST Crypto Policy Enforcement Tests ---
func TestESTService_CryptoValidation_RejectsWeakKey(t *testing.T) {
mockIssuer := &mockIssuerConnector{}
svc := NewESTService("iss-local", mockIssuer, nil, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})))
// Profile requiring ECDSA P-384 minimum
profileRepo := newM11cProfileRepo()
profileRepo.profiles["prof-high-sec"] = &domain.CertificateProfile{
ID: "prof-high-sec",
Name: "High Security",
AllowedKeyAlgorithms: []domain.KeyAlgorithmRule{
{Algorithm: "ECDSA", MinSize: 384},
},
}
svc.SetProfileID("prof-high-sec")
svc.SetProfileRepo(profileRepo)
// P-256 CSR should be rejected by P-384 minimum
csrPEM := generateCSRPEM(t, "weak.example.com", nil)
_, err := svc.SimpleEnroll(context.Background(), csrPEM)
if err == nil {
t.Fatal("expected rejection for ECDSA P-256 against P-384 minimum")
}
if !strings.Contains(err.Error(), "EST enrollment rejected") {
t.Errorf("expected 'EST enrollment rejected' in error, got: %v", err)
}
if !strings.Contains(err.Error(), "does not match any allowed algorithm") {
t.Errorf("expected algorithm mismatch message, got: %v", err)
}
}
func TestESTService_CryptoValidation_AcceptsStrongKey(t *testing.T) {
mockIssuer := &mockIssuerConnector{}
auditRepo := newMockAuditRepository()
auditSvc := NewAuditService(auditRepo)
svc := NewESTService("iss-local", mockIssuer, auditSvc, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})))
// Profile allows P-256+
profileRepo := newM11cProfileRepo()
profileRepo.profiles["prof-standard"] = &domain.CertificateProfile{
ID: "prof-standard",
Name: "Standard TLS",
AllowedKeyAlgorithms: []domain.KeyAlgorithmRule{
{Algorithm: "ECDSA", MinSize: 256},
},
}
svc.SetProfileID("prof-standard")
svc.SetProfileRepo(profileRepo)
csrPEM := generateCSRPEM(t, "strong.example.com", nil)
result, err := svc.SimpleEnroll(context.Background(), csrPEM)
if err != nil {
t.Fatalf("expected success for ECDSA P-256 against P-256 minimum: %v", err)
}
if result == nil {
t.Fatal("expected non-nil result")
}
}
func TestESTService_MaxTTL_ForwardedToIssuer(t *testing.T) {
// Track what the mock issuer receives
var capturedMaxTTL int
mockIssuer := &mockIssuerConnector{}
// Override IssueCertificate to capture maxTTLSeconds
// We'll use a capturing mock instead
capturingMock := &capturingIssuerConnector{}
svc := NewESTService("iss-local", capturingMock, nil, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})))
profileRepo := newM11cProfileRepo()
profileRepo.profiles["prof-short"] = &domain.CertificateProfile{
ID: "prof-short",
Name: "Short Lived",
MaxTTLSeconds: 3600, // 1 hour
}
svc.SetProfileID("prof-short")
svc.SetProfileRepo(profileRepo)
csrPEM := generateCSRPEM(t, "short.example.com", nil)
_, err := svc.SimpleEnroll(context.Background(), csrPEM)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
capturedMaxTTL = capturingMock.lastMaxTTLSeconds
if capturedMaxTTL != 3600 {
t.Errorf("expected maxTTLSeconds=3600 forwarded to issuer, got %d", capturedMaxTTL)
}
_ = mockIssuer // suppress unused
}
// --- SCEP Crypto Policy Enforcement Tests ---
func TestSCEPService_CryptoValidation_RejectsWeakKey(t *testing.T) {
mockIssuer := &mockIssuerConnector{}
// H-2: SCEPService now requires a configured challenge password. Pass a
// matching client password so this test exercises the crypto-policy path
// rather than being short-circuited by the challenge-password guard.
svc := NewSCEPService("iss-local", mockIssuer, nil, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})), "secret123")
// Profile requiring ECDSA P-384 minimum
profileRepo := newM11cProfileRepo()
profileRepo.profiles["prof-high-sec"] = &domain.CertificateProfile{
ID: "prof-high-sec",
Name: "High Security",
AllowedKeyAlgorithms: []domain.KeyAlgorithmRule{
{Algorithm: "ECDSA", MinSize: 384},
},
}
svc.SetProfileID("prof-high-sec")
svc.SetProfileRepo(profileRepo)
// P-256 CSR should be rejected
csrPEM := generateCSRPEM(t, "device.example.com", nil)
_, err := svc.PKCSReq(context.Background(), csrPEM, "secret123", "txn-001")
if err == nil {
t.Fatal("expected rejection for ECDSA P-256 against P-384 minimum")
}
if !strings.Contains(err.Error(), "SCEP enrollment rejected") {
t.Errorf("expected 'SCEP enrollment rejected' in error, got: %v", err)
}
if !strings.Contains(err.Error(), "does not match any allowed algorithm") {
t.Errorf("expected algorithm mismatch message, got: %v", err)
}
}
func TestSCEPService_CryptoValidation_AcceptsStrongKey(t *testing.T) {
mockIssuer := &mockIssuerConnector{}
auditRepo := newMockAuditRepository()
auditSvc := NewAuditService(auditRepo)
// H-2: happy path exercises the authenticated branch.
svc := NewSCEPService("iss-local", mockIssuer, auditSvc, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})), "secret123")
profileRepo := newM11cProfileRepo()
profileRepo.profiles["prof-standard"] = &domain.CertificateProfile{
ID: "prof-standard",
Name: "Standard TLS",
AllowedKeyAlgorithms: []domain.KeyAlgorithmRule{
{Algorithm: "ECDSA", MinSize: 256},
},
}
svc.SetProfileID("prof-standard")
svc.SetProfileRepo(profileRepo)
csrPEM := generateCSRPEM(t, "device-ok.example.com", nil)
result, err := svc.PKCSReq(context.Background(), csrPEM, "secret123", "txn-002")
if err != nil {
t.Fatalf("expected success: %v", err)
}
if result == nil {
t.Fatal("expected non-nil result")
}
}
func TestSCEPService_MaxTTL_ForwardedToIssuer(t *testing.T) {
capturingMock := &capturingIssuerConnector{}
// H-2: challenge password required for enrollment.
svc := NewSCEPService("iss-local", capturingMock, nil, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})), "secret123")
profileRepo := newM11cProfileRepo()
profileRepo.profiles["prof-device"] = &domain.CertificateProfile{
ID: "prof-device",
Name: "Device Cert",
MaxTTLSeconds: 86400, // 24 hours
}
svc.SetProfileID("prof-device")
svc.SetProfileRepo(profileRepo)
csrPEM := generateCSRPEM(t, "mdm-device.example.com", nil)
_, err := svc.PKCSReq(context.Background(), csrPEM, "secret123", "txn-003")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if capturingMock.lastMaxTTLSeconds != 86400 {
t.Errorf("expected maxTTLSeconds=86400 forwarded to issuer, got %d", capturingMock.lastMaxTTLSeconds)
}
}
// --- Adapter MaxTTL Forwarding Tests ---
func TestIssuerConnectorAdapter_IssueCertificate_MaxTTLForwarded(t *testing.T) {
mock := &mockConnectorLayerIssuer{}
adapter := NewIssuerConnectorAdapter(mock)
_, err := adapter.IssueCertificate(context.Background(), "test.example.com", nil, "csr", nil, 7200, false)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if mock.lastIssueReq == nil {
t.Fatal("expected request to be recorded")
}
if mock.lastIssueReq.MaxTTLSeconds != 7200 {
t.Errorf("expected MaxTTLSeconds=7200, got %d", mock.lastIssueReq.MaxTTLSeconds)
}
}
func TestIssuerConnectorAdapter_RenewCertificate_MaxTTLForwarded(t *testing.T) {
mock := &mockConnectorLayerIssuer{}
adapter := NewIssuerConnectorAdapter(mock)
_, err := adapter.RenewCertificate(context.Background(), "renew.example.com", nil, "csr", nil, 14400, false)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if mock.lastRenewReq == nil {
t.Fatal("expected request to be recorded")
}
if mock.lastRenewReq.MaxTTLSeconds != 14400 {
t.Errorf("expected MaxTTLSeconds=14400, got %d", mock.lastRenewReq.MaxTTLSeconds)
}
}
func TestIssuerConnectorAdapter_IssueCertificate_ZeroMaxTTL(t *testing.T) {
mock := &mockConnectorLayerIssuer{}
adapter := NewIssuerConnectorAdapter(mock)
_, err := adapter.IssueCertificate(context.Background(), "test.example.com", nil, "csr", nil, 0, false)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if mock.lastIssueReq.MaxTTLSeconds != 0 {
t.Errorf("expected MaxTTLSeconds=0 (no cap), got %d", mock.lastIssueReq.MaxTTLSeconds)
}
}
// --- CreateVersion Key Metadata Persistence Tests ---
func TestCreateVersion_KeyMetadata_Persisted(t *testing.T) {
certRepo := newMockCertificateRepository()
version := &domain.CertificateVersion{
ID: "ver-001",
CertificateID: "cert-001",
SerialNumber: "serial-001",
PEMChain: "-----BEGIN CERTIFICATE-----\ntest\n-----END CERTIFICATE-----",
NotBefore: time.Now(),
NotAfter: time.Now().AddDate(1, 0, 0),
KeyAlgorithm: "ECDSA",
KeySize: 256,
}
err := certRepo.CreateVersion(context.Background(), version)
if err != nil {
t.Fatalf("CreateVersion failed: %v", err)
}
// Retrieve and verify key metadata was stored
versions, err := certRepo.ListVersions(context.Background(), "cert-001")
if err != nil {
t.Fatalf("ListVersions failed: %v", err)
}
if len(versions) != 1 {
t.Fatalf("expected 1 version, got %d", len(versions))
}
if versions[0].KeyAlgorithm != "ECDSA" {
t.Errorf("expected KeyAlgorithm=ECDSA, got %s", versions[0].KeyAlgorithm)
}
if versions[0].KeySize != 256 {
t.Errorf("expected KeySize=256, got %d", versions[0].KeySize)
}
}
func TestCreateVersion_RSAKeyMetadata_Persisted(t *testing.T) {
certRepo := newMockCertificateRepository()
version := &domain.CertificateVersion{
ID: "ver-002",
CertificateID: "cert-002",
SerialNumber: "serial-002",
PEMChain: "-----BEGIN CERTIFICATE-----\ntest\n-----END CERTIFICATE-----",
NotBefore: time.Now(),
NotAfter: time.Now().AddDate(1, 0, 0),
KeyAlgorithm: "RSA",
KeySize: 4096,
}
err := certRepo.CreateVersion(context.Background(), version)
if err != nil {
t.Fatalf("CreateVersion failed: %v", err)
}
versions, err := certRepo.ListVersions(context.Background(), "cert-002")
if err != nil {
t.Fatalf("ListVersions failed: %v", err)
}
if versions[0].KeyAlgorithm != "RSA" {
t.Errorf("expected KeyAlgorithm=RSA, got %s", versions[0].KeyAlgorithm)
}
if versions[0].KeySize != 4096 {
t.Errorf("expected KeySize=4096, got %d", versions[0].KeySize)
}
}
// --- EST/SCEP without profile repo (graceful passthrough) ---
func TestESTService_NoProfileRepo_PassesThrough(t *testing.T) {
mockIssuer := &mockIssuerConnector{}
svc := NewESTService("iss-local", mockIssuer, nil, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})))
svc.SetProfileID("nonexistent-profile")
// Deliberately NOT calling SetProfileRepo — should pass through without validation
csrPEM := generateCSRPEM(t, "no-profile.example.com", nil)
result, err := svc.SimpleEnroll(context.Background(), csrPEM)
if err != nil {
t.Fatalf("expected success when no profile repo set: %v", err)
}
if result == nil {
t.Fatal("expected non-nil result")
}
}
func TestSCEPService_NoProfileRepo_PassesThrough(t *testing.T) {
mockIssuer := &mockIssuerConnector{}
// H-2: challenge password required for enrollment.
svc := NewSCEPService("iss-local", mockIssuer, nil, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError})), "secret123")
svc.SetProfileID("nonexistent-profile")
csrPEM := generateCSRPEM(t, "no-profile-scep.example.com", nil)
result, err := svc.PKCSReq(context.Background(), csrPEM, "secret123", "txn-004")
if err != nil {
t.Fatalf("expected success when no profile repo set: %v", err)
}
if result == nil {
t.Fatal("expected non-nil result")
}
}
// --- capturingIssuerConnector captures maxTTLSeconds for verification ---
type capturingIssuerConnector struct {
lastMaxTTLSeconds int
lastEKUs []string
// SCEP RFC 8894 + Intune master bundle Phase 5.6 follow-up: capture
// must-staple too so the integration test can prove the wire reaches
// the connector for both PKCSReq and renewal paths.
lastMustStaple bool
}
func (c *capturingIssuerConnector) IssueCertificate(ctx context.Context, commonName string, sans []string, csrPEM string, ekus []string, maxTTLSeconds int, mustStaple bool) (*IssuanceResult, error) {
c.lastMaxTTLSeconds = maxTTLSeconds
c.lastEKUs = ekus
c.lastMustStaple = mustStaple
now := time.Now()
return &IssuanceResult{
Serial: "test-serial",
CertPEM: "-----BEGIN CERTIFICATE-----\ntest\n-----END CERTIFICATE-----",
ChainPEM: "-----BEGIN CERTIFICATE-----\nchain\n-----END CERTIFICATE-----",
NotBefore: now,
NotAfter: now.AddDate(1, 0, 0),
}, nil
}
func (c *capturingIssuerConnector) RenewCertificate(ctx context.Context, commonName string, sans []string, csrPEM string, ekus []string, maxTTLSeconds int, mustStaple bool) (*IssuanceResult, error) {
return c.IssueCertificate(ctx, commonName, sans, csrPEM, ekus, maxTTLSeconds, mustStaple)
}
func (c *capturingIssuerConnector) RevokeCertificate(ctx context.Context, serial string, reason string) error {
return nil
}
func (c *capturingIssuerConnector) GenerateCRL(ctx context.Context, entries []CRLEntry) ([]byte, error) {
return nil, nil
}
func (c *capturingIssuerConnector) SignOCSPResponse(ctx context.Context, req OCSPSignRequest) ([]byte, error) {
return nil, nil
}
func (c *capturingIssuerConnector) GetCACertPEM(ctx context.Context) (string, error) {
return "-----BEGIN CERTIFICATE-----\nmock-ca\n-----END CERTIFICATE-----", nil
}
func (c *capturingIssuerConnector) GetRenewalInfo(ctx context.Context, certPEM string) (*RenewalInfoResult, error) {
return nil, nil
}