mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 13:37:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #760 from mlipscombe/issue-688

Browse source 
fix: make `tls_client` configuration work in `target.smtp` block, fixes foxcpp/maddy#688
This commit is contained in:
Max Mazurov 2025-03-09 15:44:30 +03:00 • committed by GitHub
commit fa47d40f6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/target/smtp/smtp_downstream.go
View file

@ -57,7 +57,7 @@ type Downstream struct {
hostname string hostname string
endpoints []config.Endpoint endpoints []config.Endpoint
saslFactory saslClientFactory saslFactory saslClientFactory
tlsConfig tls.Config tlsConfig *tls.Config
connectTimeout time.Duration connectTimeout time.Duration
commandTimeout time.Duration commandTimeout time.Duration
@ -121,7 +121,7 @@ func (u *Downstream) Init(cfg *config.Map) error {
return nil, nil return nil, nil
}, saslAuthDirective, &u.saslFactory) }, saslAuthDirective, &u.saslFactory)
cfg.Custom("tls_client", true, false, func() (interface{}, error) { cfg.Custom("tls_client", true, false, func() (interface{}, error) {
return tls.Config{}, nil return &tls.Config{}, nil
}, tls2.TLSClientBlock, &u.tlsConfig) }, tls2.TLSClientBlock, &u.tlsConfig)
cfg.Duration("connect_timeout", false, false, 5*time.Minute, &u.connectTimeout) cfg.Duration("connect_timeout", false, false, 5*time.Minute, &u.connectTimeout)
cfg.Duration("command_timeout", false, false, 5*time.Minute, &u.commandTimeout) cfg.Duration("command_timeout", false, false, 5*time.Minute, &u.commandTimeout)
@ -229,9 +229,9 @@ func (d *delivery) connect(ctx context.Context) error {
for _, endp := range d.u.endpoints { for _, endp := range d.u.endpoints {
var err error var err error
if d.u.lmtp { if d.u.lmtp {
_, err = conn.ConnectLMTP(ctx, endp, d.u.starttls, &d.u.tlsConfig) _, err = conn.ConnectLMTP(ctx, endp, d.u.starttls, d.u.tlsConfig)
} else { } else {
_, err = conn.Connect(ctx, endp, d.u.starttls, &d.u.tlsConfig) _, err = conn.Connect(ctx, endp, d.u.starttls, d.u.tlsConfig)
} }
if err != nil { if err != nil {
if len(d.u.endpoints) != 1 { if len(d.u.endpoints) != 1 {

2
internal/target/smtp/smtp_downstream_test.go
View file

@ -221,7 +221,7 @@ func TestDownstreamDelivery_StartTLS(t *testing.T) {
Port: testPort, Port: testPort,
}, },
}, },
tlsConfig: *clientCfg.Clone(), tlsConfig: clientCfg.Clone(),
starttls: true, starttls: true,
log: testutils.Logger(t, "target.smtp"), log: testutils.Logger(t, "target.smtp"),
} }