mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 19:11:30 +00:00
6d1da849cb
Phase 2 of the CRL/OCSP responder bundle. Stops signing OCSP responses
with the CA private key directly; the local issuer now bootstraps a
dedicated responder cert + key per issuer, persists them, and rotates
within a grace window before expiry.
Why this matters:
- Every relying-party OCSP poll today triggers a CA-key signing op.
With this change those polls hit a cheap responder key; the CA key
only signs at responder bootstrap / rotation (rare).
- When the CA key lives on an HSM (PKCS#11 driver, V3-Pro item 3),
the dedicated responder removes the per-poll-HSM-op pressure.
- Carries id-pkix-ocsp-nocheck (RFC 6960 §4.2.2.2.1) so OCSP clients
do NOT recursively check the responder cert's revocation status.
What landed:
* migration 000020_ocsp_responder.up.sql (+down) — ocsp_responders table
keyed by issuer_id; rotated_from records the prior cert serial for
audit; not_after index drives the rotation scheduler query
* internal/domain/ocsp_responder.go — OCSPResponder type + NeedsRotation
helper (configurable grace window; default 7 days before expiry)
* internal/repository/postgres/ocsp_responder.go — Postgres impl with
upsert-on-Put + ListExpiring for the future rotation scheduler
* internal/repository/interfaces.go — OCSPResponderRepository interface
* internal/connector/issuer/local/ocsp_responder.go — bootstrap +
rotation logic; under c.mu so concurrent first-call OCSP requests
don't double-bootstrap; recovers gracefully from corrupt key ref
or corrupt cert PEM rather than failing the OCSP request
* internal/connector/issuer/local/local.go:
- Connector struct gains optional dependencies (ocspResponderRepo,
signerDriver, issuerID, rotation grace, validity, key dir)
- Set*() helpers for each dep matching the existing SCEPService
pattern (SetProfileRepo / SetProfileID)
- SignOCSPResponse refactored: ensureOCSPResponder dispatches on
whether deps are wired; fallback path (deps unset) preserves
pre-Phase-2 behavior of signing with CA key directly
* internal/connector/issuer/local/ocsp_responder_test.go — bootstrap
happy path; reuse-across-calls; fallback (no deps wired); rotation
on grace window; corrupt-key-ref recovery; corrupt-cert-PEM recovery;
SetOCSPResponderKeyDir setter
Coverage: local issuer 86.3% (above CI floor of 86; was 86.5% before
Phase 2 added ~140 LoC of new code). The recovered-from-drop tests are
real behavior tests of the new error paths I introduced, not
coverage-game artifacts.
Backward compat: unchanged for any caller that doesn't wire the
responder deps. The factory at internal/connector/issuerfactory/factory.go
still calls local.New(&cfg, logger) with no responder wiring; OCSP
responses continue to be signed by the CA key directly until the
operator wires the deps. cmd/server/main.go wiring lands in Phase 3
alongside the CRL cache service.
146 lines
4.3 KiB
Go
146 lines
4.3 KiB
Go
package postgres
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/shankar0123/certctl/internal/domain"
|
|
"github.com/shankar0123/certctl/internal/repository"
|
|
)
|
|
|
|
// OCSPResponderRepository implements repository.OCSPResponderRepository.
|
|
//
|
|
// One row per issuer; rotation is an upsert (no historical rows kept —
|
|
// operators have the audit log + the previous CertSerial recorded in
|
|
// rotated_from for the most-recent rotation).
|
|
type OCSPResponderRepository struct {
|
|
db *sql.DB
|
|
}
|
|
|
|
// NewOCSPResponderRepository creates a new repository.
|
|
func NewOCSPResponderRepository(db *sql.DB) *OCSPResponderRepository {
|
|
return &OCSPResponderRepository{db: db}
|
|
}
|
|
|
|
// Compile-time interface check.
|
|
var _ repository.OCSPResponderRepository = (*OCSPResponderRepository)(nil)
|
|
|
|
// Get returns the current responder row, or (nil, nil) when missing.
|
|
func (r *OCSPResponderRepository) Get(ctx context.Context, issuerID string) (*domain.OCSPResponder, error) {
|
|
const query = `
|
|
SELECT issuer_id, cert_pem, cert_serial, key_path, key_alg,
|
|
not_before, not_after, COALESCE(rotated_from, ''),
|
|
created_at, updated_at
|
|
FROM ocsp_responders
|
|
WHERE issuer_id = $1
|
|
`
|
|
var resp domain.OCSPResponder
|
|
err := r.db.QueryRowContext(ctx, query, issuerID).Scan(
|
|
&resp.IssuerID,
|
|
&resp.CertPEM,
|
|
&resp.CertSerial,
|
|
&resp.KeyPath,
|
|
&resp.KeyAlg,
|
|
&resp.NotBefore,
|
|
&resp.NotAfter,
|
|
&resp.RotatedFrom,
|
|
&resp.CreatedAt,
|
|
&resp.UpdatedAt,
|
|
)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("ocsp_responders get %q: %w", issuerID, err)
|
|
}
|
|
return &resp, nil
|
|
}
|
|
|
|
// Put upserts the responder row. The DB sets created_at on first insert
|
|
// (default NOW()) and updated_at on every write (NOW() in the SET clause).
|
|
// Callers leave CreatedAt + UpdatedAt zero; the DB authoritative for both.
|
|
func (r *OCSPResponderRepository) Put(ctx context.Context, responder *domain.OCSPResponder) error {
|
|
if responder == nil {
|
|
return errors.New("ocsp_responders put: nil responder")
|
|
}
|
|
if responder.IssuerID == "" {
|
|
return errors.New("ocsp_responders put: empty issuer_id")
|
|
}
|
|
const query = `
|
|
INSERT INTO ocsp_responders (
|
|
issuer_id, cert_pem, cert_serial, key_path, key_alg,
|
|
not_before, not_after, rotated_from, updated_at
|
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, NULLIF($8, ''), NOW())
|
|
ON CONFLICT (issuer_id) DO UPDATE SET
|
|
cert_pem = EXCLUDED.cert_pem,
|
|
cert_serial = EXCLUDED.cert_serial,
|
|
key_path = EXCLUDED.key_path,
|
|
key_alg = EXCLUDED.key_alg,
|
|
not_before = EXCLUDED.not_before,
|
|
not_after = EXCLUDED.not_after,
|
|
rotated_from = EXCLUDED.rotated_from,
|
|
updated_at = NOW()
|
|
`
|
|
_, err := r.db.ExecContext(ctx, query,
|
|
responder.IssuerID,
|
|
responder.CertPEM,
|
|
responder.CertSerial,
|
|
responder.KeyPath,
|
|
responder.KeyAlg,
|
|
responder.NotBefore,
|
|
responder.NotAfter,
|
|
responder.RotatedFrom,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("ocsp_responders put %q: %w", responder.IssuerID, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ListExpiring returns responders whose not_after is at or before
|
|
// (now + grace). Used by the rotation scheduler to find responders due
|
|
// for rotation. Ordered by not_after ASC so earliest-expiring is first.
|
|
func (r *OCSPResponderRepository) ListExpiring(ctx context.Context, grace time.Duration, now time.Time) ([]*domain.OCSPResponder, error) {
|
|
threshold := now.Add(grace)
|
|
const query = `
|
|
SELECT issuer_id, cert_pem, cert_serial, key_path, key_alg,
|
|
not_before, not_after, COALESCE(rotated_from, ''),
|
|
created_at, updated_at
|
|
FROM ocsp_responders
|
|
WHERE not_after <= $1
|
|
ORDER BY not_after ASC
|
|
`
|
|
rows, err := r.db.QueryContext(ctx, query, threshold)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("ocsp_responders list_expiring: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []*domain.OCSPResponder
|
|
for rows.Next() {
|
|
var resp domain.OCSPResponder
|
|
if err := rows.Scan(
|
|
&resp.IssuerID,
|
|
&resp.CertPEM,
|
|
&resp.CertSerial,
|
|
&resp.KeyPath,
|
|
&resp.KeyAlg,
|
|
&resp.NotBefore,
|
|
&resp.NotAfter,
|
|
&resp.RotatedFrom,
|
|
&resp.CreatedAt,
|
|
&resp.UpdatedAt,
|
|
); err != nil {
|
|
return nil, fmt.Errorf("ocsp_responders list_expiring scan: %w", err)
|
|
}
|
|
out = append(out, &resp)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("ocsp_responders list_expiring iterate: %w", err)
|
|
}
|
|
return out, nil
|
|
}
|