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

Repair totally broken STARTTLS and TLS listeners

Browse Source
This commit is contained in:
Bernhard Froehlich
2018-12-13 13:11:55 +00:00
parent a70b148821
commit b55f5569b9
1 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main.go
View File

@@ -59,10 +59,9 @@ func main() {
}
if strings.Index(listeners[i], "://") == -1 {
;
} else if strings.HasPrefix(listeners[i], "tls://") || strings.HasPrefix(listeners[i], "starttls://") {
listener = strings.TrimPrefix(listener, "tls://")
log.Printf("Listen on %s ...\n", listener)
go server.ListenAndServe(listener)
} else if strings.HasPrefix(listeners[i], "starttls://") {
listener = strings.TrimPrefix(listener, "starttls://")
if *localCert == "" || *localKey == "" {
@@ -74,16 +73,41 @@ func main() {
log.Fatal(err)
}
server.ForceTLS = *localForceTLS
server.TLSConfig = &tls.Config {
Certificates: [] tls.Certificate{cert},
}
server.ForceTLS = *localForceTLS
log.Printf("Listen on %s (STARTSSL) ...\n", listener)
lsnr, err := net.Listen("tcp", listener)
defer lsnr.Close()
go server.Serve(lsnr)
} else if strings.HasPrefix(listeners[i], "tls://") {
listener = strings.TrimPrefix(listener, "tls://")
if *localCert == "" || *localKey == "" {
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 {
Certificates: [] tls.Certificate{cert},
}
log.Printf("Listen on %s (TLS) ...\n", listener)
lsnr, err := tls.Listen("tcp", listener, server.TLSConfig)
defer lsnr.Close()
go server.Serve(lsnr)
} else {
log.Fatal("Unknown protocol in listener ", listener)
}
log.Printf("Listen on %s ...\n", listener)
go server.ListenAndServe(listener)
}
for true {