Skip to content

Agent Mesh

refactor(sambox): return error from NewCertCache instead of panicking

Antonio Ojead03df282040c
diff --git a/internal/sambox/gateway.go b/internal/sambox/gateway.go
index 0a8d1199..5f62e3e0 100644
--- a/internal/sambox/gateway.go
+++ b/internal/sambox/gateway.go
@@ -112,15 +112,15 @@ type CertCache struct {
leafKey *rsa.PrivateKey
}
-func NewCertCache() *CertCache {
+func NewCertCache() (*CertCache, error) {
priv, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
- panic(fmt.Sprintf("failed to generate reusable leaf private key: %v", err))
+ return nil, fmt.Errorf("failed to generate reusable leaf private key: %w", err)
}
return &CertCache{
certs: make(map[string]*tls.Certificate),
leafKey: priv,
- }
+ }, nil
}
func (c *CertCache) GetCertificate(sni string, ca *CA) (*tls.Certificate, error) {
@@ -206,9 +206,13 @@ func NewGateway(secretStore map[string]SecretConfig, transport http.RoundTripper
if err != nil {
return nil, err
}
+ certCache, err := NewCertCache()
+ if err != nil {
+ return nil, err
+ }
return &Gateway{
CA: ca,
- CertCache: NewCertCache(),
+ CertCache: certCache,
SecretStore: secretStore,
Transport: transport,
InterceptorsDir: interceptorsDir,
diff --git a/internal/sambox/gateway_test.go b/internal/sambox/gateway_test.go
index 10210736..0dae8de0 100644
--- a/internal/sambox/gateway_test.go
+++ b/internal/sambox/gateway_test.go
@@ -59,7 +59,10 @@ func TestGenerateEphemeralCA(t *testing.T) {
func TestCertCache(t *testing.T) {
ca, _ := GenerateEphemeralCA()
- cache := NewCertCache()
+ cache, err := NewCertCache()
+ if err != nil {
+ t.Fatalf("Failed to create CertCache: %v", err)
+ }
cert1, err := cache.GetCertificate("example.com", ca)
if err != nil {