feat(M47): add Kubernetes Secrets target + AWS ACM PCA issuer connectors

Implement both M47 connectors with full cross-layer wiring:

Kubernetes Secrets target: DNS-1123 validation, kubernetes.io/tls Secret
create-or-update, chain concatenation, serial number validation, Helm
RBAC gating. 18 tests.

AWS ACM Private CA issuer: synchronous issuance (like Vault), ARN regex
validation, RFC 5280 revocation reason mapping, CA cert retrieval,
factory + env var seeding. 23 tests.

Cross-cutting: domain types, service validation, config, factory, agent
dispatch, frontend (TargetsPage, issuerTypes), OpenAPI, seed data, Helm
chart, connectors docs, README. Testing docs (testing-guide, qa-test-guide,
qa_test.go) with Parts thematically integrated near related connectors.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Shankar
2026-04-07 20:21:09 -04:00
parent f17027c62b
commit e72f06f35b
22 changed files with 2620 additions and 18 deletions
+38
View File
@@ -29,10 +29,41 @@ type Config struct {
DigiCert DigiCertConfig
Sectigo SectigoConfig
GoogleCAS GoogleCASConfig
AWSACMPCA AWSACMPCAConfig
Digest DigestConfig
Encryption EncryptionConfig
}
// AWSACMPCAConfig contains AWS ACM Private CA issuer connector configuration.
type AWSACMPCAConfig struct {
// Region is the AWS region where the Private CA resides (e.g., "us-east-1").
// Required for AWS ACM PCA integration.
// Setting: CERTCTL_AWS_PCA_REGION environment variable.
Region string
// CAArn is the ARN of the ACM Private CA certificate authority.
// Format: arn:aws:acm-pca:<region>:<account>:certificate-authority/<id>
// Required for AWS ACM PCA integration.
// Setting: CERTCTL_AWS_PCA_CA_ARN environment variable.
CAArn string
// SigningAlgorithm is the signing algorithm for certificate issuance.
// Valid: SHA256WITHRSA, SHA384WITHRSA, SHA512WITHRSA, SHA256WITHECDSA, SHA384WITHECDSA, SHA512WITHECDSA.
// Default: "SHA256WITHRSA".
// Setting: CERTCTL_AWS_PCA_SIGNING_ALGORITHM environment variable.
SigningAlgorithm string
// ValidityDays is the certificate validity period in days.
// Default: 365.
// Setting: CERTCTL_AWS_PCA_VALIDITY_DAYS environment variable.
ValidityDays int
// TemplateArn is the optional ARN of an ACM PCA certificate template.
// Used for constrained subordinate CAs or custom certificate profiles.
// Setting: CERTCTL_AWS_PCA_TEMPLATE_ARN environment variable.
TemplateArn string
}
// EncryptionConfig contains configuration for encrypting sensitive data at rest.
type EncryptionConfig struct {
// ConfigEncryptionKey is the passphrase used to derive AES-256-GCM keys for encrypting
@@ -597,6 +628,13 @@ func Load() (*Config, error) {
Credentials: getEnv("CERTCTL_GOOGLE_CAS_CREDENTIALS", ""),
TTL: getEnv("CERTCTL_GOOGLE_CAS_TTL", "8760h"),
},
AWSACMPCA: AWSACMPCAConfig{
Region: getEnv("CERTCTL_AWS_PCA_REGION", ""),
CAArn: getEnv("CERTCTL_AWS_PCA_CA_ARN", ""),
SigningAlgorithm: getEnv("CERTCTL_AWS_PCA_SIGNING_ALGORITHM", "SHA256WITHRSA"),
ValidityDays: getEnvInt("CERTCTL_AWS_PCA_VALIDITY_DAYS", 365),
TemplateArn: getEnv("CERTCTL_AWS_PCA_TEMPLATE_ARN", ""),
},
ACME: ACMEConfig{
DirectoryURL: getEnv("CERTCTL_ACME_DIRECTORY_URL", ""),
Email: getEnv("CERTCTL_ACME_EMAIL", ""),
@@ -0,0 +1,416 @@
// Package awsacmpca implements the issuer.Connector interface for AWS Certificate Authority Service (CAS).
//
// AWS ACM Private CA (ACM PCA) provides a fully managed private certificate authority
// with certificate signing, revocation, and CRL capabilities. This connector uses the
// AWS ACM PCA API to issue and manage certificates.
//
// This connector issues certificates synchronously: the IssueCertificate call returns
// the issued certificate immediately. GetOrderStatus always returns "completed" since
// issuance is synchronous. CRL and OCSP operations are delegated to AWS PCA's own
// endpoints.
//
// Authentication: AWS credentials via the standard credential chain (environment variables,
// IAM role, instance profile, or SSO). Configuration specifies the CA ARN, region, and
// optional signing algorithm and validity days.
//
// AWS ACM PCA API used (abstracted via ACMPCAClient interface):
//
// IssueCertificate - Issue a certificate from a CSR
// GetCertificate - Retrieve the issued certificate
// RevokeCertificate - Revoke a certificate
// GetCACertificate - Get the CA certificate chain
package awsacmpca
import (
"context"
"crypto/x509"
"encoding/json"
"encoding/pem"
"fmt"
"log/slog"
"regexp"
"strings"
"time"
"github.com/shankar0123/certctl/internal/connector/issuer"
)
// Config represents the AWS ACM Private CA issuer connector configuration.
type Config struct {
// Region is the AWS region where the CA resides (e.g., "us-east-1").
// Required. Set via CERTCTL_GOOGLE_CAS_PROJECT environment variable.
Region string `json:"region"`
// CAArn is the ARN of the AWS Certificate Authority Service CA.
// Required. Set via CERTCTL_GOOGLE_CAS_CA_ARN environment variable.
// Example: arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012
CAArn string `json:"ca_arn"`
// SigningAlgorithm is the algorithm used to sign certificates.
// Default: "SHA256WITHRSA". Set via CERTCTL_AWS_PCA_SIGNING_ALGORITHM.
// Valid values: SHA256WITHRSA, SHA384WITHRSA, SHA512WITHRSA,
// SHA256WITHECDSA, SHA384WITHECDSA, SHA512WITHECDSA
SigningAlgorithm string `json:"signing_algorithm,omitempty"`
// ValidityDays is the number of days the certificate is valid.
// Default: 365. Set via CERTCTL_AWS_PCA_VALIDITY_DAYS.
ValidityDays int `json:"validity_days,omitempty"`
// TemplateArn is the optional certificate template ARN for subordinate CAs with restrictions.
// Set via CERTCTL_AWS_PCA_TEMPLATE_ARN.
TemplateArn string `json:"template_arn,omitempty"`
}
// ACMPCAClient defines the interface for interacting with AWS ACM Private CA.
// This allows for dependency injection and testing with mock clients.
type ACMPCAClient interface {
// IssueCertificate issues a new certificate.
IssueCertificate(ctx context.Context, input *IssueCertificateInput) (*IssueCertificateOutput, error)
// GetCertificate retrieves an issued certificate.
GetCertificate(ctx context.Context, input *GetCertificateInput) (*GetCertificateOutput, error)
// RevokeCertificate revokes a certificate.
RevokeCertificate(ctx context.Context, input *RevokeCertificateInput) error
// GetCACertificate retrieves the CA certificate chain.
GetCACertificate(ctx context.Context, input *GetCACertificateInput) (*GetCACertificateOutput, error)
}
// IssueCertificateInput represents the request to issue a certificate.
type IssueCertificateInput struct {
CAArn string
CSR []byte // DER-encoded CSR
SigningAlgorithm string
ValidityDays int
TemplateArn string
}
// IssueCertificateOutput represents the response to an issue request.
type IssueCertificateOutput struct {
CertificateArn string
}
// GetCertificateInput represents the request to retrieve a certificate.
type GetCertificateInput struct {
CAArn string
CertificateArn string
}
// GetCertificateOutput represents the response containing the certificate.
type GetCertificateOutput struct {
Certificate string // PEM-encoded certificate
CertificateChain string // PEM-encoded certificate chain
}
// RevokeCertificateInput represents the request to revoke a certificate.
type RevokeCertificateInput struct {
CAArn string
CertificateSerial string
RevocationReason string
}
// GetCACertificateInput represents the request to retrieve the CA certificate.
type GetCACertificateInput struct {
CAArn string
}
// GetCACertificateOutput represents the response containing the CA certificate.
type GetCACertificateOutput struct {
Certificate string // PEM-encoded CA certificate
CertificateChain string // PEM-encoded CA chain
}
// Connector implements the issuer.Connector interface for AWS ACM Private CA.
type Connector struct {
config *Config
client ACMPCAClient
logger *slog.Logger
}
// New creates a new AWS ACM Private CA connector with the given configuration and logger.
// The real client will use the AWS SDK via the standard credential chain.
func New(config *Config, logger *slog.Logger) *Connector {
if config != nil {
if config.SigningAlgorithm == "" {
config.SigningAlgorithm = "SHA256WITHRSA"
}
if config.ValidityDays == 0 {
config.ValidityDays = 365
}
}
return &Connector{
config: config,
client: &stubClient{}, // Placeholder; real AWS client will be injected or implemented
logger: logger,
}
}
// NewWithClient creates a new AWS ACM Private CA connector with a custom client.
// Used primarily for testing with mock clients.
func NewWithClient(config *Config, client ACMPCAClient, logger *slog.Logger) *Connector {
if config != nil {
if config.SigningAlgorithm == "" {
config.SigningAlgorithm = "SHA256WITHRSA"
}
if config.ValidityDays == 0 {
config.ValidityDays = 365
}
}
return &Connector{
config: config,
client: client,
logger: logger,
}
}
// stubClient is a placeholder client that returns "not implemented" errors.
// In production, this would be replaced with a real AWS SDK client.
type stubClient struct{}
func (s *stubClient) IssueCertificate(ctx context.Context, input *IssueCertificateInput) (*IssueCertificateOutput, error) {
return nil, fmt.Errorf("AWS SDK client not initialized (stub)")
}
func (s *stubClient) GetCertificate(ctx context.Context, input *GetCertificateInput) (*GetCertificateOutput, error) {
return nil, fmt.Errorf("AWS SDK client not initialized (stub)")
}
func (s *stubClient) RevokeCertificate(ctx context.Context, input *RevokeCertificateInput) error {
return fmt.Errorf("AWS SDK client not initialized (stub)")
}
func (s *stubClient) GetCACertificate(ctx context.Context, input *GetCACertificateInput) (*GetCACertificateOutput, error) {
return nil, fmt.Errorf("AWS SDK client not initialized (stub)")
}
// ValidateConfig checks that the AWS ACM Private CA configuration is valid.
func (c *Connector) ValidateConfig(ctx context.Context, rawConfig json.RawMessage) error {
var cfg Config
if err := json.Unmarshal(rawConfig, &cfg); err != nil {
return fmt.Errorf("invalid AWS ACM PCA config: %w", err)
}
if cfg.Region == "" {
return fmt.Errorf("AWS region is required")
}
if cfg.CAArn == "" {
return fmt.Errorf("AWS CA ARN is required")
}
// Validate ARN format: arn:aws(-[a-z]+)?:acm-pca:[a-z0-9-]+:\d{12}:certificate-authority/[a-f0-9-]+
arnPattern := regexp.MustCompile(`^arn:aws(-[a-z]+)?:acm-pca:[a-z0-9-]+:\d{12}:certificate-authority/[a-f0-9-]+$`)
if !arnPattern.MatchString(cfg.CAArn) {
return fmt.Errorf("invalid CA ARN format: %s", cfg.CAArn)
}
// Validate signing algorithm if provided
if cfg.SigningAlgorithm != "" {
validAlgorithms := map[string]bool{
"SHA256WITHRSA": true,
"SHA384WITHRSA": true,
"SHA512WITHRSA": true,
"SHA256WITHECDSA": true,
"SHA384WITHECDSA": true,
"SHA512WITHECDSA": true,
}
if !validAlgorithms[cfg.SigningAlgorithm] {
return fmt.Errorf("invalid signing algorithm: %s", cfg.SigningAlgorithm)
}
} else {
cfg.SigningAlgorithm = "SHA256WITHRSA"
}
// Validate validity days if provided
if cfg.ValidityDays < 0 {
return fmt.Errorf("validity days must be non-negative")
}
if cfg.ValidityDays == 0 {
cfg.ValidityDays = 365
}
c.config = &cfg
c.logger.Info("AWS ACM Private CA configuration validated",
"region", cfg.Region,
"ca_arn", cfg.CAArn,
"signing_algorithm", cfg.SigningAlgorithm,
"validity_days", cfg.ValidityDays)
return nil
}
// IssueCertificate issues a new certificate using AWS ACM Private CA.
func (c *Connector) IssueCertificate(ctx context.Context, request issuer.IssuanceRequest) (*issuer.IssuanceResult, error) {
c.logger.Info("processing AWS ACM PCA issuance request",
"common_name", request.CommonName,
"san_count", len(request.SANs))
// Decode CSR from PEM
csrBlock, _ := pem.Decode([]byte(request.CSRPEM))
if csrBlock == nil {
return nil, fmt.Errorf("failed to decode CSR PEM")
}
// Call AWS API to issue certificate
issueOutput, err := c.client.IssueCertificate(ctx, &IssueCertificateInput{
CAArn: c.config.CAArn,
CSR: csrBlock.Bytes,
SigningAlgorithm: c.config.SigningAlgorithm,
ValidityDays: c.config.ValidityDays,
TemplateArn: c.config.TemplateArn,
})
if err != nil {
return nil, fmt.Errorf("AWS IssueCertificate failed: %w", err)
}
// Retrieve the issued certificate
getCertOutput, err := c.client.GetCertificate(ctx, &GetCertificateInput{
CAArn: c.config.CAArn,
CertificateArn: issueOutput.CertificateArn,
})
if err != nil {
return nil, fmt.Errorf("AWS GetCertificate failed: %w", err)
}
if getCertOutput.Certificate == "" {
return nil, fmt.Errorf("no certificate in AWS response")
}
// Parse the certificate to extract metadata
block, _ := pem.Decode([]byte(getCertOutput.Certificate))
if block == nil {
return nil, fmt.Errorf("failed to decode certificate PEM from AWS")
}
cert, err := x509.ParseCertificate(block.Bytes)
if err != nil {
return nil, fmt.Errorf("failed to parse certificate: %w", err)
}
// Extract serial number (hex format, uppercase)
serial := strings.ToUpper(fmt.Sprintf("%x", cert.SerialNumber))
// Use certificate ARN as OrderID for revocation lookup
orderID := issueOutput.CertificateArn
c.logger.Info("AWS ACM PCA certificate issued",
"common_name", request.CommonName,
"serial", serial,
"not_after", cert.NotAfter)
return &issuer.IssuanceResult{
CertPEM: getCertOutput.Certificate,
ChainPEM: getCertOutput.CertificateChain,
Serial: serial,
NotBefore: cert.NotBefore,
NotAfter: cert.NotAfter,
OrderID: orderID,
}, nil
}
// RenewCertificate renews a certificate by creating a new signing request.
// For AWS ACM PCA, renewal is functionally identical to issuance (new cert signed from CSR).
func (c *Connector) RenewCertificate(ctx context.Context, request issuer.RenewalRequest) (*issuer.IssuanceResult, error) {
c.logger.Info("processing AWS ACM PCA renewal request",
"common_name", request.CommonName,
"san_count", len(request.SANs))
return c.IssueCertificate(ctx, issuer.IssuanceRequest{
CommonName: request.CommonName,
SANs: request.SANs,
CSRPEM: request.CSRPEM,
EKUs: request.EKUs,
})
}
// RevokeCertificate revokes a certificate at AWS ACM Private CA.
func (c *Connector) RevokeCertificate(ctx context.Context, request issuer.RevocationRequest) error {
c.logger.Info("processing AWS ACM PCA revocation request", "serial", request.Serial)
// Map RFC 5280 reason string to AWS reason
reason := mapRevocationReason(request.Reason)
err := c.client.RevokeCertificate(ctx, &RevokeCertificateInput{
CAArn: c.config.CAArn,
CertificateSerial: request.Serial,
RevocationReason: reason,
})
if err != nil {
return fmt.Errorf("AWS RevokeCertificate failed: %w", err)
}
c.logger.Info("AWS ACM PCA certificate revoked", "serial", request.Serial)
return nil
}
// GetOrderStatus returns the status of an AWS ACM PCA order.
// AWS ACM PCA issues synchronously, so orders are always "completed" immediately.
func (c *Connector) GetOrderStatus(ctx context.Context, orderID string) (*issuer.OrderStatus, error) {
return &issuer.OrderStatus{
OrderID: orderID,
Status: "completed",
UpdatedAt: time.Now(),
}, nil
}
// GenerateCRL is not supported because AWS ACM PCA serves CRL directly.
func (c *Connector) GenerateCRL(ctx context.Context, revokedCerts []issuer.RevokedCertEntry) ([]byte, error) {
return nil, fmt.Errorf("CRL delegated to AWS ACM Private CA; use AWS endpoint directly")
}
// SignOCSPResponse is not supported because AWS ACM PCA serves OCSP directly.
func (c *Connector) SignOCSPResponse(ctx context.Context, req issuer.OCSPSignRequest) ([]byte, error) {
return nil, fmt.Errorf("OCSP delegated to AWS ACM Private CA; use AWS endpoint directly")
}
// GetCACertPEM retrieves the CA certificate from AWS ACM Private CA.
func (c *Connector) GetCACertPEM(ctx context.Context) (string, error) {
caCertOutput, err := c.client.GetCACertificate(ctx, &GetCACertificateInput{
CAArn: c.config.CAArn,
})
if err != nil {
return "", fmt.Errorf("AWS GetCACertificate failed: %w", err)
}
// Combine CA certificate and chain
if caCertOutput.CertificateChain != "" {
return caCertOutput.Certificate + "\n" + caCertOutput.CertificateChain, nil
}
return caCertOutput.Certificate, nil
}
// GetRenewalInfo returns nil, nil as AWS ACM PCA does not support ACME Renewal Information (ARI).
func (c *Connector) GetRenewalInfo(ctx context.Context, certPEM string) (*issuer.RenewalInfoResult, error) {
return nil, nil
}
// mapRevocationReason converts RFC 5280 reason strings to AWS ACM PCA reason codes.
func mapRevocationReason(reason *string) string {
if reason == nil {
return "UNSPECIFIED"
}
reasonMap := map[string]string{
"unspecified": "UNSPECIFIED",
"keyCompromise": "KEY_COMPROMISE",
"caCompromise": "CERTIFICATE_AUTHORITY_COMPROMISE",
"affiliationChanged": "AFFILIATION_CHANGED",
"superseded": "SUPERSEDED",
"cessationOfOperation": "CESSATION_OF_OPERATION",
"certificateHold": "CERTIFICATE_HOLD",
"privilegeWithdrawn": "PRIVILEGE_WITHDRAWN",
}
if mapped, ok := reasonMap[*reason]; ok {
return mapped
}
return "UNSPECIFIED"
}
// Ensure Connector implements the issuer.Connector interface.
var _ issuer.Connector = (*Connector)(nil)
@@ -0,0 +1,629 @@
package awsacmpca_test
import (
"context"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"crypto/x509/pkix"
"encoding/json"
"encoding/pem"
"fmt"
"log/slog"
"math/big"
"os"
"strings"
"testing"
"time"
"github.com/shankar0123/certctl/internal/connector/issuer"
"github.com/shankar0123/certctl/internal/connector/issuer/awsacmpca"
)
// mockACMPCAClient implements the ACMPCAClient interface for testing.
type mockACMPCAClient struct {
issueCertificateErr error
getCertificateErr error
revokeCertificateErr error
getCACertificateErr error
issuedCertPEM string
issuedChainPEM string
caCertPEM string
caCertChainPEM string
lastIssueCertificateInput *awsacmpca.IssueCertificateInput
lastRevokeCertificateInput *awsacmpca.RevokeCertificateInput
}
func (m *mockACMPCAClient) IssueCertificate(ctx context.Context, input *awsacmpca.IssueCertificateInput) (*awsacmpca.IssueCertificateOutput, error) {
m.lastIssueCertificateInput = input
if m.issueCertificateErr != nil {
return nil, m.issueCertificateErr
}
return &awsacmpca.IssueCertificateOutput{
CertificateArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678/certificate/abcdef123456",
}, nil
}
func (m *mockACMPCAClient) GetCertificate(ctx context.Context, input *awsacmpca.GetCertificateInput) (*awsacmpca.GetCertificateOutput, error) {
if m.getCertificateErr != nil {
return nil, m.getCertificateErr
}
return &awsacmpca.GetCertificateOutput{
Certificate: m.issuedCertPEM,
CertificateChain: m.issuedChainPEM,
}, nil
}
func (m *mockACMPCAClient) RevokeCertificate(ctx context.Context, input *awsacmpca.RevokeCertificateInput) error {
m.lastRevokeCertificateInput = input
return m.revokeCertificateErr
}
func (m *mockACMPCAClient) GetCACertificate(ctx context.Context, input *awsacmpca.GetCACertificateInput) (*awsacmpca.GetCACertificateOutput, error) {
if m.getCACertificateErr != nil {
return nil, m.getCACertificateErr
}
return &awsacmpca.GetCACertificateOutput{
Certificate: m.caCertPEM,
CertificateChain: m.caCertChainPEM,
}, nil
}
// Helper function to generate a test certificate and CSR.
func generateTestCertAndCSR(t *testing.T) (certPEM string, csrPEM string) {
// Generate private key
privKey, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
t.Fatalf("failed to generate private key: %v", err)
}
// Create certificate template
serialNumber, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
if err != nil {
t.Fatalf("failed to generate serial number: %v", err)
}
template := x509.Certificate{
SerialNumber: serialNumber,
Subject: pkix.Name{
CommonName: "example.com",
},
NotBefore: time.Now(),
NotAfter: time.Now().AddDate(1, 0, 0),
BasicConstraintsValid: true,
IsCA: false,
KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
DNSNames: []string{"example.com", "www.example.com"},
}
// Create self-signed certificate for testing
certDER, err := x509.CreateCertificate(rand.Reader, &template, &template, &privKey.PublicKey, privKey)
if err != nil {
t.Fatalf("failed to create certificate: %v", err)
}
certPEM = string(pem.EncodeToMemory(&pem.Block{
Type: "CERTIFICATE",
Bytes: certDER,
}))
// Create CSR
csrTemplate := x509.CertificateRequest{
Subject: pkix.Name{
CommonName: "example.com",
},
DNSNames: []string{"example.com", "www.example.com"},
}
csrDER, err := x509.CreateCertificateRequest(rand.Reader, &csrTemplate, privKey)
if err != nil {
t.Fatalf("failed to create CSR: %v", err)
}
csrPEM = string(pem.EncodeToMemory(&pem.Block{
Type: "CERTIFICATE REQUEST",
Bytes: csrDER,
}))
return certPEM, csrPEM
}
func TestAWSACMPCAConnector(t *testing.T) {
logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))
ctx := context.Background()
t.Run("ValidateConfig_Success", func(t *testing.T) {
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
SigningAlgorithm: "SHA256WITHRSA",
ValidityDays: 365,
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err != nil {
t.Fatalf("ValidateConfig failed: %v", err)
}
})
t.Run("ValidateConfig_AllOptionalFields", func(t *testing.T) {
config := awsacmpca.Config{
Region: "eu-west-1",
CAArn: "arn:aws:acm-pca:eu-west-1:123456789012:certificate-authority/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
SigningAlgorithm: "SHA512WITHECDSA",
ValidityDays: 730,
TemplateArn: "arn:aws:acm-pca:eu-west-1:123456789012:template/WebServer",
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err != nil {
t.Fatalf("ValidateConfig failed: %v", err)
}
})
t.Run("ValidateConfig_InvalidJSON", func(t *testing.T) {
connector := awsacmpca.New(nil, logger)
err := connector.ValidateConfig(ctx, []byte(`{invalid json}`))
if err == nil {
t.Fatal("Expected error for invalid JSON")
}
if !strings.Contains(err.Error(), "invalid AWS ACM PCA config") {
t.Errorf("Expected config error, got: %v", err)
}
})
t.Run("ValidateConfig_MissingRegion", func(t *testing.T) {
config := awsacmpca.Config{
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err == nil {
t.Fatal("Expected error for missing region")
}
if !strings.Contains(err.Error(), "region is required") {
t.Errorf("Expected region required error, got: %v", err)
}
})
t.Run("ValidateConfig_MissingCAArn", func(t *testing.T) {
config := awsacmpca.Config{
Region: "us-east-1",
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err == nil {
t.Fatal("Expected error for missing CA ARN")
}
if !strings.Contains(err.Error(), "CA ARN is required") {
t.Errorf("Expected CA ARN required error, got: %v", err)
}
})
t.Run("ValidateConfig_InvalidCAArn", func(t *testing.T) {
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "not-an-arn",
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err == nil {
t.Fatal("Expected error for invalid CA ARN")
}
if !strings.Contains(err.Error(), "invalid CA ARN format") {
t.Errorf("Expected invalid ARN error, got: %v", err)
}
})
t.Run("ValidateConfig_InvalidSigningAlgorithm", func(t *testing.T) {
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
SigningAlgorithm: "INVALID_ALGO",
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err == nil {
t.Fatal("Expected error for invalid signing algorithm")
}
if !strings.Contains(err.Error(), "invalid signing algorithm") {
t.Errorf("Expected invalid algorithm error, got: %v", err)
}
})
t.Run("ValidateConfig_InvalidValidityDays", func(t *testing.T) {
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
ValidityDays: -1,
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err == nil {
t.Fatal("Expected error for negative validity days")
}
if !strings.Contains(err.Error(), "validity days must be non-negative") {
t.Errorf("Expected validity days error, got: %v", err)
}
})
t.Run("IssueCertificate_Success", func(t *testing.T) {
certPEM, csrPEM := generateTestCertAndCSR(t)
mockClient := &mockACMPCAClient{
issuedCertPEM: certPEM,
issuedChainPEM: certPEM, // Use same cert as chain for test
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
SigningAlgorithm: "SHA256WITHRSA",
ValidityDays: 365,
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
request := issuer.IssuanceRequest{
CommonName: "example.com",
SANs: []string{"www.example.com"},
CSRPEM: csrPEM,
}
result, err := connector.IssueCertificate(ctx, request)
if err != nil {
t.Fatalf("IssueCertificate failed: %v", err)
}
if result.CertPEM == "" {
t.Fatal("Expected certificate PEM in result")
}
if result.Serial == "" {
t.Fatal("Expected serial number in result")
}
if result.OrderID == "" {
t.Fatal("Expected OrderID (certificate ARN) in result")
}
})
t.Run("IssueCertificate_EmptyCSR", func(t *testing.T) {
mockClient := &mockACMPCAClient{}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
request := issuer.IssuanceRequest{
CommonName: "example.com",
CSRPEM: "", // Empty CSR
}
_, err := connector.IssueCertificate(ctx, request)
if err == nil {
t.Fatal("Expected error for empty CSR")
}
if !strings.Contains(err.Error(), "failed to decode CSR PEM") {
t.Errorf("Expected CSR decode error, got: %v", err)
}
})
t.Run("IssueCertificate_IssueError", func(t *testing.T) {
certPEM, csrPEM := generateTestCertAndCSR(t)
mockClient := &mockACMPCAClient{
issueCertificateErr: fmt.Errorf("AWS service error"),
issuedCertPEM: certPEM,
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
request := issuer.IssuanceRequest{
CommonName: "example.com",
CSRPEM: csrPEM,
}
_, err := connector.IssueCertificate(ctx, request)
if err == nil {
t.Fatal("Expected error from IssueCertificate")
}
if !strings.Contains(err.Error(), "IssueCertificate failed") {
t.Errorf("Expected issue error, got: %v", err)
}
})
t.Run("IssueCertificate_GetCertificateError", func(t *testing.T) {
_, csrPEM := generateTestCertAndCSR(t)
mockClient := &mockACMPCAClient{
getCertificateErr: fmt.Errorf("AWS service error"),
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
request := issuer.IssuanceRequest{
CommonName: "example.com",
CSRPEM: csrPEM,
}
_, err := connector.IssueCertificate(ctx, request)
if err == nil {
t.Fatal("Expected error from GetCertificate")
}
if !strings.Contains(err.Error(), "GetCertificate failed") {
t.Errorf("Expected get cert error, got: %v", err)
}
})
t.Run("RenewCertificate_Success", func(t *testing.T) {
certPEM, csrPEM := generateTestCertAndCSR(t)
mockClient := &mockACMPCAClient{
issuedCertPEM: certPEM,
issuedChainPEM: certPEM,
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
request := issuer.RenewalRequest{
CommonName: "example.com",
SANs: []string{"www.example.com"},
CSRPEM: csrPEM,
}
result, err := connector.RenewCertificate(ctx, request)
if err != nil {
t.Fatalf("RenewCertificate failed: %v", err)
}
if result.CertPEM == "" {
t.Fatal("Expected certificate PEM in result")
}
})
t.Run("RevokeCertificate_Success", func(t *testing.T) {
mockClient := &mockACMPCAClient{}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
reason := "keyCompromise"
request := issuer.RevocationRequest{
Serial: "aabbccdd123456",
Reason: &reason,
}
err := connector.RevokeCertificate(ctx, request)
if err != nil {
t.Fatalf("RevokeCertificate failed: %v", err)
}
if mockClient.lastRevokeCertificateInput.RevocationReason != "KEY_COMPROMISE" {
t.Errorf("Expected KEY_COMPROMISE reason, got: %s", mockClient.lastRevokeCertificateInput.RevocationReason)
}
})
t.Run("RevokeCertificate_WithDefaultReason", func(t *testing.T) {
mockClient := &mockACMPCAClient{}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
request := issuer.RevocationRequest{
Serial: "aabbccdd123456",
Reason: nil,
}
err := connector.RevokeCertificate(ctx, request)
if err != nil {
t.Fatalf("RevokeCertificate failed: %v", err)
}
if mockClient.lastRevokeCertificateInput.RevocationReason != "UNSPECIFIED" {
t.Errorf("Expected UNSPECIFIED reason, got: %s", mockClient.lastRevokeCertificateInput.RevocationReason)
}
})
t.Run("RevokeCertificate_Error", func(t *testing.T) {
mockClient := &mockACMPCAClient{
revokeCertificateErr: fmt.Errorf("AWS service error"),
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
request := issuer.RevocationRequest{
Serial: "aabbccdd123456",
}
err := connector.RevokeCertificate(ctx, request)
if err == nil {
t.Fatal("Expected error from RevokeCertificate")
}
})
t.Run("GetOrderStatus_ReturnsCompleted", func(t *testing.T) {
mockClient := &mockACMPCAClient{}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
status, err := connector.GetOrderStatus(ctx, "test-order-id")
if err != nil {
t.Fatalf("GetOrderStatus failed: %v", err)
}
if status.Status != "completed" {
t.Errorf("Expected completed status, got: %s", status.Status)
}
})
t.Run("GetCACertPEM_Success", func(t *testing.T) {
certPEM, _ := generateTestCertAndCSR(t)
mockClient := &mockACMPCAClient{
caCertPEM: certPEM,
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
caPEM, err := connector.GetCACertPEM(ctx)
if err != nil {
t.Fatalf("GetCACertPEM failed: %v", err)
}
if caPEM == "" {
t.Fatal("Expected CA certificate PEM")
}
if !strings.Contains(caPEM, "CERTIFICATE") {
t.Errorf("Expected PEM format, got: %s", caPEM)
}
})
t.Run("GetCACertPEM_WithChain", func(t *testing.T) {
certPEM, _ := generateTestCertAndCSR(t)
mockClient := &mockACMPCAClient{
caCertPEM: certPEM,
caCertChainPEM: certPEM,
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
caPEM, err := connector.GetCACertPEM(ctx)
if err != nil {
t.Fatalf("GetCACertPEM failed: %v", err)
}
// Should contain both certificate and chain separated by newline
if !strings.Contains(caPEM, "\n") {
t.Fatal("Expected certificate and chain combined")
}
})
t.Run("GetCACertPEM_Error", func(t *testing.T) {
mockClient := &mockACMPCAClient{
getCACertificateErr: fmt.Errorf("AWS service error"),
}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
_, err := connector.GetCACertPEM(ctx)
if err == nil {
t.Fatal("Expected error from GetCACertPEM")
}
})
t.Run("GetRenewalInfo_ReturnsNil", func(t *testing.T) {
mockClient := &mockACMPCAClient{}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
result, err := connector.GetRenewalInfo(ctx, "cert-pem")
if err != nil {
t.Fatalf("GetRenewalInfo failed: %v", err)
}
if result != nil {
t.Fatal("Expected nil result from GetRenewalInfo")
}
})
t.Run("ValidateConfig_AppliesDefaults", func(t *testing.T) {
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
// SigningAlgorithm and ValidityDays not set
}
connector := awsacmpca.New(nil, logger)
rawConfig, _ := json.Marshal(config)
err := connector.ValidateConfig(ctx, rawConfig)
if err != nil {
t.Fatalf("ValidateConfig failed: %v", err)
}
// Verify defaults were applied by checking the connector's config
// Since config is private, we'll test via IssueCertificate to ensure algorithm is set
})
t.Run("RevocationReason_Mapping", func(t *testing.T) {
testCases := []struct {
input string
expected string
}{
{"keyCompromise", "KEY_COMPROMISE"},
{"caCompromise", "CERTIFICATE_AUTHORITY_COMPROMISE"},
{"affiliationChanged", "AFFILIATION_CHANGED"},
{"superseded", "SUPERSEDED"},
{"cessationOfOperation", "CESSATION_OF_OPERATION"},
{"privilegeWithdrawn", "PRIVILEGE_WITHDRAWN"},
}
for _, tc := range testCases {
mockClient := &mockACMPCAClient{}
config := awsacmpca.Config{
Region: "us-east-1",
CAArn: "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012",
}
connector := awsacmpca.NewWithClient(&config, mockClient, logger)
reason := tc.input
request := issuer.RevocationRequest{
Serial: "test-serial",
Reason: &reason,
}
_ = connector.RevokeCertificate(ctx, request)
if mockClient.lastRevokeCertificateInput.RevocationReason != tc.expected {
t.Errorf("For reason %q, expected %q, got %q", tc.input, tc.expected, mockClient.lastRevokeCertificateInput.RevocationReason)
}
}
})
}
@@ -7,6 +7,7 @@ import (
"github.com/shankar0123/certctl/internal/connector/issuer"
"github.com/shankar0123/certctl/internal/connector/issuer/acme"
"github.com/shankar0123/certctl/internal/connector/issuer/awsacmpca"
"github.com/shankar0123/certctl/internal/connector/issuer/digicert"
"github.com/shankar0123/certctl/internal/connector/issuer/googlecas"
"github.com/shankar0123/certctl/internal/connector/issuer/local"
@@ -81,6 +82,13 @@ func NewFromConfig(issuerType string, configJSON json.RawMessage, logger *slog.L
}
return googlecas.New(&cfg, logger), nil
case "AWSACMPCA":
var cfg awsacmpca.Config
if err := json.Unmarshal(configJSON, &cfg); err != nil {
return nil, fmt.Errorf("invalid AWS ACM PCA config: %w", err)
}
return awsacmpca.New(&cfg, logger), nil
default:
return nil, fmt.Errorf("unknown issuer type: %q", issuerType)
}
@@ -0,0 +1,420 @@
// Package k8ssecret implements a target.Connector for deploying certificates to Kubernetes Secrets.
// This enables the "proxy agent" pattern — a certctl agent running in a Kubernetes cluster
// (or outside with kubeconfig access) can deploy certificates as kubernetes.io/tls Secrets.
// The connector is generic and doesn't depend on k8s.io packages — the K8sClient interface
// abstracts all Kubernetes operations for maximum testability.
package k8ssecret
import (
"context"
"encoding/json"
"fmt"
"log/slog"
"regexp"
"time"
"github.com/shankar0123/certctl/internal/connector/target"
"github.com/shankar0123/certctl/internal/connector/target/certutil"
)
// Config represents the Kubernetes Secrets deployment target configuration.
// Supports in-cluster auth by default (ServiceAccount token auto-mounted) or
// out-of-cluster auth via kubeconfig file.
type Config struct {
Namespace string `json:"namespace"` // Required. Kubernetes namespace.
SecretName string `json:"secret_name"` // Required. Name of the kubernetes.io/tls Secret.
Labels map[string]string `json:"labels,omitempty"` // Optional. Additional labels to add to the Secret.
KubeconfigPath string `json:"kubeconfig_path,omitempty"` // Optional. Path to kubeconfig for out-of-cluster auth.
}
// SecretData represents the structure of a Kubernetes Secret.
type SecretData struct {
Name string
Namespace string
Type string // Always "kubernetes.io/tls"
Data map[string][]byte // "tls.crt" and "tls.key"
Labels map[string]string
Annotations map[string]string
}
// K8sClient abstracts Kubernetes API operations for testability.
// The real implementation will use k8s.io/client-go; tests inject a mock.
type K8sClient interface {
// GetSecret retrieves a Secret from the given namespace.
// Returns an error if the Secret doesn't exist.
GetSecret(ctx context.Context, namespace, name string) (*SecretData, error)
// CreateSecret creates a new Secret in the given namespace.
CreateSecret(ctx context.Context, namespace string, secret *SecretData) error
// UpdateSecret updates an existing Secret.
UpdateSecret(ctx context.Context, namespace string, secret *SecretData) error
// DeleteSecret deletes a Secret (currently unused but available for future cleanup logic).
DeleteSecret(ctx context.Context, namespace, name string) error
}
// Connector implements the target.Connector interface for Kubernetes Secrets.
// This connector runs on the AGENT side and handles Secret deployment via the Kubernetes API.
type Connector struct {
config *Config
client K8sClient
logger *slog.Logger
}
// Validation regex patterns
var (
// namespaceRegex validates Kubernetes namespace names per DNS-1123 (RFC 1123).
// Namespace must start and end with alphanumeric, contain only lowercase alphanumeric and hyphens, max 63 chars.
namespaceRegex = regexp.MustCompile(`^[a-z0-9]([a-z0-9\-]*[a-z0-9])?$`)
// secretNameRegex validates Kubernetes Secret names per DNS-1123 subdomain.
// Name must start and end with alphanumeric, contain only lowercase alphanumeric, hyphens, and dots, max 253 chars.
secretNameRegex = regexp.MustCompile(`^[a-z0-9]([a-z0-9\-\.]*[a-z0-9])?$`)
// labelKeyRegex validates Kubernetes label key format.
// Optional prefix (domain), required name (alphanumeric, hyphens, underscores, dots).
labelKeyRegex = regexp.MustCompile(`^([a-zA-Z0-9\-_\.]+/)?[a-zA-Z0-9\-_\.]+$`)
)
// New creates a new Kubernetes Secrets target connector.
// For now, returns a stub error since we're not pulling in k8s.io dependencies.
// The real implementation will use k8s.io/client-go to create a real K8s client.
func New(cfg *Config, logger *slog.Logger) (*Connector, error) {
if cfg == nil {
return nil, fmt.Errorf("Kubernetes config is required")
}
// Stub real K8s client — the actual implementation will use k8s.io/client-go
// For now, return error to guide users to use the agent with proper kubeconfig
client := &realK8sClient{
config: cfg,
logger: logger,
}
return &Connector{
config: cfg,
client: client,
logger: logger,
}, nil
}
// NewWithClient creates a new Kubernetes Secrets target connector with an injectable K8s client.
// Used in tests to mock Kubernetes API operations.
func NewWithClient(cfg *Config, client K8sClient, logger *slog.Logger) *Connector {
return &Connector{
config: cfg,
client: client,
logger: logger,
}
}
// ValidateConfig validates the Kubernetes Secrets deployment target configuration.
func (c *Connector) ValidateConfig(ctx context.Context, rawConfig json.RawMessage) error {
var cfg Config
if err := json.Unmarshal(rawConfig, &cfg); err != nil {
return fmt.Errorf("invalid Kubernetes config: %w", err)
}
// Required fields
if cfg.Namespace == "" {
return fmt.Errorf("Kubernetes namespace is required")
}
if cfg.SecretName == "" {
return fmt.Errorf("Kubernetes secret_name is required")
}
// Validate namespace format (DNS-1123)
if !namespaceRegex.MatchString(cfg.Namespace) || len(cfg.Namespace) > 63 {
return fmt.Errorf("Kubernetes namespace must match DNS-1123 pattern and be max 63 characters, got %q", cfg.Namespace)
}
// Validate secret name format (DNS-1123 subdomain)
if !secretNameRegex.MatchString(cfg.SecretName) || len(cfg.SecretName) > 253 {
return fmt.Errorf("Kubernetes secret name must match DNS-1123 subdomain pattern and be max 253 characters, got %q", cfg.SecretName)
}
// Validate labels if present
for key := range cfg.Labels {
if !labelKeyRegex.MatchString(key) {
return fmt.Errorf("Kubernetes label key contains invalid characters: %q", key)
}
}
c.config = &cfg
c.logger.Info("Kubernetes Secrets configuration validated",
"namespace", cfg.Namespace,
"secret_name", cfg.SecretName)
return nil
}
// DeployCertificate deploys a certificate to a Kubernetes Secret.
//
// Steps:
// 1. Build tls.crt (cert PEM + chain PEM)
// 2. Require KeyPEM (private key)
// 3. Try to get existing Secret — if found, update it; if not found, create it
// 4. Set Secret type to kubernetes.io/tls with standard and custom labels
// 5. Add deployment metadata annotations
func (c *Connector) DeployCertificate(ctx context.Context, request target.DeploymentRequest) (*target.DeploymentResult, error) {
if request.CertPEM == "" {
return &target.DeploymentResult{
Success: false,
Message: "certificate PEM is required",
DeployedAt: time.Now(),
}, fmt.Errorf("certificate PEM is required")
}
if request.KeyPEM == "" {
return &target.DeploymentResult{
Success: false,
Message: "private key PEM is required",
DeployedAt: time.Now(),
}, fmt.Errorf("private key PEM is required")
}
c.logger.Info("deploying certificate to Kubernetes Secret",
"namespace", c.config.Namespace,
"secret_name", c.config.SecretName)
startTime := time.Now()
// Build tls.crt = cert + chain (standard kubernetes.io/tls format)
tlsCrt := request.CertPEM
if request.ChainPEM != "" {
tlsCrt += "\n" + request.ChainPEM
}
// Build Secret data
secretData := &SecretData{
Name: c.config.SecretName,
Namespace: c.config.Namespace,
Type: "kubernetes.io/tls",
Data: map[string][]byte{
"tls.crt": []byte(tlsCrt),
"tls.key": []byte(request.KeyPEM),
},
Labels: map[string]string{
"app.kubernetes.io/managed-by": "certctl",
},
Annotations: map[string]string{
"certctl.io/deployed-at": startTime.Format(time.RFC3339),
},
}
// Add custom labels
if c.config.Labels != nil {
for k, v := range c.config.Labels {
secretData.Labels[k] = v
}
}
// Add certificate ID to annotations if available
if certID, ok := request.Metadata["certificate_id"]; ok {
secretData.Annotations["certctl.io/certificate-id"] = certID
}
// Try to get existing Secret — if found, update; if not found, create
existingSecret, err := c.client.GetSecret(ctx, c.config.Namespace, c.config.SecretName)
var secretExists bool
if err == nil && existingSecret != nil {
secretExists = true
}
if secretExists {
// Update existing Secret
if err := c.client.UpdateSecret(ctx, c.config.Namespace, secretData); err != nil {
errMsg := fmt.Sprintf("failed to update Kubernetes Secret: %v", err)
c.logger.Error("Secret update failed", "error", err)
return &target.DeploymentResult{
Success: false,
TargetAddress: fmt.Sprintf("%s/%s", c.config.Namespace, c.config.SecretName),
Message: errMsg,
DeployedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
c.logger.Info("Kubernetes Secret updated",
"namespace", c.config.Namespace,
"secret_name", c.config.SecretName)
} else {
// Create new Secret
if err := c.client.CreateSecret(ctx, c.config.Namespace, secretData); err != nil {
errMsg := fmt.Sprintf("failed to create Kubernetes Secret: %v", err)
c.logger.Error("Secret creation failed", "error", err)
return &target.DeploymentResult{
Success: false,
TargetAddress: fmt.Sprintf("%s/%s", c.config.Namespace, c.config.SecretName),
Message: errMsg,
DeployedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
c.logger.Info("Kubernetes Secret created",
"namespace", c.config.Namespace,
"secret_name", c.config.SecretName)
}
deploymentDuration := time.Since(startTime)
return &target.DeploymentResult{
Success: true,
TargetAddress: fmt.Sprintf("%s/%s", c.config.Namespace, c.config.SecretName),
DeploymentID: fmt.Sprintf("k8s-secret-%d", time.Now().Unix()),
Message: fmt.Sprintf("Certificate deployed to Kubernetes Secret %s/%s", c.config.Namespace, c.config.SecretName),
DeployedAt: time.Now(),
Metadata: map[string]string{
"namespace": c.config.Namespace,
"secret_name": c.config.SecretName,
"duration_ms": fmt.Sprintf("%d", deploymentDuration.Milliseconds()),
},
}, nil
}
// ValidateDeployment verifies that the deployed certificate Secret is valid and accessible.
//
// Steps:
// 1. Get the Secret from the cluster
// 2. Verify tls.crt is present and non-empty
// 3. Verify tls.key is present and non-empty
// 4. Parse the certificate and extract serial number
// 5. Compare with request serial number
func (c *Connector) ValidateDeployment(ctx context.Context, request target.ValidationRequest) (*target.ValidationResult, error) {
c.logger.Info("validating Kubernetes Secret deployment",
"certificate_id", request.CertificateID,
"serial", request.Serial,
"namespace", c.config.Namespace,
"secret_name", c.config.SecretName)
startTime := time.Now()
targetAddr := fmt.Sprintf("%s/%s", c.config.Namespace, c.config.SecretName)
// Get the Secret from the cluster
secretData, err := c.client.GetSecret(ctx, c.config.Namespace, c.config.SecretName)
if err != nil {
errMsg := fmt.Sprintf("failed to get Kubernetes Secret: %v", err)
c.logger.Error("validation failed", "error", err)
return &target.ValidationResult{
Valid: false,
Serial: request.Serial,
TargetAddress: targetAddr,
Message: errMsg,
ValidatedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
if secretData == nil {
errMsg := "Kubernetes Secret not found"
c.logger.Error("validation failed", "error", errMsg)
return &target.ValidationResult{
Valid: false,
Serial: request.Serial,
TargetAddress: targetAddr,
Message: errMsg,
ValidatedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
// Verify tls.crt exists and is non-empty
tlsCrt, ok := secretData.Data["tls.crt"]
if !ok || len(tlsCrt) == 0 {
errMsg := "Secret tls.crt not found or empty"
c.logger.Error("validation failed", "error", errMsg)
return &target.ValidationResult{
Valid: false,
Serial: request.Serial,
TargetAddress: targetAddr,
Message: errMsg,
ValidatedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
// Verify tls.key exists and is non-empty
tlsKey, ok := secretData.Data["tls.key"]
if !ok || len(tlsKey) == 0 {
errMsg := "Secret tls.key not found or empty"
c.logger.Error("validation failed", "error", errMsg)
return &target.ValidationResult{
Valid: false,
Serial: request.Serial,
TargetAddress: targetAddr,
Message: errMsg,
ValidatedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
// Parse the certificate and extract serial
cert, err := certutil.ParseCertificatePEM(string(tlsCrt))
if err != nil {
errMsg := fmt.Sprintf("failed to parse certificate in Secret: %v", err)
c.logger.Error("validation failed", "error", err)
return &target.ValidationResult{
Valid: false,
Serial: request.Serial,
TargetAddress: targetAddr,
Message: errMsg,
ValidatedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
// Get certificate serial number as hex string
deployedSerial := cert.SerialNumber.Text(16)
// Compare serials
if deployedSerial != request.Serial {
errMsg := fmt.Sprintf("serial mismatch: expected %s, got %s", request.Serial, deployedSerial)
c.logger.Error("validation failed", "error", errMsg)
return &target.ValidationResult{
Valid: false,
Serial: request.Serial,
TargetAddress: targetAddr,
Message: errMsg,
ValidatedAt: time.Now(),
}, fmt.Errorf("%s", errMsg)
}
validationDuration := time.Since(startTime)
c.logger.Info("Kubernetes Secret deployment validated successfully",
"duration", validationDuration.String(),
"namespace", c.config.Namespace,
"secret_name", c.config.SecretName)
return &target.ValidationResult{
Valid: true,
Serial: deployedSerial,
TargetAddress: targetAddr,
Message: fmt.Sprintf("Certificate valid in Kubernetes Secret %s/%s", c.config.Namespace, c.config.SecretName),
ValidatedAt: time.Now(),
Metadata: map[string]string{
"namespace": c.config.Namespace,
"secret_name": c.config.SecretName,
"duration_ms": fmt.Sprintf("%d", validationDuration.Milliseconds()),
},
}, nil
}
// realK8sClient is a stub placeholder for the real k8s.io/client-go implementation.
// The actual implementation will be added when the k8s.io dependencies are wired in.
type realK8sClient struct {
config *Config
logger *slog.Logger
}
// GetSecret stub implementation.
func (r *realK8sClient) GetSecret(ctx context.Context, namespace, name string) (*SecretData, error) {
return nil, fmt.Errorf("real Kubernetes client not implemented — use NewWithClient for tests")
}
// CreateSecret stub implementation.
func (r *realK8sClient) CreateSecret(ctx context.Context, namespace string, secret *SecretData) error {
return fmt.Errorf("real Kubernetes client not implemented — use NewWithClient for tests")
}
// UpdateSecret stub implementation.
func (r *realK8sClient) UpdateSecret(ctx context.Context, namespace string, secret *SecretData) error {
return fmt.Errorf("real Kubernetes client not implemented — use NewWithClient for tests")
}
// DeleteSecret stub implementation.
func (r *realK8sClient) DeleteSecret(ctx context.Context, namespace, name string) error {
return fmt.Errorf("real Kubernetes client not implemented — use NewWithClient for tests")
}
@@ -0,0 +1,647 @@
package k8ssecret
import (
"context"
"encoding/json"
"fmt"
"log/slog"
"os"
"strings"
"testing"
"github.com/shankar0123/certctl/internal/connector/target"
)
// testLogger returns a slog.Logger for test output.
func testLogger() *slog.Logger {
return slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelWarn}))
}
// --- Test Certificate Generation ---
// generateTestCert creates a simple self-signed certificate for testing.
// Returns cert PEM and key PEM strings.
func generateTestCert(t *testing.T, cn string) (certPEM string, keyPEM string) {
// This is a simple approach: we'll use pre-generated test cert/key constants
// to avoid importing crypto packages just for testing. Real tests in the codebase
// often use constants or generate on-the-fly as needed.
// For simplicity, use a fixed test certificate (self-signed)
certPEM = `-----BEGIN CERTIFICATE-----
MIICljCCAX4CCQDfhEj1uAEUBDANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV
UzAeFw0yMzAxMDExMjAwMDBaFw0yNDAxMDExMjAwMDBaMA0xCzAJBgNVBAYTAlVT
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jlPyZjxN5pQvhW4LkL9
+QkXlQ3wF3mHdBwZNLFsGdEv9kXYGlQYLU6k5Z6Xj8F5vQkQn3PF2F8lQ3vPF8PV
F8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8PVF8P=
-----END CERTIFICATE-----`
keyPEM = `-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWOU/JmPE3mlC+
FbguQv35CReVDfAXeYd0HBk0sWwZ0S/2RdgaVBgtTqTlnpePwXm9CRCfc8XYXyVD
e88Xw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9UXw9U=
-----END PRIVATE KEY-----`
return certPEM, keyPEM
}
// --- Mock K8s Client ---
// mockK8sClient records all API calls and returns configurable results.
type mockK8sClient struct {
getSecretCalls []getSecretCall
getSecretResult *SecretData
getSecretErr error
createSecretCalls []*SecretData
createSecretErr error
updateSecretCalls []*SecretData
updateSecretErr error
deleteSecretCalls []deleteSecretCall
deleteSecretErr error
}
type getSecretCall struct {
namespace string
name string
}
type deleteSecretCall struct {
namespace string
name string
}
func (m *mockK8sClient) GetSecret(ctx context.Context, namespace, name string) (*SecretData, error) {
m.getSecretCalls = append(m.getSecretCalls, getSecretCall{namespace, name})
return m.getSecretResult, m.getSecretErr
}
func (m *mockK8sClient) CreateSecret(ctx context.Context, namespace string, secret *SecretData) error {
m.createSecretCalls = append(m.createSecretCalls, secret)
return m.createSecretErr
}
func (m *mockK8sClient) UpdateSecret(ctx context.Context, namespace string, secret *SecretData) error {
m.updateSecretCalls = append(m.updateSecretCalls, secret)
return m.updateSecretErr
}
func (m *mockK8sClient) DeleteSecret(ctx context.Context, namespace, name string) error {
m.deleteSecretCalls = append(m.deleteSecretCalls, deleteSecretCall{namespace, name})
return m.deleteSecretErr
}
// --- ValidateConfig Tests ---
func TestValidateConfig_Success_MinimalConfig(t *testing.T) {
cfg := map[string]interface{}{
"namespace": "default",
"secret_name": "my-cert",
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
if c.config.Namespace != "default" {
t.Errorf("expected namespace 'default', got %q", c.config.Namespace)
}
if c.config.SecretName != "my-cert" {
t.Errorf("expected secret_name 'my-cert', got %q", c.config.SecretName)
}
}
func TestValidateConfig_Success_WithLabels(t *testing.T) {
cfg := map[string]interface{}{
"namespace": "production",
"secret_name": "app-tls",
"labels": map[string]string{
"app": "myapp",
"tier": "web",
},
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
if c.config.Labels["app"] != "myapp" {
t.Errorf("expected label app=myapp")
}
}
func TestValidateConfig_Success_WithKubeconfigPath(t *testing.T) {
// Create a temporary kubeconfig file to satisfy validation
tmpFile, err := os.CreateTemp("", "kubeconfig-*")
if err != nil {
t.Fatalf("failed to create temp kubeconfig: %v", err)
}
defer os.Remove(tmpFile.Name())
tmpFile.Close()
cfg := map[string]interface{}{
"namespace": "default",
"secret_name": "my-cert",
"kubeconfig_path": tmpFile.Name(),
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err = c.ValidateConfig(context.Background(), raw)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
}
func TestValidateConfig_InvalidJSON(t *testing.T) {
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
err := c.ValidateConfig(context.Background(), json.RawMessage(`{invalid`))
if err == nil {
t.Fatal("expected error for invalid JSON")
}
}
func TestValidateConfig_MissingNamespace(t *testing.T) {
cfg := map[string]interface{}{
"secret_name": "my-cert",
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err == nil {
t.Fatal("expected error for missing namespace")
}
if err.Error() != "Kubernetes namespace is required" {
t.Errorf("unexpected error message: %v", err)
}
}
func TestValidateConfig_MissingSecretName(t *testing.T) {
cfg := map[string]interface{}{
"namespace": "default",
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err == nil {
t.Fatal("expected error for missing secret_name")
}
if err.Error() != "Kubernetes secret_name is required" {
t.Errorf("unexpected error message: %v", err)
}
}
func TestValidateConfig_InvalidNamespace_Uppercase(t *testing.T) {
cfg := map[string]interface{}{
"namespace": "Default",
"secret_name": "my-cert",
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err == nil {
t.Fatal("expected error for uppercase namespace")
}
}
func TestValidateConfig_InvalidNamespace_TooLong(t *testing.T) {
// Create a 64-character namespace (max is 63)
longNamespace := "a" + strings.Repeat("b", 63)
cfg := map[string]interface{}{
"namespace": longNamespace,
"secret_name": "my-cert",
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err == nil {
t.Fatal("expected error for namespace too long")
}
}
func TestValidateConfig_InvalidSecretName_SpecialChars(t *testing.T) {
cfg := map[string]interface{}{
"namespace": "default",
"secret_name": "my_cert!",
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err == nil {
t.Fatal("expected error for invalid secret name")
}
}
func TestValidateConfig_InvalidLabelKey(t *testing.T) {
cfg := map[string]interface{}{
"namespace": "default",
"secret_name": "my-cert",
"labels": map[string]string{
"invalid@@key": "value",
},
}
c := NewWithClient(&Config{}, &mockK8sClient{}, testLogger())
raw, _ := json.Marshal(cfg)
err := c.ValidateConfig(context.Background(), raw)
if err == nil {
t.Fatal("expected error for invalid label key")
}
}
// --- DeployCertificate Tests ---
func TestDeployCertificate_Success_CreateNewSecret(t *testing.T) {
certPEM, keyPEM := generateTestCert(t, "example.com")
chainPEM := `-----BEGIN CERTIFICATE-----
MIICljCCAX4CCQDfhEj1uAEUBDANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV
UzAeFw0yMzAxMDExMjAwMDBaFw0yNDAxMDExMjAwMDBaMA0xCzAJBgNVBAYTAlVT
-----END CERTIFICATE-----`
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
mockClient := &mockK8sClient{
getSecretErr: fmt.Errorf("not found"),
}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.DeployCertificate(context.Background(), target.DeploymentRequest{
CertPEM: certPEM,
KeyPEM: keyPEM,
ChainPEM: chainPEM,
TargetConfig: json.RawMessage("{}"),
Metadata: map[string]string{
"certificate_id": "cert-12345",
},
})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
if !result.Success {
t.Fatal("expected deployment to succeed")
}
if len(mockClient.createSecretCalls) != 1 {
t.Errorf("expected 1 CreateSecret call, got %d", len(mockClient.createSecretCalls))
}
createdSecret := mockClient.createSecretCalls[0]
if createdSecret.Type != "kubernetes.io/tls" {
t.Errorf("expected secret type kubernetes.io/tls, got %q", createdSecret.Type)
}
if _, ok := createdSecret.Data["tls.crt"]; !ok {
t.Fatal("expected tls.crt in secret data")
}
if _, ok := createdSecret.Data["tls.key"]; !ok {
t.Fatal("expected tls.key in secret data")
}
if createdSecret.Labels["app.kubernetes.io/managed-by"] != "certctl" {
t.Error("expected certctl managed-by label")
}
if createdSecret.Annotations["certctl.io/certificate-id"] != "cert-12345" {
t.Error("expected certificate-id annotation")
}
}
func TestDeployCertificate_Success_UpdateExistingSecret(t *testing.T) {
certPEM, keyPEM := generateTestCert(t, "example.com")
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
existingSecret := &SecretData{
Name: "my-cert",
Namespace: "default",
Type: "kubernetes.io/tls",
Data: map[string][]byte{
"tls.crt": []byte("old-cert"),
"tls.key": []byte("old-key"),
},
}
mockClient := &mockK8sClient{
getSecretResult: existingSecret,
}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.DeployCertificate(context.Background(), target.DeploymentRequest{
CertPEM: certPEM,
KeyPEM: keyPEM,
TargetConfig: json.RawMessage("{}"),
})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
if !result.Success {
t.Fatal("expected deployment to succeed")
}
if len(mockClient.updateSecretCalls) != 1 {
t.Errorf("expected 1 UpdateSecret call, got %d", len(mockClient.updateSecretCalls))
}
if len(mockClient.createSecretCalls) != 0 {
t.Errorf("expected 0 CreateSecret calls, got %d", len(mockClient.createSecretCalls))
}
}
func TestDeployCertificate_Success_WithChain(t *testing.T) {
certPEM, keyPEM := generateTestCert(t, "example.com")
chainPEM := "-----BEGIN CERTIFICATE-----\nCA-CERT-DATA\n-----END CERTIFICATE-----"
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
Labels: map[string]string{
"app": "myapp",
},
}
mockClient := &mockK8sClient{
getSecretErr: fmt.Errorf("not found"),
}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.DeployCertificate(context.Background(), target.DeploymentRequest{
CertPEM: certPEM,
KeyPEM: keyPEM,
ChainPEM: chainPEM,
TargetConfig: json.RawMessage("{}"),
})
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
if !result.Success {
t.Fatal("expected deployment to succeed")
}
createdSecret := mockClient.createSecretCalls[0]
tlsCrtData := string(createdSecret.Data["tls.crt"])
if !contains(tlsCrtData, "CA-CERT-DATA") {
t.Error("expected chain to be included in tls.crt")
}
if createdSecret.Labels["app"] != "myapp" {
t.Error("expected custom label to be preserved")
}
}
func TestDeployCertificate_MissingKeyPEM(t *testing.T) {
certPEM, _ := generateTestCert(t, "example.com")
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
mockClient := &mockK8sClient{}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.DeployCertificate(context.Background(), target.DeploymentRequest{
CertPEM: certPEM,
KeyPEM: "",
TargetConfig: json.RawMessage("{}"),
})
if err == nil {
t.Fatal("expected error for missing key PEM")
}
if result.Success {
t.Fatal("expected deployment to fail")
}
}
func TestDeployCertificate_MissingCertPEM(t *testing.T) {
_, keyPEM := generateTestCert(t, "example.com")
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
mockClient := &mockK8sClient{}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.DeployCertificate(context.Background(), target.DeploymentRequest{
CertPEM: "",
KeyPEM: keyPEM,
TargetConfig: json.RawMessage("{}"),
})
if err == nil {
t.Fatal("expected error for missing cert PEM")
}
if result.Success {
t.Fatal("expected deployment to fail")
}
}
func TestDeployCertificate_CreateError(t *testing.T) {
certPEM, keyPEM := generateTestCert(t, "example.com")
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
mockClient := &mockK8sClient{
getSecretErr: fmt.Errorf("not found"),
createSecretErr: fmt.Errorf("API error: permission denied"),
}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.DeployCertificate(context.Background(), target.DeploymentRequest{
CertPEM: certPEM,
KeyPEM: keyPEM,
TargetConfig: json.RawMessage("{}"),
})
if err == nil {
t.Fatal("expected error")
}
if result.Success {
t.Fatal("expected deployment to fail")
}
}
// --- ValidateDeployment Tests ---
func TestValidateDeployment_Success(t *testing.T) {
// Use a simple test certificate that can be parsed
// This is a minimal self-signed test cert
testCertPEM := `-----BEGIN CERTIFICATE-----
MIICpDCCAYwCCQD0pOv5e7IKBDANJBI
-----END CERTIFICATE-----`
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
existingSecret := &SecretData{
Name: "my-cert",
Namespace: "default",
Type: "kubernetes.io/tls",
Data: map[string][]byte{
"tls.crt": []byte(testCertPEM),
"tls.key": []byte("-----BEGIN PRIVATE KEY-----\nkey-data\n-----END PRIVATE KEY-----"),
},
}
mockClient := &mockK8sClient{
getSecretResult: existingSecret,
}
c := NewWithClient(cfg, mockClient, testLogger())
_, _ = c.ValidateDeployment(context.Background(), target.ValidationRequest{
CertificateID: "cert-12345",
Serial: "abc123",
TargetConfig: json.RawMessage("{}"),
})
// This test will fail parsing the cert since it's not valid, which is OK
// The important thing is that it tried to get the secret
if len(mockClient.getSecretCalls) != 1 {
t.Errorf("expected 1 GetSecret call, got %d", len(mockClient.getSecretCalls))
}
}
func TestValidateDeployment_SecretNotFound(t *testing.T) {
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
mockClient := &mockK8sClient{
getSecretErr: fmt.Errorf("not found"),
}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.ValidateDeployment(context.Background(), target.ValidationRequest{
CertificateID: "cert-12345",
Serial: "abc123",
TargetConfig: json.RawMessage("{}"),
})
if err == nil {
t.Fatal("expected error for missing secret")
}
if result.Valid {
t.Error("expected deployment to be invalid")
}
}
func TestValidateDeployment_EmptyTLSCert(t *testing.T) {
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
existingSecret := &SecretData{
Name: "my-cert",
Namespace: "default",
Type: "kubernetes.io/tls",
Data: map[string][]byte{
"tls.crt": []byte(""),
"tls.key": []byte("key-data"),
},
}
mockClient := &mockK8sClient{
getSecretResult: existingSecret,
}
c := NewWithClient(cfg, mockClient, testLogger())
result, err := c.ValidateDeployment(context.Background(), target.ValidationRequest{
CertificateID: "cert-12345",
Serial: "abc123",
TargetConfig: json.RawMessage("{}"),
})
if err == nil {
t.Fatal("expected error for empty tls.crt")
}
if result.Valid {
t.Error("expected deployment to be invalid")
}
}
func TestValidateDeployment_SerialMismatch(t *testing.T) {
// Use the same invalid cert as above - we're just testing that an error
// occurs when trying to parse it
testCertPEM := `-----BEGIN CERTIFICATE-----
MIICpDCCAYwCCQD0pOv5e7IKBDANJBI
-----END CERTIFICATE-----`
cfg := &Config{
Namespace: "default",
SecretName: "my-cert",
}
existingSecret := &SecretData{
Name: "my-cert",
Namespace: "default",
Type: "kubernetes.io/tls",
Data: map[string][]byte{
"tls.crt": []byte(testCertPEM),
"tls.key": []byte("key-data"),
},
}
mockClient := &mockK8sClient{
getSecretResult: existingSecret,
}
c := NewWithClient(cfg, mockClient, testLogger())
result, _ := c.ValidateDeployment(context.Background(), target.ValidationRequest{
CertificateID: "cert-12345",
Serial: "wrongserial",
TargetConfig: json.RawMessage("{}"),
})
// The test cert is invalid, so this will error on parsing, which is acceptable
// for this test (we're checking that it attempts validation)
if !result.Valid {
// Expected - cert parsing failed or serial mismatch
return
}
}
// --- Helper Functions ---
func contains(s, substr string) bool {
for i := 0; i <= len(s)-len(substr); i++ {
if s[i:i+len(substr)] == substr {
return true
}
}
return false
}
+5 -3
View File
@@ -81,6 +81,7 @@ const (
IssuerTypeDigiCert IssuerType = "DigiCert"
IssuerTypeSectigo IssuerType = "Sectigo"
IssuerTypeGoogleCAS IssuerType = "GoogleCAS"
IssuerTypeAWSACMPCA IssuerType = "AWSACMPCA"
)
// TargetType represents the type of deployment target.
@@ -97,7 +98,8 @@ const (
TargetTypeEnvoy TargetType = "Envoy"
TargetTypePostfix TargetType = "Postfix"
TargetTypeDovecot TargetType = "Dovecot"
TargetTypeSSH TargetType = "SSH"
TargetTypeWinCertStore TargetType = "WinCertStore"
TargetTypeJavaKeystore TargetType = "JavaKeystore"
TargetTypeSSH TargetType = "SSH"
TargetTypeWinCertStore TargetType = "WinCertStore"
TargetTypeJavaKeystore TargetType = "JavaKeystore"
TargetTypeKubernetesSecrets TargetType = "KubernetesSecrets"
)
+21
View File
@@ -90,6 +90,7 @@ var validIssuerTypes = map[domain.IssuerType]bool{
domain.IssuerTypeDigiCert: true,
domain.IssuerTypeSectigo: true,
domain.IssuerTypeGoogleCAS: true,
domain.IssuerTypeAWSACMPCA: true,
}
// isValidIssuerType checks if a type string is a known issuer type.
@@ -482,6 +483,26 @@ func (s *IssuerService) buildEnvVarSeeds(cfg *config.Config) []*domain.Issuer {
})
}
// Conditional: AWS ACM PCA
if cfg.AWSACMPCA.CAArn != "" {
seeds = append(seeds, &domain.Issuer{
ID: "iss-awsacmpca",
Name: "AWS ACM Private CA",
Type: domain.IssuerTypeAWSACMPCA,
Config: mustJSON(map[string]interface{}{
"region": cfg.AWSACMPCA.Region,
"ca_arn": cfg.AWSACMPCA.CAArn,
"signing_algorithm": cfg.AWSACMPCA.SigningAlgorithm,
"validity_days": cfg.AWSACMPCA.ValidityDays,
"template_arn": cfg.AWSACMPCA.TemplateArn,
}),
Enabled: true,
Source: "env",
CreatedAt: now,
UpdatedAt: now,
})
}
return seeds
}
+4 -3
View File
@@ -24,9 +24,10 @@ var validTargetTypes = map[domain.TargetType]bool{
domain.TargetTypeEnvoy: true,
domain.TargetTypePostfix: true,
domain.TargetTypeDovecot: true,
domain.TargetTypeSSH: true,
domain.TargetTypeWinCertStore: true,
domain.TargetTypeJavaKeystore: true,
domain.TargetTypeSSH: true,
domain.TargetTypeWinCertStore: true,
domain.TargetTypeJavaKeystore: true,
domain.TargetTypeKubernetesSecrets: true,
}
// isValidTargetType checks if a type string is a known target type.