mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 23:21:30 +00:00
4e5522a999
F-001 (P3): GenerateDERCRL scoped to issuer via composite index
- Add RevocationRepository.ListByIssuer leveraging migration 000012's
idx_certificate_revocations_issuer_serial composite index as a
prefix-scan target. Previously CAOperationsSvc.GenerateDERCRL called
ListAll() and filtered by IssuerID in Go — O(total revocations)
regardless of how many revocations belonged to the target issuer.
- Rewrite GenerateDERCRL to call ListByIssuer(ctx, issuerID) so PostgreSQL
drives a prefix scan of the composite index. Drops the in-memory filter.
- New regression test in ca_operations_test.go asserts the CRL hot path
invokes ListByIssuer exactly once and never ListAll, and that the
issuerID is threaded through correctly.
F-002 (P3): digest.go admin-auth endpoints no longer leak internal errors
- PreviewDigest (GET /api/v1/digest/preview) and SendDigest
(POST /api/v1/digest/send) previously wrote err.Error() into the HTTP
response body on 500s. Replace with slog.Error server-side logging plus
a generic "internal error" response body, matching the house pattern
in certificates.go and export.go.
F-003 (P4): three blocking time.Sleep sites now honor ctx cancellation
- internal/connector/issuer/acme/acme.go:672 (DNS-01 propagation wait)
now runs under a select{case <-ctx.Done(): CleanUp + return ctx.Err();
case <-time.After(d):} so graceful shutdown doesn't get stuck behind
the propagation delay.
- internal/connector/issuer/acme/acme.go:786 (dns-persist-01 propagation
wait) same pattern, returns ctx.Err() on cancel.
- cmd/agent/main.go:272 (polling backoff inside the heartbeat loop) now
wraps the sleep in select{case <-ctx.Done(): continue; case <-time.After(backoff):}
so the outer <-ctx.Done() case on the parent loop fires cleanly.
Verification: build, vet, and race-enabled short tests green across all
55+ packages. govulncheck reports zero vulnerabilities in the code path.
No migration needed — F-001 reuses the existing 000012 composite index.
No frontend changes.
163 lines
5.6 KiB
Go
163 lines
5.6 KiB
Go
package postgres
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
|
|
"github.com/shankar0123/certctl/internal/domain"
|
|
)
|
|
|
|
// RevocationRepository implements repository.RevocationRepository using PostgreSQL.
|
|
type RevocationRepository struct {
|
|
db *sql.DB
|
|
}
|
|
|
|
// NewRevocationRepository creates a new RevocationRepository.
|
|
func NewRevocationRepository(db *sql.DB) *RevocationRepository {
|
|
return &RevocationRepository{db: db}
|
|
}
|
|
|
|
// Create records a new certificate revocation.
|
|
//
|
|
// Uniqueness is scoped to (issuer_id, serial_number) per RFC 5280 §5.2.3.
|
|
// Serial numbers are only unique within an issuer, so certctl supports
|
|
// collisions across different issuer connectors. The composite ON CONFLICT
|
|
// target matches migration 000012's unique index.
|
|
func (r *RevocationRepository) Create(ctx context.Context, revocation *domain.CertificateRevocation) error {
|
|
_, err := r.db.ExecContext(ctx, `
|
|
INSERT INTO certificate_revocations (
|
|
id, certificate_id, serial_number, reason, revoked_by, revoked_at,
|
|
issuer_id, issuer_notified, created_at
|
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
|
|
ON CONFLICT (issuer_id, serial_number) DO NOTHING
|
|
`, revocation.ID, revocation.CertificateID, revocation.SerialNumber,
|
|
revocation.Reason, revocation.RevokedBy, revocation.RevokedAt,
|
|
revocation.IssuerID, revocation.IssuerNotified, revocation.CreatedAt)
|
|
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create revocation record: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// GetByIssuerAndSerial retrieves a revocation by the (issuer_id, serial) pair.
|
|
//
|
|
// Per RFC 5280 §5.2.3, serial numbers are unique only within a single issuer.
|
|
// Callers (OCSP handlers, CRL generation) always know the issuer because the
|
|
// OCSP URL carries it as a path parameter and CRLs are generated per-issuer.
|
|
func (r *RevocationRepository) GetByIssuerAndSerial(ctx context.Context, issuerID, serial string) (*domain.CertificateRevocation, error) {
|
|
var rev domain.CertificateRevocation
|
|
err := r.db.QueryRowContext(ctx, `
|
|
SELECT id, certificate_id, serial_number, reason, revoked_by, revoked_at,
|
|
issuer_id, issuer_notified, created_at
|
|
FROM certificate_revocations
|
|
WHERE issuer_id = $1 AND serial_number = $2
|
|
`, issuerID, serial).Scan(&rev.ID, &rev.CertificateID, &rev.SerialNumber,
|
|
&rev.Reason, &rev.RevokedBy, &rev.RevokedAt,
|
|
&rev.IssuerID, &rev.IssuerNotified, &rev.CreatedAt)
|
|
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to get revocation by issuer and serial: %w", err)
|
|
}
|
|
|
|
return &rev, nil
|
|
}
|
|
|
|
// ListAll returns all revocations ordered by revocation time (for CRL generation).
|
|
func (r *RevocationRepository) ListAll(ctx context.Context) ([]*domain.CertificateRevocation, error) {
|
|
rows, err := r.db.QueryContext(ctx, `
|
|
SELECT id, certificate_id, serial_number, reason, revoked_by, revoked_at,
|
|
issuer_id, issuer_notified, created_at
|
|
FROM certificate_revocations
|
|
ORDER BY revoked_at ASC
|
|
`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to list revocations: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
return scanRevocations(rows)
|
|
}
|
|
|
|
// ListByIssuer returns all revocations for a single issuer, ordered by revocation time.
|
|
//
|
|
// This is the hot path for CRL generation. Pushing the issuer filter into the
|
|
// SQL query lets the composite index `idx_certificate_revocations_issuer_serial`
|
|
// (migration 000012) drive a prefix scan on issuer_id rather than forcing
|
|
// callers to load every row in the table and discard the ones belonging to
|
|
// other issuers.
|
|
func (r *RevocationRepository) ListByIssuer(ctx context.Context, issuerID string) ([]*domain.CertificateRevocation, error) {
|
|
rows, err := r.db.QueryContext(ctx, `
|
|
SELECT id, certificate_id, serial_number, reason, revoked_by, revoked_at,
|
|
issuer_id, issuer_notified, created_at
|
|
FROM certificate_revocations
|
|
WHERE issuer_id = $1
|
|
ORDER BY revoked_at ASC
|
|
`, issuerID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to list revocations by issuer: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
return scanRevocations(rows)
|
|
}
|
|
|
|
// ListByCertificate returns all revocations for a certificate.
|
|
func (r *RevocationRepository) ListByCertificate(ctx context.Context, certID string) ([]*domain.CertificateRevocation, error) {
|
|
rows, err := r.db.QueryContext(ctx, `
|
|
SELECT id, certificate_id, serial_number, reason, revoked_by, revoked_at,
|
|
issuer_id, issuer_notified, created_at
|
|
FROM certificate_revocations
|
|
WHERE certificate_id = $1
|
|
ORDER BY revoked_at ASC
|
|
`, certID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to list revocations by certificate: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
return scanRevocations(rows)
|
|
}
|
|
|
|
// MarkIssuerNotified updates the issuer_notified flag for a revocation.
|
|
func (r *RevocationRepository) MarkIssuerNotified(ctx context.Context, id string) error {
|
|
result, err := r.db.ExecContext(ctx, `
|
|
UPDATE certificate_revocations SET issuer_notified = TRUE WHERE id = $1
|
|
`, id)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to mark issuer notified: %w", err)
|
|
}
|
|
|
|
rows, err := result.RowsAffected()
|
|
if err != nil {
|
|
return fmt.Errorf("failed to get rows affected: %w", err)
|
|
}
|
|
|
|
if rows == 0 {
|
|
return fmt.Errorf("revocation not found")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func scanRevocations(rows *sql.Rows) ([]*domain.CertificateRevocation, error) {
|
|
var revocations []*domain.CertificateRevocation
|
|
for rows.Next() {
|
|
var rev domain.CertificateRevocation
|
|
if err := rows.Scan(&rev.ID, &rev.CertificateID, &rev.SerialNumber,
|
|
&rev.Reason, &rev.RevokedBy, &rev.RevokedAt,
|
|
&rev.IssuerID, &rev.IssuerNotified, &rev.CreatedAt); err != nil {
|
|
return nil, fmt.Errorf("failed to scan revocation: %w", err)
|
|
}
|
|
revocations = append(revocations, &rev)
|
|
}
|
|
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("error iterating revocation rows: %w", err)
|
|
}
|
|
|
|
return revocations, nil
|
|
}
|