mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-09 05:59:09 +00:00
c351bba41a
Closes the issuance loop in trust_authenticated mode (commitsec88a61+44a85d6wired the foundation + JWS-verified account resource). After this commit, an ACME client running against a profile with acme_auth_mode='trust_authenticated' end-to-end-issues a real cert: POST /acme/profile/<id>/new-order → 201 + order URL (status=ready) POST /acme/profile/<id>/order/<oid> → POST-as-GET fetch POST /acme/profile/<id>/order/<oid>/finalize → 200 + status=valid + cert URL POST /acme/profile/<id>/cert/<cid> → 200 + PEM chain Profiles with acme_auth_mode='challenge' get the same code path with authz/challenge rows in `pending` state until Phase 3's validators wire up. The mode is read from the bound profile's column at request time, NOT cached at server start — operators flipping the column via SQL take effect on the next order without restart. Architecture (the load-bearing part): - Finalize routes through service.CertificateService.Create — the canonical certctl issuance entry point that wraps the managed_certificates row insert + audit row in s.tx.WithinTx. RenewalPolicy / CertificateProfile / per-issuer-type Prometheus metrics / audit rows all apply uniformly to ACME-issued certs via the same code path that already serves EST/SCEP/agent/REST issuance. - Identifier validation runs BEFORE order creation. Rejected identifiers return RFC 7807 with per-identifier subproblems and create no order row. - Source stamp on managed_certificates: domain.CertificateSourceACME. Operators bulk-revoke ACME-issued certs by filtering on Source=ACME. - 3-step atomicity boundary documented in code + this commit msg: (A) WithinTx-A marks order processing + audit row. (B) IssuerConnector.IssueCertificate + CertificateService.Create (each in its own WithinTx — Create wraps cert row + audit atomically). (C) WithinTx-C creates certificate_versions row + transitions order to valid + sets certificate_id + audit row. The brief window between B and C can leave a managed_certificates row whose order is still in `processing`. Phase 5's GC scheduler reconciles. Documented inline. What ships: - internal/api/acme/order.go: OrderResponseJSON + AuthorizationResponseJSON + ChallengeResponseJSON + NewOrderRequest + FinalizeRequest wire shapes; ValidateIdentifiers (Phase 2 syntactic checks, dns-only); CSRMatchesIdentifiers (RFC 8555 §7.4 strict equality, case-folded). - internal/domain/acme.go: ACMEOrder + ACMEAuthorization + ACMEChallenge + ACMEIdentifier + ACMEProblem domain types + closed status enums for each (order: pending|ready|processing|valid|invalid; authz: pending|valid|invalid|deactivated|expired|revoked; challenge: pending|processing|valid|invalid; challenge type: http-01|dns-01| tls-alpn-01). - internal/domain/profile.go: new ACMEAuthMode field reading from certificate_profiles.acme_auth_mode (added in migration 25). - internal/domain/certificate.go: new CertificateSourceACME enum value. - internal/repository/postgres/profile.go: extended SELECT/scanProfile to read the per-profile acme_auth_mode column with a COALESCE default of trust_authenticated. - internal/repository/postgres/acme.go: full order/authz/challenge CRUD (CreateOrderWithTx + GetOrderByID + UpdateOrderWithTx + CreateAuthzWithTx + GetAuthzByID + ListAuthzsByOrder + ListChallengesByAuthz + CreateChallengeWithTx) with proper sql.NullTime + JSONB handling. scanACMEOrder / scanACMEAuthz / scanACMEChallenge helpers. - internal/service/acme.go: extended ACMERepo interface; new SetIssuancePipeline wires certificateService + certificateRepo + issuerRegistry. CreateOrder (auth-mode-dispatched: trust_authenticated auto-marks order ready + authz valid + 1 placeholder http-01 challenge valid; challenge mode keeps everything pending). LookupOrder (with account-ownership assertion). LookupAuthz. ListAuthzsByOrder. FinalizeOrder (3-step atomicity boundary as above; CSR-vs-order SAN strict-equality check before issuance; persists FinalizeOrderResult {Order, CertID}). LookupCertificate. randIDSuffix + base32encode helpers for the human-readable acme-ord-* / acme-authz-* / acme-chall-* prefixes (CLAUDE.md "TEXT primary keys with human- readable prefixes" architecture decision). 8 new per-op metrics. - internal/service/acme_test.go: extended fakeACMERepo with Phase 2 interface stubs; new orderTrackingRepo for observable persistence; 2 new tests asserting trust_authenticated → auto-ready/valid and challenge → stays-pending. - internal/api/handler/acme.go: NewOrder + Order + OrderFinalize + Authz + Cert handler methods. orderURL / authzURL / certURL / challengeURLBuilder helpers; marshalOrderForResponse fetches per-order authzs to populate the URL list. parseOptionalTime for notBefore / notAfter. - internal/api/handler/acme_handler_test.go: extended mockACMEService with Phase 2 method stubs; 4 new handler tests (NewOrder happy + rejected-identifier + OrderFinalize bad-CSR + Cert happy). - internal/api/router/router.go: 10 new Register calls (5 per-profile + 5 shorthand) for new-order, order/{ord_id}, order/{ord_id}/finalize, authz/{authz_id}, cert/{cert_id}. - internal/api/router/openapi_parity_test.go + api/openapi-handler-exceptions.yaml: 10 new exception entries. - cmd/server/main.go: SetIssuancePipeline at startup, threading certificateService + certificateRepo + issuerRegistry into ACMEService. - docs/acme-server.md: phase status updated; endpoints table grows 5 rows for new-order/order/finalize/authz/cert (per-profile + shorthand variants); new section "Finalize routing through CertificateService.Create" documenting the 3-step atomicity boundary + the actor-string convention `acme:<account-id>`. Tests: ACME package + service + handler + router + config + domain all green under -short. New cases: - TestCreateOrder_TrustAuthenticated_AutoReady (asserts auto-ready transition + valid-status authz/challenge + audit row + metric bump). - TestCreateOrder_ChallengeMode_StaysPending (asserts pending-status cascading authz/challenge for challenge mode). - TestACMEHandler_NewOrder_HappyPath (asserts 201 + Location + finalize URL shape). - TestACMEHandler_NewOrder_RejectedIdentifier (asserts 400 + RFC 7807 rejectedIdentifier + per-identifier subproblems for type=ip). - TestACMEHandler_OrderFinalize_BadCSR (asserts 400 + badCSR for non-base64 CSR field). - TestACMEHandler_Cert_HappyPath (asserts 200 + PEM content-type + PEM chain in body). Engineering history: cowork/WORKSPACE-CHANGELOG.md "ACME-Server-2".
638 lines
22 KiB
Go
638 lines
22 KiB
Go
// Copyright (c) certctl
|
|
// SPDX-License-Identifier: BSL-1.1
|
|
|
|
package service
|
|
|
|
import (
|
|
"context"
|
|
"crypto/rand"
|
|
"crypto/rsa"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
jose "github.com/go-jose/go-jose/v4"
|
|
|
|
"github.com/shankar0123/certctl/internal/config"
|
|
"github.com/shankar0123/certctl/internal/domain"
|
|
"github.com/shankar0123/certctl/internal/repository"
|
|
)
|
|
|
|
// fakeACMERepo is an in-memory ACMERepo for tests. It tracks issued
|
|
// nonces in a map; Consume removes the entry to model one-shot use.
|
|
// Phase 1b extends with account state.
|
|
type fakeACMERepo struct {
|
|
issued map[string]time.Time // nonce → expires_at
|
|
issueErr error
|
|
|
|
// Phase 1b — account state.
|
|
accounts map[string]*domain.ACMEAccount // account_id → row
|
|
thumbToAccount map[string]string // (profile|thumbprint) → account_id
|
|
createAccountErr error
|
|
}
|
|
|
|
func newFakeACMERepo() *fakeACMERepo {
|
|
return &fakeACMERepo{
|
|
issued: make(map[string]time.Time),
|
|
accounts: make(map[string]*domain.ACMEAccount),
|
|
thumbToAccount: make(map[string]string),
|
|
}
|
|
}
|
|
|
|
func (f *fakeACMERepo) IssueNonce(ctx context.Context, nonce string, ttl time.Duration) error {
|
|
if f.issueErr != nil {
|
|
return f.issueErr
|
|
}
|
|
f.issued[nonce] = time.Now().Add(ttl)
|
|
return nil
|
|
}
|
|
|
|
func (f *fakeACMERepo) ConsumeNonce(ctx context.Context, nonce string) error {
|
|
exp, ok := f.issued[nonce]
|
|
if !ok {
|
|
return errors.New("not found")
|
|
}
|
|
if time.Now().After(exp) {
|
|
return errors.New("expired")
|
|
}
|
|
delete(f.issued, nonce)
|
|
return nil
|
|
}
|
|
|
|
func (f *fakeACMERepo) CreateAccountWithTx(ctx context.Context, q repository.Querier, acct *domain.ACMEAccount) error {
|
|
if f.createAccountErr != nil {
|
|
return f.createAccountErr
|
|
}
|
|
key := acct.ProfileID + "|" + acct.JWKThumbprint
|
|
if _, exists := f.thumbToAccount[key]; exists {
|
|
return errors.New("duplicate")
|
|
}
|
|
cp := *acct
|
|
cp.CreatedAt = time.Now()
|
|
cp.UpdatedAt = cp.CreatedAt
|
|
f.accounts[acct.AccountID] = &cp
|
|
f.thumbToAccount[key] = acct.AccountID
|
|
return nil
|
|
}
|
|
|
|
func (f *fakeACMERepo) GetAccountByID(ctx context.Context, accountID string) (*domain.ACMEAccount, error) {
|
|
acct, ok := f.accounts[accountID]
|
|
if !ok {
|
|
return nil, repository.ErrNotFound
|
|
}
|
|
cp := *acct
|
|
return &cp, nil
|
|
}
|
|
|
|
func (f *fakeACMERepo) GetAccountByThumbprint(ctx context.Context, profileID, thumbprint string) (*domain.ACMEAccount, error) {
|
|
id, ok := f.thumbToAccount[profileID+"|"+thumbprint]
|
|
if !ok {
|
|
return nil, repository.ErrNotFound
|
|
}
|
|
return f.GetAccountByID(ctx, id)
|
|
}
|
|
|
|
func (f *fakeACMERepo) UpdateAccountContactWithTx(ctx context.Context, q repository.Querier, accountID string, contact []string) error {
|
|
acct, ok := f.accounts[accountID]
|
|
if !ok {
|
|
return repository.ErrNotFound
|
|
}
|
|
acct.Contact = contact
|
|
acct.UpdatedAt = time.Now()
|
|
return nil
|
|
}
|
|
|
|
func (f *fakeACMERepo) UpdateAccountStatusWithTx(ctx context.Context, q repository.Querier, accountID string, status domain.ACMEAccountStatus) error {
|
|
acct, ok := f.accounts[accountID]
|
|
if !ok {
|
|
return repository.ErrNotFound
|
|
}
|
|
acct.Status = status
|
|
acct.UpdatedAt = time.Now()
|
|
return nil
|
|
}
|
|
|
|
// Phase 2 — order / authz / challenge state. Phase 1b tests don't use
|
|
// these; the no-op stubs keep the *fakeACMERepo type satisfying the
|
|
// extended ACMERepo interface. Phase 2's tests overwrite these as
|
|
// needed.
|
|
func (f *fakeACMERepo) CreateOrderWithTx(ctx context.Context, q repository.Querier, order *domain.ACMEOrder) error {
|
|
return nil
|
|
}
|
|
func (f *fakeACMERepo) GetOrderByID(ctx context.Context, orderID string) (*domain.ACMEOrder, error) {
|
|
return nil, repository.ErrNotFound
|
|
}
|
|
func (f *fakeACMERepo) UpdateOrderWithTx(ctx context.Context, q repository.Querier, order *domain.ACMEOrder) error {
|
|
return nil
|
|
}
|
|
func (f *fakeACMERepo) CreateAuthzWithTx(ctx context.Context, q repository.Querier, authz *domain.ACMEAuthorization) error {
|
|
return nil
|
|
}
|
|
func (f *fakeACMERepo) GetAuthzByID(ctx context.Context, authzID string) (*domain.ACMEAuthorization, error) {
|
|
return nil, repository.ErrNotFound
|
|
}
|
|
func (f *fakeACMERepo) ListAuthzsByOrder(ctx context.Context, orderID string) ([]*domain.ACMEAuthorization, error) {
|
|
return nil, nil
|
|
}
|
|
func (f *fakeACMERepo) CreateChallengeWithTx(ctx context.Context, q repository.Querier, ch *domain.ACMEChallenge) error {
|
|
return nil
|
|
}
|
|
|
|
// fakeTransactor is the repository.Transactor stand-in: runs fn
|
|
// against the supplied querier (we just pass nil — fakes ignore it).
|
|
// Mirrors how production transactor works without an actual DB.
|
|
type fakeTransactor struct{}
|
|
|
|
func (f *fakeTransactor) WithinTx(ctx context.Context, fn func(q repository.Querier) error) error {
|
|
return fn(nil)
|
|
}
|
|
|
|
// fakeAuditRepo records the audit events fakeAuditService emits so
|
|
// tests can assert on the audit row count + shape.
|
|
type fakeAuditRepo struct {
|
|
events []*domain.AuditEvent
|
|
}
|
|
|
|
func (f *fakeAuditRepo) Create(ctx context.Context, event *domain.AuditEvent) error {
|
|
return f.CreateWithTx(ctx, nil, event)
|
|
}
|
|
|
|
func (f *fakeAuditRepo) CreateWithTx(ctx context.Context, q repository.Querier, event *domain.AuditEvent) error {
|
|
cp := *event
|
|
f.events = append(f.events, &cp)
|
|
return nil
|
|
}
|
|
|
|
func (f *fakeAuditRepo) List(ctx context.Context, filter *repository.AuditFilter) ([]*domain.AuditEvent, error) {
|
|
return f.events, nil
|
|
}
|
|
|
|
// fakeProfileLookup is an in-memory profileLookup that returns the
|
|
// profile by ID. Unknown IDs return repository.ErrNotFound (the
|
|
// canonical sentinel ACMEService maps to ErrACMEProfileNotFound).
|
|
type fakeProfileLookup struct {
|
|
profiles map[string]*domain.CertificateProfile
|
|
}
|
|
|
|
func (f *fakeProfileLookup) Get(ctx context.Context, id string) (*domain.CertificateProfile, error) {
|
|
p, ok := f.profiles[id]
|
|
if !ok {
|
|
return nil, repository.ErrNotFound
|
|
}
|
|
return p, nil
|
|
}
|
|
|
|
func newSvc(t *testing.T, cfg config.ACMEServerConfig, profiles map[string]*domain.CertificateProfile) (*ACMEService, *fakeACMERepo) {
|
|
t.Helper()
|
|
repo := newFakeACMERepo()
|
|
pl := &fakeProfileLookup{profiles: profiles}
|
|
return NewACMEService(repo, pl, cfg), repo
|
|
}
|
|
|
|
// newSvcWithAudit returns a service wired with the transactor + audit
|
|
// service required by the JWS-authenticated POST endpoints.
|
|
func newSvcWithAudit(t *testing.T, cfg config.ACMEServerConfig, profiles map[string]*domain.CertificateProfile) (*ACMEService, *fakeACMERepo, *fakeAuditRepo) {
|
|
t.Helper()
|
|
repo := newFakeACMERepo()
|
|
pl := &fakeProfileLookup{profiles: profiles}
|
|
auditRepo := &fakeAuditRepo{}
|
|
auditSvc := NewAuditService(auditRepo)
|
|
svc := NewACMEService(repo, pl, cfg)
|
|
svc.SetTransactor(&fakeTransactor{})
|
|
svc.SetAuditService(auditSvc)
|
|
return svc, repo, auditRepo
|
|
}
|
|
|
|
func TestBuildDirectory_HappyPath(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{
|
|
NonceTTL: 5 * time.Minute,
|
|
}
|
|
cfg.DirectoryMeta.TermsOfService = "https://example.com/tos"
|
|
cfg.DirectoryMeta.Website = "https://example.com"
|
|
svc, _ := newSvc(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
dir, err := svc.BuildDirectory(context.Background(), "prof-corp", "https://server/acme/profile/prof-corp")
|
|
if err != nil {
|
|
t.Fatalf("BuildDirectory: %v", err)
|
|
}
|
|
if dir == nil {
|
|
t.Fatal("dir is nil")
|
|
}
|
|
if dir.NewNonce != "https://server/acme/profile/prof-corp/new-nonce" {
|
|
t.Errorf("NewNonce = %q", dir.NewNonce)
|
|
}
|
|
if dir.Meta == nil || dir.Meta.TermsOfService != "https://example.com/tos" {
|
|
t.Errorf("meta tos = %+v", dir.Meta)
|
|
}
|
|
if got := svc.Metrics().DirectoryTotal.Load(); got != 1 {
|
|
t.Errorf("DirectoryTotal = %d, want 1", got)
|
|
}
|
|
}
|
|
|
|
func TestBuildDirectory_UnknownProfile(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _ := newSvc(t, cfg, nil)
|
|
_, err := svc.BuildDirectory(context.Background(), "prof-missing", "https://server/acme/profile/prof-missing")
|
|
if !errors.Is(err, ErrACMEProfileNotFound) {
|
|
t.Errorf("err = %v, want ErrACMEProfileNotFound", err)
|
|
}
|
|
if got := svc.Metrics().DirectoryFailureTotal.Load(); got != 1 {
|
|
t.Errorf("DirectoryFailureTotal = %d, want 1", got)
|
|
}
|
|
}
|
|
|
|
func TestBuildDirectory_EmptyProfileNoDefault(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _ := newSvc(t, cfg, nil)
|
|
_, err := svc.BuildDirectory(context.Background(), "", "https://server/acme")
|
|
if !errors.Is(err, ErrACMEUserActionRequired) {
|
|
t.Errorf("err = %v, want ErrACMEUserActionRequired", err)
|
|
}
|
|
}
|
|
|
|
func TestBuildDirectory_EmptyProfileWithDefault(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{
|
|
NonceTTL: 5 * time.Minute,
|
|
DefaultProfileID: "prof-default",
|
|
}
|
|
svc, _ := newSvc(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-default": {ID: "prof-default", Name: "default"},
|
|
})
|
|
dir, err := svc.BuildDirectory(context.Background(), "", "https://server/acme")
|
|
if err != nil {
|
|
t.Fatalf("BuildDirectory: %v", err)
|
|
}
|
|
if dir.NewNonce != "https://server/acme/new-nonce" {
|
|
t.Errorf("NewNonce = %q (shorthand path)", dir.NewNonce)
|
|
}
|
|
}
|
|
|
|
func TestIssueNonce_HappyPath(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, repo := newSvc(t, cfg, nil)
|
|
n, err := svc.IssueNonce(context.Background())
|
|
if err != nil {
|
|
t.Fatalf("IssueNonce: %v", err)
|
|
}
|
|
if len(n) != 43 {
|
|
t.Errorf("nonce length = %d, want 43 (base64url-no-pad of 32 bytes)", len(n))
|
|
}
|
|
if _, ok := repo.issued[n]; !ok {
|
|
t.Errorf("issued nonce was not persisted")
|
|
}
|
|
if got := svc.Metrics().NewNonceTotal.Load(); got != 1 {
|
|
t.Errorf("NewNonceTotal = %d, want 1", got)
|
|
}
|
|
}
|
|
|
|
func TestIssueNonce_RepoFailure(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, repo := newSvc(t, cfg, nil)
|
|
repo.issueErr = errors.New("disk full")
|
|
_, err := svc.IssueNonce(context.Background())
|
|
if err == nil {
|
|
t.Fatal("expected error from IssueNonce when repo fails")
|
|
}
|
|
if got := svc.Metrics().NewNonceFailureTotal.Load(); got != 1 {
|
|
t.Errorf("NewNonceFailureTotal = %d, want 1", got)
|
|
}
|
|
}
|
|
|
|
func TestACMEMetrics_Snapshot(t *testing.T) {
|
|
m := NewACMEMetrics()
|
|
m.DirectoryTotal.Store(7)
|
|
m.NewNonceTotal.Store(11)
|
|
m.NewNonceFailureTotal.Store(2)
|
|
m.NewAccountTotal.Store(3)
|
|
m.NewAccountIdempotentTotal.Store(1)
|
|
snap := m.Snapshot()
|
|
if snap["certctl_acme_directory_total"] != 7 {
|
|
t.Errorf("directory_total = %d", snap["certctl_acme_directory_total"])
|
|
}
|
|
if snap["certctl_acme_new_nonce_total"] != 11 {
|
|
t.Errorf("new_nonce_total = %d", snap["certctl_acme_new_nonce_total"])
|
|
}
|
|
if snap["certctl_acme_new_nonce_failures_total"] != 2 {
|
|
t.Errorf("new_nonce_failures_total = %d", snap["certctl_acme_new_nonce_failures_total"])
|
|
}
|
|
if snap["certctl_acme_new_account_total"] != 3 {
|
|
t.Errorf("new_account_total = %d", snap["certctl_acme_new_account_total"])
|
|
}
|
|
if snap["certctl_acme_new_account_idempotent_total"] != 1 {
|
|
t.Errorf("new_account_idempotent_total = %d", snap["certctl_acme_new_account_idempotent_total"])
|
|
}
|
|
}
|
|
|
|
// --- Phase 1b — account management -------------------------------------
|
|
|
|
func mustGenJWK(t *testing.T) *jose.JSONWebKey {
|
|
t.Helper()
|
|
k, err := rsa.GenerateKey(rand.Reader, 2048)
|
|
if err != nil {
|
|
t.Fatalf("rsa keygen: %v", err)
|
|
}
|
|
return &jose.JSONWebKey{Key: &k.PublicKey}
|
|
}
|
|
|
|
func TestNewAccount_HappyPath(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, repo, auditRepo := newSvcWithAudit(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
jwk := mustGenJWK(t)
|
|
|
|
acct, isNew, err := svc.NewAccount(context.Background(), "prof-corp", jwk, []string{"mailto:a@example.com"}, false, true)
|
|
if err != nil {
|
|
t.Fatalf("NewAccount: %v", err)
|
|
}
|
|
if !isNew {
|
|
t.Errorf("isNew = false; want true")
|
|
}
|
|
if acct == nil || acct.AccountID == "" || acct.JWKThumbprint == "" {
|
|
t.Fatalf("account row is malformed: %+v", acct)
|
|
}
|
|
if got := svc.Metrics().NewAccountTotal.Load(); got != 1 {
|
|
t.Errorf("NewAccountTotal = %d, want 1", got)
|
|
}
|
|
if got := len(auditRepo.events); got != 1 {
|
|
t.Errorf("audit events = %d, want 1", got)
|
|
}
|
|
if got := auditRepo.events[0].Action; got != "acme_account_created" {
|
|
t.Errorf("audit action = %q", got)
|
|
}
|
|
if _, ok := repo.accounts[acct.AccountID]; !ok {
|
|
t.Errorf("account row not in repo")
|
|
}
|
|
}
|
|
|
|
func TestNewAccount_Idempotent_ExistingJWKReturnsExistingRow(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _, auditRepo := newSvcWithAudit(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
jwk := mustGenJWK(t)
|
|
|
|
first, _, err := svc.NewAccount(context.Background(), "prof-corp", jwk, []string{"mailto:a@example.com"}, false, true)
|
|
if err != nil {
|
|
t.Fatalf("first NewAccount: %v", err)
|
|
}
|
|
second, isNew, err := svc.NewAccount(context.Background(), "prof-corp", jwk, []string{"mailto:b@example.com"}, false, true)
|
|
if err != nil {
|
|
t.Fatalf("second NewAccount: %v", err)
|
|
}
|
|
if isNew {
|
|
t.Errorf("isNew = true on idempotent re-registration; want false")
|
|
}
|
|
if second.AccountID != first.AccountID {
|
|
t.Errorf("second account ID = %q; want first %q", second.AccountID, first.AccountID)
|
|
}
|
|
// Idempotent re-registration MUST NOT update contact / write a
|
|
// second audit row (RFC 8555 §7.3.1 says return the existing row
|
|
// unmodified).
|
|
if got := len(auditRepo.events); got != 1 {
|
|
t.Errorf("audit events = %d after idempotent call; want 1", got)
|
|
}
|
|
if got := svc.Metrics().NewAccountIdempotentTotal.Load(); got != 1 {
|
|
t.Errorf("NewAccountIdempotentTotal = %d, want 1", got)
|
|
}
|
|
}
|
|
|
|
func TestNewAccount_OnlyReturnExisting_NoMatch(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _, _ := newSvcWithAudit(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
jwk := mustGenJWK(t)
|
|
|
|
_, _, err := svc.NewAccount(context.Background(), "prof-corp", jwk, nil, true /*onlyReturnExisting*/, false)
|
|
if !errors.Is(err, ErrACMEAccountDoesNotExist) {
|
|
t.Errorf("err = %v; want ErrACMEAccountDoesNotExist", err)
|
|
}
|
|
}
|
|
|
|
func TestNewAccount_OnlyReturnExisting_Match(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _, _ := newSvcWithAudit(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
jwk := mustGenJWK(t)
|
|
|
|
first, _, err := svc.NewAccount(context.Background(), "prof-corp", jwk, nil, false, false)
|
|
if err != nil {
|
|
t.Fatalf("first: %v", err)
|
|
}
|
|
second, isNew, err := svc.NewAccount(context.Background(), "prof-corp", jwk, nil, true, false)
|
|
if err != nil {
|
|
t.Fatalf("second: %v", err)
|
|
}
|
|
if isNew {
|
|
t.Errorf("isNew = true; want false")
|
|
}
|
|
if second.AccountID != first.AccountID {
|
|
t.Errorf("ids differ")
|
|
}
|
|
}
|
|
|
|
func TestUpdateAccount_HappyPath(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _, auditRepo := newSvcWithAudit(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
jwk := mustGenJWK(t)
|
|
acct, _, err := svc.NewAccount(context.Background(), "prof-corp", jwk, []string{"mailto:old@example.com"}, false, false)
|
|
if err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
updated, err := svc.UpdateAccount(context.Background(), acct.AccountID, []string{"mailto:new@example.com"})
|
|
if err != nil {
|
|
t.Fatalf("UpdateAccount: %v", err)
|
|
}
|
|
if len(updated.Contact) != 1 || updated.Contact[0] != "mailto:new@example.com" {
|
|
t.Errorf("contact = %v", updated.Contact)
|
|
}
|
|
// Two audit rows: the create + the update.
|
|
if got := len(auditRepo.events); got != 2 {
|
|
t.Errorf("audit events = %d, want 2", got)
|
|
}
|
|
if got := auditRepo.events[1].Action; got != "acme_account_updated" {
|
|
t.Errorf("update audit action = %q", got)
|
|
}
|
|
}
|
|
|
|
func TestDeactivateAccount_HappyPath(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _, auditRepo := newSvcWithAudit(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
jwk := mustGenJWK(t)
|
|
acct, _, err := svc.NewAccount(context.Background(), "prof-corp", jwk, nil, false, false)
|
|
if err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
deactivated, err := svc.DeactivateAccount(context.Background(), acct.AccountID)
|
|
if err != nil {
|
|
t.Fatalf("DeactivateAccount: %v", err)
|
|
}
|
|
if deactivated.Status != domain.ACMEAccountStatusDeactivated {
|
|
t.Errorf("status = %q, want %q", deactivated.Status, domain.ACMEAccountStatusDeactivated)
|
|
}
|
|
if got := svc.Metrics().DeactivateAccountTotal.Load(); got != 1 {
|
|
t.Errorf("DeactivateAccountTotal = %d, want 1", got)
|
|
}
|
|
if got := auditRepo.events[len(auditRepo.events)-1].Action; got != "acme_account_deactivated" {
|
|
t.Errorf("last audit action = %q", got)
|
|
}
|
|
}
|
|
|
|
func TestLookupAccount_NotFound(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
svc, _ := newSvc(t, cfg, nil)
|
|
_, err := svc.LookupAccount(context.Background(), "acme-acc-missing")
|
|
if !errors.Is(err, ErrACMEAccountNotFound) {
|
|
t.Errorf("err = %v; want ErrACMEAccountNotFound", err)
|
|
}
|
|
}
|
|
|
|
func TestNewAccount_RequiresTransactor(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute}
|
|
// Use newSvc (no transactor wired) — NewAccount should refuse.
|
|
svc, _ := newSvc(t, cfg, map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp"},
|
|
})
|
|
jwk := mustGenJWK(t)
|
|
_, _, err := svc.NewAccount(context.Background(), "prof-corp", jwk, nil, false, false)
|
|
if err == nil {
|
|
t.Fatal("expected error when transactor is unset")
|
|
}
|
|
}
|
|
|
|
// --- Phase 2 — order creation in trust_authenticated mode -------------
|
|
|
|
// orderTrackingRepo wraps fakeACMERepo so CreateOrder + CreateAuthz +
|
|
// CreateChallenge persistence is observable in tests. The fakeACMERepo's
|
|
// stubs no-op; this overrides them.
|
|
type orderTrackingRepo struct {
|
|
*fakeACMERepo
|
|
orders map[string]*domain.ACMEOrder
|
|
authzs map[string][]*domain.ACMEAuthorization // orderID → authzs
|
|
challenges map[string][]domain.ACMEChallenge // authzID → challenges
|
|
}
|
|
|
|
func newOrderTrackingRepo() *orderTrackingRepo {
|
|
return &orderTrackingRepo{
|
|
fakeACMERepo: newFakeACMERepo(),
|
|
orders: map[string]*domain.ACMEOrder{},
|
|
authzs: map[string][]*domain.ACMEAuthorization{},
|
|
challenges: map[string][]domain.ACMEChallenge{},
|
|
}
|
|
}
|
|
|
|
func (r *orderTrackingRepo) CreateOrderWithTx(ctx context.Context, q repository.Querier, order *domain.ACMEOrder) error {
|
|
cp := *order
|
|
r.orders[order.OrderID] = &cp
|
|
return nil
|
|
}
|
|
func (r *orderTrackingRepo) GetOrderByID(ctx context.Context, orderID string) (*domain.ACMEOrder, error) {
|
|
o, ok := r.orders[orderID]
|
|
if !ok {
|
|
return nil, repository.ErrNotFound
|
|
}
|
|
cp := *o
|
|
return &cp, nil
|
|
}
|
|
func (r *orderTrackingRepo) UpdateOrderWithTx(ctx context.Context, q repository.Querier, order *domain.ACMEOrder) error {
|
|
cp := *order
|
|
r.orders[order.OrderID] = &cp
|
|
return nil
|
|
}
|
|
func (r *orderTrackingRepo) CreateAuthzWithTx(ctx context.Context, q repository.Querier, authz *domain.ACMEAuthorization) error {
|
|
cp := *authz
|
|
r.authzs[authz.OrderID] = append(r.authzs[authz.OrderID], &cp)
|
|
return nil
|
|
}
|
|
func (r *orderTrackingRepo) ListAuthzsByOrder(ctx context.Context, orderID string) ([]*domain.ACMEAuthorization, error) {
|
|
return r.authzs[orderID], nil
|
|
}
|
|
func (r *orderTrackingRepo) CreateChallengeWithTx(ctx context.Context, q repository.Querier, ch *domain.ACMEChallenge) error {
|
|
r.challenges[ch.AuthzID] = append(r.challenges[ch.AuthzID], *ch)
|
|
return nil
|
|
}
|
|
|
|
func TestCreateOrder_TrustAuthenticated_AutoReady(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute, OrderTTL: 24 * time.Hour, AuthzTTL: 24 * time.Hour}
|
|
repo := newOrderTrackingRepo()
|
|
pl := &fakeProfileLookup{profiles: map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp", ACMEAuthMode: "trust_authenticated"},
|
|
}}
|
|
auditRepo := &fakeAuditRepo{}
|
|
auditSvc := NewAuditService(auditRepo)
|
|
svc := NewACMEService(repo, pl, cfg)
|
|
svc.SetTransactor(&fakeTransactor{})
|
|
svc.SetAuditService(auditSvc)
|
|
|
|
order, err := svc.CreateOrder(context.Background(), "acme-acc-X", "prof-corp",
|
|
[]domain.ACMEIdentifier{{Type: "dns", Value: "example.com"}}, nil, nil)
|
|
if err != nil {
|
|
t.Fatalf("CreateOrder: %v", err)
|
|
}
|
|
if order.Status != domain.ACMEOrderStatusReady {
|
|
t.Errorf("order status = %q, want ready (trust_authenticated)", order.Status)
|
|
}
|
|
authzs := repo.authzs[order.OrderID]
|
|
if len(authzs) != 1 {
|
|
t.Fatalf("authzs = %d, want 1", len(authzs))
|
|
}
|
|
if authzs[0].Status != domain.ACMEAuthzStatusValid {
|
|
t.Errorf("authz status = %q, want valid (trust_authenticated)", authzs[0].Status)
|
|
}
|
|
chs := repo.challenges[authzs[0].AuthzID]
|
|
if len(chs) != 1 {
|
|
t.Fatalf("challenges = %d, want 1", len(chs))
|
|
}
|
|
if chs[0].Status != domain.ACMEChallengeStatusValid {
|
|
t.Errorf("challenge status = %q, want valid (trust_authenticated)", chs[0].Status)
|
|
}
|
|
// Audit row written.
|
|
if got := len(auditRepo.events); got != 1 {
|
|
t.Errorf("audit events = %d, want 1", got)
|
|
}
|
|
if auditRepo.events[0].Action != "acme_order_created" {
|
|
t.Errorf("audit action = %q", auditRepo.events[0].Action)
|
|
}
|
|
if got := svc.Metrics().NewOrderTotal.Load(); got != 1 {
|
|
t.Errorf("NewOrderTotal = %d, want 1", got)
|
|
}
|
|
}
|
|
|
|
func TestCreateOrder_ChallengeMode_StaysPending(t *testing.T) {
|
|
cfg := config.ACMEServerConfig{NonceTTL: 5 * time.Minute, OrderTTL: 24 * time.Hour, AuthzTTL: 24 * time.Hour}
|
|
repo := newOrderTrackingRepo()
|
|
pl := &fakeProfileLookup{profiles: map[string]*domain.CertificateProfile{
|
|
"prof-corp": {ID: "prof-corp", Name: "corp", ACMEAuthMode: "challenge"},
|
|
}}
|
|
auditSvc := NewAuditService(&fakeAuditRepo{})
|
|
svc := NewACMEService(repo, pl, cfg)
|
|
svc.SetTransactor(&fakeTransactor{})
|
|
svc.SetAuditService(auditSvc)
|
|
|
|
order, err := svc.CreateOrder(context.Background(), "acme-acc-X", "prof-corp",
|
|
[]domain.ACMEIdentifier{{Type: "dns", Value: "example.com"}}, nil, nil)
|
|
if err != nil {
|
|
t.Fatalf("CreateOrder: %v", err)
|
|
}
|
|
if order.Status != domain.ACMEOrderStatusPending {
|
|
t.Errorf("order status = %q, want pending (challenge mode)", order.Status)
|
|
}
|
|
authzs := repo.authzs[order.OrderID]
|
|
if authzs[0].Status != domain.ACMEAuthzStatusPending {
|
|
t.Errorf("authz status = %q, want pending (challenge mode)", authzs[0].Status)
|
|
}
|
|
chs := repo.challenges[authzs[0].AuthzID]
|
|
if chs[0].Status != domain.ACMEChallengeStatusPending {
|
|
t.Errorf("challenge status = %q, want pending (challenge mode)", chs[0].Status)
|
|
}
|
|
}
|