d-b.ca/smtprelay
2
0
Fork 0
forked from drew/smtprelay
Code Pull Requests Activity

Refactor out getTLSConfig()

Browse Source
This commit is contained in:
Jonathon Reinhart
2021-02-14 23:21:42 -05:00
parent 0e8986ca79
commit b202a2209e
1 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
main.go
View File

@@ -188,7 +188,7 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
return nil return nil
} }
func main() { func getTLSConfig() *tls.Config {
// Ciphersuites as defined in stock Go but without 3DES and RC4 // Ciphersuites as defined in stock Go but without 3DES and RC4
// https://golang.org/src/crypto/tls/cipher_suites.go // https://golang.org/src/crypto/tls/cipher_suites.go
var tlsCipherSuites = []uint16{ var tlsCipherSuites = []uint16{
@@ -214,6 +214,24 @@ func main() {
tls.TLS_RSA_WITH_AES_256_CBC_SHA, tls.TLS_RSA_WITH_AES_256_CBC_SHA,
} }
if *localCert == "" || *localKey == "" {
log.Fatal("TLS certificate/key not defined in config")
}
cert, err := tls.LoadX509KeyPair(*localCert, *localKey)
if err != nil {
log.Fatal(err)
}
return &tls.Config{
PreferServerCipherSuites: true,
MinVersion: tls.VersionTLS11,
CipherSuites: tlsCipherSuites,
Certificates: []tls.Certificate{cert},
}
}
func main() {
ConfigLoad() ConfigLoad()
if *versionInfo { if *versionInfo {
@@ -260,24 +278,10 @@ func main() {
} else if strings.HasPrefix(listeners[i], "starttls://") { } else if strings.HasPrefix(listeners[i], "starttls://") {
listener = strings.TrimPrefix(listener, "starttls://") listener = strings.TrimPrefix(listener, "starttls://")
if *localCert == "" || *localKey == "" { server.TLSConfig = getTLSConfig()
log.Fatal("TLS certificate/key not defined in config")
}
cert, err := tls.LoadX509KeyPair(*localCert, *localKey)
if err != nil {
log.Fatal(err)
}
server.TLSConfig = &tls.Config{
PreferServerCipherSuites: true,
MinVersion: tls.VersionTLS11,
CipherSuites: tlsCipherSuites,
Certificates: []tls.Certificate{cert},
}
server.ForceTLS = *localForceTLS server.ForceTLS = *localForceTLS
log.Printf("Listen on %s (STARTSSL) ...\n", listener) log.Printf("Listen on %s (STARTTLS) ...\n", listener)
lsnr, err := net.Listen("tcp", listener) lsnr, err := net.Listen("tcp", listener)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@@ -289,21 +293,7 @@ func main() {
listener = strings.TrimPrefix(listener, "tls://") listener = strings.TrimPrefix(listener, "tls://")
if *localCert == "" || *localKey == "" { server.TLSConfig = getTLSConfig()
log.Fatal("TLS certificate/key not defined in config")
}
cert, err := tls.LoadX509KeyPair(*localCert, *localKey)
if err != nil {
log.Fatal(err)
}
server.TLSConfig = &tls.Config{
PreferServerCipherSuites: true,
MinVersion: tls.VersionTLS11,
CipherSuites: tlsCipherSuites,
Certificates: []tls.Certificate{cert},
}
log.Printf("Listen on %s (TLS) ...\n", listener) log.Printf("Listen on %s (TLS) ...\n", listener)
lsnr, err := tls.Listen("tcp", listener, server.TLSConfig) lsnr, err := tls.Listen("tcp", listener, server.TLSConfig)