mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 12:41:30 +00:00
5a682db8e2
+ Cisco IOS quirk fixtures + ManagedCertificate.Source provenance + EST bulk-revoke endpoint + 13 typed audit action codes. Phase 10.1 — libest reference-client sidecar: - deploy/test/libest/Dockerfile: multi-stage Debian-bookworm-slim build of Cisco's libest v3.2.0-2 from source (autoconf/automake/ libtool + libcurl4-openssl-dev + libssl-dev). Runtime stage carries only estclient + bash + openssl + ca-certificates so the exec surface stays small + predictable. - docker-compose.test.yml libest-client entry (profiles: [est-e2e]) with bind mounts for /config/est (test workspace) + /config/certs (certctl CA bundle for TLS pinning); IP 10.30.50.9 (10.30.50.8 was already taken by certctl-agent). - deploy/test/est/.gitkeep keeps the bind-mount target tracked. Phase 10.2 — 5 integration tests (//go:build integration) in deploy/test/est_e2e_test.go: - TestEST_LibESTClient_Enrollment_Integration (cacerts → simpleenroll → cert-shape assertion) - TestEST_LibESTClient_MTLSEnrollment_Integration (mTLS sibling-route cert auth; skip when bootstrap cert absent) - TestEST_LibESTClient_ServerKeygen_Integration (RFC 7030 §4.4 multipart; skip when profile gate disabled) - TestEST_LibESTClient_RateLimited_Integration (4th enroll trips per-principal cap, asserts 429-shaped error) - TestEST_LibESTClient_ChannelBinding_Integration (libest --tls-exporter; skip when libest build lacks the flag). - requireESTSidecar guard skips the suite when the operator forgot --profile est-e2e; helpful error message includes the exact command to bring the sidecar up. Phase 10.3 — Cisco IOS quirk fixtures + 3 unit tests in internal/api/handler/cisco_ios_quirks_test.go: - testdata/cisco_ios_15x_pem_csr.txt: PEM body sent with Content-Type application/x-pem-file. Handler dispatches on body-prefix not Content-Type — accepts cleanly. - testdata/cisco_ios_16x_trailing_newline_csr.txt: extra trailing newlines after base64 body. strings.TrimSpace tolerates. - testdata/cisco_ios_crlf_b64_csr.txt: CRLF-wrapped base64. base64.StdEncoding handles CRLF + LF identically. Phase 11.1 — ManagedCertificate.Source provenance: - New domain.CertificateSource enum (Unspecified/EST/SCEP/API/Agent). - Migration 000023_managed_certificates_source.up.sql adds source TEXT NOT NULL DEFAULT '' so existing rows scan as CertificateSourceUnspecified — back-compat: bulk-revoke filter treats empty as "any source". - Postgres repo Insert/Update/scan paths all wire the new column. Phase 11.2 — EST bulk-revoke endpoint: - BulkRevocationCriteria.Source field (Source-only requests rejected as too broad — must accompany at least one narrower criterion). - service.bulk_revocation.resolveCertificates post-filter by Source (empty=any, no SQL change so existing CertificateFilter callers unaffected). - New BulkRevocationHandler.BulkRevokeEST method pins Source=EST + dispatches; new route POST /api/v1/est/certificates/bulk-revoke (M-008 admin-gated). openapi.yaml documented + parity-guard green. Phase 11.3 — 13 typed audit action codes in internal/service/est_audit_actions.go: - est_simple_enroll_success / _failed - est_simple_reenroll_success / _failed - est_server_keygen_success / _failed - est_auth_failed_basic / _mtls / _channel_binding - est_rate_limited - est_csr_policy_violation - est_bulk_revoke - est_trust_anchor_reloaded - ESTService.processEnrollment + SimpleServerKeygen + ReloadTrust split-emit BOTH the legacy bare action codes (back-compat for the GUI activity-tab chip filters that match by exact string + existing audit-log analysers) AND the new typed _success / _failed variants (operator grep target + per-failure-mode counter). Tests: - internal/api/handler/bulk_revocation_est_test.go — 5 cases (admin-true happy path pins Source=EST + non-admin 403 + empty-criteria 400 + invalid-reason 400 + method-not-allowed). - internal/service/est_audit_actions_test.go — 5 cases (SimpleEnroll legacy+typed emission / SimpleReEnroll typed / IssuerError typed-failed / PolicyViolation triple-emit / unique-string invariant). Pre-commit verification (sandbox): gofmt clean, go vet clean (excluding repository/postgres testcontainers limit), staticcheck clean across api/handler/api/router/domain/service/deploy/test, go test -short -count=1 green for every non-postgres Go package + integration build (`go build -tags integration ./deploy/test/...`) clean. G-3 docs-drift guard reproduced locally clean (Phases 10-11 added zero new env vars). Spec preserved at cowork/est-rfc7030-hardening-prompt.md. Phases 12-13 (docs/est.md + WiFi/802.1X / IoT bootstrap / FreeRADIUS recipes; release prep + tag) remain — post-2.1.0 work.
133 lines
5.6 KiB
Go
133 lines
5.6 KiB
Go
package handler
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/shankar0123/certctl/internal/domain"
|
|
)
|
|
|
|
// EST RFC 7030 hardening master bundle Phase 10.3 — Cisco IOS quirk
|
|
// fixtures. Each fixture is a captured-shape CSR that exercises one
|
|
// of the documented IOS wire-format deviations from the EST §4.2.1
|
|
// happy-path; the test pins that ESTHandler.readCSRFromRequest +
|
|
// the broader handler pipeline accept each shape without operator
|
|
// intervention.
|
|
//
|
|
// Fixtures live under testdata/cisco_ios_*.txt — kept as plain-text
|
|
// copies so a future reader can `cat` them + understand the shape
|
|
// without re-deriving from a binary blob.
|
|
|
|
// loadCiscoFixture reads the named testdata file. Path-traversal-safe
|
|
// because the fixture name is a compile-time constant per call site;
|
|
// we keep filepath.Clean for hygiene.
|
|
func loadCiscoFixture(t *testing.T, name string) string {
|
|
t.Helper()
|
|
body, err := os.ReadFile(filepath.Clean(filepath.Join("testdata", name)))
|
|
if err != nil {
|
|
t.Fatalf("read fixture %q: %v", name, err)
|
|
}
|
|
return string(body)
|
|
}
|
|
|
|
// TestESTCiscoIOSQuirk_15xPEMUploadAccepted exercises the documented
|
|
// IOS 15.x quirk: the device sends Content-Type `application/x-pem-file`
|
|
// (PEM-encoded) instead of the EST §4.2.1 canonical
|
|
// `application/pkcs10` (base64-DER). The handler's readCSRFromRequest
|
|
// dispatches on body-prefix (`-----BEGIN CERTIFICATE REQUEST-----`)
|
|
// rather than Content-Type, so the upload should parse cleanly + the
|
|
// service should see a properly-formed CSR.
|
|
func TestESTCiscoIOSQuirk_15xPEMUploadAccepted(t *testing.T) {
|
|
body := loadCiscoFixture(t, "cisco_ios_15x_pem_csr.txt")
|
|
if !strings.HasPrefix(body, "-----BEGIN CERTIFICATE REQUEST-----") {
|
|
t.Fatalf("fixture corrupted: expected PEM prefix, got %q", body[:60])
|
|
}
|
|
|
|
svc := &mockESTService{EnrollResult: ciscoQuirkOKResult(t)}
|
|
h := NewESTHandler(svc)
|
|
|
|
req := httptest.NewRequest(http.MethodPost,
|
|
"/.well-known/est/corp/simpleenroll", strings.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/x-pem-file") // the IOS 15.x quirk
|
|
req.TLS = &tls.ConnectionState{HandshakeComplete: true, Version: tls.VersionTLS13}
|
|
w := httptest.NewRecorder()
|
|
h.SimpleEnroll(w, req)
|
|
|
|
if w.Code != http.StatusOK {
|
|
t.Errorf("IOS 15.x PEM upload status = %d, want 200; body=%q", w.Code, w.Body.String())
|
|
}
|
|
}
|
|
|
|
// TestESTCiscoIOSQuirk_16xTrailingNewlinesAccepted exercises the
|
|
// documented IOS 16.x quirk: an extra trailing newline after the
|
|
// base64 body. The handler's strings.TrimSpace pass MUST tolerate
|
|
// any number of trailing whitespace bytes without surfacing as a
|
|
// malformed-CSR rejection.
|
|
func TestESTCiscoIOSQuirk_16xTrailingNewlinesAccepted(t *testing.T) {
|
|
body := loadCiscoFixture(t, "cisco_ios_16x_trailing_newline_csr.txt")
|
|
if !strings.HasSuffix(body, "\n\n\n") && !strings.HasSuffix(body, "\n\n") {
|
|
tail := body
|
|
if len(tail) > 10 {
|
|
tail = body[len(body)-10:]
|
|
}
|
|
t.Fatalf("fixture corrupted: expected ≥2 trailing newlines; got tail=%q", tail)
|
|
}
|
|
|
|
svc := &mockESTService{EnrollResult: ciscoQuirkOKResult(t)}
|
|
h := NewESTHandler(svc)
|
|
|
|
req := httptest.NewRequest(http.MethodPost,
|
|
"/.well-known/est/corp/simpleenroll", strings.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/pkcs10")
|
|
req.TLS = &tls.ConnectionState{HandshakeComplete: true, Version: tls.VersionTLS13}
|
|
w := httptest.NewRecorder()
|
|
h.SimpleEnroll(w, req)
|
|
|
|
if w.Code != http.StatusOK {
|
|
t.Errorf("IOS 16.x trailing-newlines status = %d, want 200; body=%q", w.Code, w.Body.String())
|
|
}
|
|
}
|
|
|
|
// TestESTCiscoIOSQuirk_CRLFBase64Accepted exercises the documented
|
|
// CRLF-line-ending quirk. Some IOS versions emit base64-DER with
|
|
// CRLF wrapping (the RFC 2045 §6.8 wire shape) rather than bare LF
|
|
// (the JSON-via-curl shape). The handler must strip both CRLF + LF
|
|
// before passing to base64.StdEncoding.DecodeString.
|
|
func TestESTCiscoIOSQuirk_CRLFBase64Accepted(t *testing.T) {
|
|
body := loadCiscoFixture(t, "cisco_ios_crlf_b64_csr.txt")
|
|
if !strings.Contains(body, "\r\n") {
|
|
t.Fatalf("fixture corrupted: expected CRLF-wrapped body; first 80 = %q", body[:80])
|
|
}
|
|
|
|
svc := &mockESTService{EnrollResult: ciscoQuirkOKResult(t)}
|
|
h := NewESTHandler(svc)
|
|
|
|
req := httptest.NewRequest(http.MethodPost,
|
|
"/.well-known/est/corp/simpleenroll", strings.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/pkcs10")
|
|
req.TLS = &tls.ConnectionState{HandshakeComplete: true, Version: tls.VersionTLS13}
|
|
w := httptest.NewRecorder()
|
|
h.SimpleEnroll(w, req)
|
|
|
|
if w.Code != http.StatusOK {
|
|
t.Errorf("CRLF-wrapped base64 status = %d, want 200; body=%q", w.Code, w.Body.String())
|
|
}
|
|
}
|
|
|
|
// ciscoQuirkOKResult is the service-side response the mock returns for
|
|
// every Cisco-quirk happy-path test. The cert content doesn't matter —
|
|
// what matters is that the handler reaches the service call (i.e. it
|
|
// successfully parsed the CSR), so we hand back a hard-coded EC cert
|
|
// PEM that pkcs7.PEMToDERChain accepts cleanly.
|
|
func ciscoQuirkOKResult(t *testing.T) *domain.ESTEnrollResult {
|
|
t.Helper()
|
|
return &domain.ESTEnrollResult{
|
|
CertPEM: "-----BEGIN CERTIFICATE-----\nMIIBnDCCAUOgAwIBAgIBATAKBggqhkjOPQQDAjAUMRIwEAYDVQQDDAljaXNjby10\nZXN0MB4XDTI1MDEwMTAwMDAwMFoXDTM1MTIzMTAwMDAwMFowFDESMBAGA1UEAwwJ\nY2lzY28tdGVzdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAfNh1+nAo15qVMF\nh0w4EQfHBn5zQgEDLkJhpZ+9PqJkgqdSwJgC+4Ah+UWrJOO6+P9YOPXqkSQU0E2X\n3/Ms2DyjUzBRMB0GA1UdDgQWBBSm1U4Fmh4j9eJDVa8qBOrkxqLhajAfBgNVHSME\nGDAWgBSm1U4Fmh4j9eJDVa8qBOrkxqLhajAPBgNVHRMBAf8EBTADAQH/MAoGCCqG\nSM49BAMCA0gAMEUCIQCY7d0XHVz7AmAFZrYTIVFmRn/PV+0qRu9HSqwvU1HYNgIg\nXKJM6e/0ckLhqLGB1lN9Bz/cvyZuYIcHLgMrlvNUwYE=\n-----END CERTIFICATE-----\n",
|
|
}
|
|
}
|