Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions reporter/email.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,18 @@ type emailSender struct {
conf config.SMTPConf
}

func (e *emailSender) sendMail(smtpServerAddr, message string) (err error) {
var auth sasl.Client
emailConf := e.conf
tlsConfig := &tls.Config{
func newSMTPClientTLSConfig(emailConf config.SMTPConf) *tls.Config {
return &tls.Config{
ServerName: emailConf.SMTPAddr,
MinVersion: tls.VersionTLS12,
InsecureSkipVerify: emailConf.TLSInsecureSkipVerify,
}
}

func (e *emailSender) sendMail(smtpServerAddr, message string) (err error) {
var auth sasl.Client
emailConf := e.conf
tlsConfig := newSMTPClientTLSConfig(emailConf)

var c *smtp.Client
switch emailConf.TLSMode {
Expand Down
27 changes: 27 additions & 0 deletions reporter/email_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package reporter

import (
"crypto/tls"
"testing"

"github.com/future-architect/vuls/config"
)

func TestNewSMTPClientTLSConfigUsesModernMinimumTLSVersion(t *testing.T) {
conf := config.SMTPConf{
SMTPAddr: "smtp.example.com",
TLSInsecureSkipVerify: true,
}

tlsConfig := newSMTPClientTLSConfig(conf)

if tlsConfig.ServerName != conf.SMTPAddr {
t.Fatalf("unexpected ServerName: got %q, want %q", tlsConfig.ServerName, conf.SMTPAddr)
}
if tlsConfig.MinVersion != tls.VersionTLS12 {
t.Fatalf("unexpected MinVersion: got %x, want %x", tlsConfig.MinVersion, tls.VersionTLS12)
}
if !tlsConfig.InsecureSkipVerify {
t.Fatal("expected configured TLSInsecureSkipVerify value to be preserved")
}
}