diff --git a/private/post/sender.go b/private/post/sender.go index c569b72e5..d6880f454 100644 --- a/private/post/sender.go +++ b/private/post/sender.go @@ -55,18 +55,20 @@ func (sender *SMTPSender) communicate(ctx context.Context, client *smtp.Client, // before creating SMTPSender host, _, _ := net.SplitHostPort(sender.ServerAddress) - // send smtp hello or ehlo msg and establish connection over tls - err := client.StartTLS(&tls.Config{ServerName: host}) - if err != nil { - return err + if sender.Auth != nil { + // send smtp hello or ehlo msg and establish connection over tls + err := client.StartTLS(&tls.Config{ServerName: host}) + if err != nil { + return err + } + + err = client.Auth(sender.Auth) + if err != nil { + return err + } } - err = client.Auth(sender.Auth) - if err != nil { - return err - } - - err = client.Mail(sender.From.Address) + err := client.Mail(sender.From.Address) if err != nil { return err } diff --git a/satellite/peer.go b/satellite/peer.go index d32a3bf5d..8ad063e8e 100644 --- a/satellite/peer.go +++ b/satellite/peer.go @@ -276,6 +276,11 @@ func setupMailService(log *zap.Logger, config Config) (*mailservice.Service, err }, ServerAddress: mailConfig.SMTPServerAddress, } + case "insecure": + sender = &post.SMTPSender{ + From: *from, + ServerAddress: mailConfig.SMTPServerAddress, + } case "nomail": sender = simulate.NoMail{} default: