Skip to content

armgit / posta

Public Imported from GitHub
0

Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.

feat: add Redis TLS support

Mike Kosulincc2b610ac261
diff --git a/internal/config/config.go b/internal/config/config.go
index 65eeb62..643d6b0 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -18,6 +18,7 @@
package config
import (
+ "crypto/tls"
"fmt"
"strings"
@@ -151,6 +152,8 @@ type RedisConfig struct {
DB int
// URL, when set, overrides the discrete fields above (e.g. redis://user:pass@host:6379/2).
URL string
+ // set for rediss:// URLs
+ TLSConfig *tls.Config
}
// newRedisConfig reads Redis settings from the env; POSTA_REDIS_URL, if set,
@@ -172,6 +175,7 @@ func newRedisConfig() RedisConfig {
rc.Username = opt.Username
rc.Password = opt.Password
rc.DB = opt.DB
+ rc.TLSConfig = opt.TLSConfig
}
return rc
}
@@ -179,20 +183,22 @@ func newRedisConfig() RedisConfig {
// RedisOptions returns the go-redis client options.
func (r RedisConfig) RedisOptions() *redis.Options {
return &redis.Options{
- Addr: r.Addr,
- Username: r.Username,
- Password: r.Password,
- DB: r.DB,
+ Addr: r.Addr,
+ Username: r.Username,
+ Password: r.Password,
+ DB: r.DB,
+ TLSConfig: r.TLSConfig,
}
}
// AsynqRedisOpt returns the Asynq Redis connection options.
func (r RedisConfig) AsynqRedisOpt() asynq.RedisClientOpt {
return asynq.RedisClientOpt{
- Addr: r.Addr,
- Username: r.Username,
- Password: r.Password,
- DB: r.DB,
+ Addr: r.Addr,
+ Username: r.Username,
+ Password: r.Password,
+ DB: r.DB,
+ TLSConfig: r.TLSConfig,
}
}
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 9f0965a..d531cde 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -113,4 +113,24 @@ func TestNewRedisConfigURL(t *testing.T) {
if ao.Addr != "cache.example.com:6390" || ao.Username != "alice" || ao.Password != "hunter2" || ao.DB != 5 {
t.Fatalf("AsynqRedisOpt mismatch: %+v", ao)
}
+ // Plain redis:// URL must not carry TLS.
+ if rc.TLSConfig != nil {
+ t.Fatalf("TLSConfig should be nil for redis:// URL")
+ }
+}
+
+// TestNewRedisConfigTLS: a rediss:// URL enables TLS in both option builders.
+func TestNewRedisConfigTLS(t *testing.T) {
+ clearRedisEnv(t)
+ t.Setenv("POSTA_REDIS_URL", "rediss://cache.example.com:6390/1")
+ rc := newRedisConfig()
+ if rc.TLSConfig == nil {
+ t.Fatal("TLSConfig is nil, want TLS enabled for rediss://")
+ }
+ if rc.RedisOptions().TLSConfig == nil {
+ t.Fatal("RedisOptions().TLSConfig is nil")
+ }
+ if rc.AsynqRedisOpt().TLSConfig == nil {
+ t.Fatal("AsynqRedisOpt().TLSConfig is nil")
+ }
}