drew/smtprelay
1
0
Fork 1
mirror of https://github.com/decke/smtprelay.git synced 2025-12-25 16:52:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Bernhard Froehlich
2019-02-21 08:27:12 +00:00
parent 6270d75571
commit d11f8d81ea
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
auth.go
View File

@@ -29,7 +29,7 @@ func AuthReady() bool {
} }
func AuthFetch(username string) (string, string, error) { func AuthFetch(username string) (string, string, error) {
if ! AuthReady() { if !AuthReady() {
return "", "", errors.New("Authentication file not specified. Call LoadFile() first") return "", "", errors.New("Authentication file not specified. Call LoadFile() first")
} }
@@ -65,4 +65,3 @@ func AuthCheckPassword(username string, secret string) error {
} }
return errors.New("Password invalid") return errors.New("Password invalid")
} }

2
config.go
View File

@@ -25,7 +25,7 @@ var (
remoteHost = flag.String("remote_host", "smtp.gmail.com:587", "Outgoing SMTP server") remoteHost = flag.String("remote_host", "smtp.gmail.com:587", "Outgoing SMTP server")
remoteUser = flag.String("remote_user", "", "Username for authentication on outgoing SMTP server") remoteUser = flag.String("remote_user", "", "Username for authentication on outgoing SMTP server")
remotePass = flag.String("remote_pass", "", "Password for authentication on outgoing SMTP server") remotePass = flag.String("remote_pass", "", "Password for authentication on outgoing SMTP server")
versionInfo= flag.Bool("version", false, "Show version information") versionInfo = flag.Bool("version", false, "Show version information")
) )
func ConfigLoad() { func ConfigLoad() {

20
main.go
View File

@@ -25,7 +25,7 @@ func connectionChecker(peer smtpd.Peer) error {
nets := strings.Split(*allowedNets, " ") nets := strings.Split(*allowedNets, " ")
for i := range(nets) { for i := range nets {
_, allowedNet, _ := net.ParseCIDR(nets[i]) _, allowedNet, _ := net.ParseCIDR(nets[i])
if allowedNet.Contains(peerIP) { if allowedNet.Contains(peerIP) {
@@ -125,7 +125,7 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
env.Data, env.Data,
) )
if err != nil { if err != nil {
log.Printf("delivery failed: %v\n", err); log.Printf("delivery failed: %v\n", err)
return smtpd.Error{Code: 554, Message: "Forwarding failed"} return smtpd.Error{Code: 554, Message: "Forwarding failed"}
} }
@@ -144,7 +144,7 @@ func main() {
} }
if *logFile != "" { if *logFile != "" {
f, err := os.OpenFile(*logFile, os.O_WRONLY | os.O_CREATE | os.O_APPEND, 0600) f, err := os.OpenFile(*logFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600)
if err != nil { if err != nil {
log.Fatalf("Error opening logfile: %v", err) log.Fatalf("Error opening logfile: %v", err)
} }
@@ -155,7 +155,7 @@ func main() {
listeners := strings.Split(*listen, " ") listeners := strings.Split(*listen, " ")
for i := range(listeners) { for i := range listeners {
listener := listeners[i] listener := listeners[i]
server := &smtpd.Server{ server := &smtpd.Server{
@@ -191,13 +191,13 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
server.TLSConfig = &tls.Config { server.TLSConfig = &tls.Config{
PreferServerCipherSuites: true, PreferServerCipherSuites: true,
MinVersion: tls.VersionTLS11, MinVersion: tls.VersionTLS11,
// Ciphersuites as defined in stock Go but without 3DES // Ciphersuites as defined in stock Go but without 3DES
// https://golang.org/src/crypto/tls/cipher_suites.go // https://golang.org/src/crypto/tls/cipher_suites.go
CipherSuites: []uint16 { CipherSuites: []uint16{
tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
@@ -216,7 +216,7 @@ func main() {
tls.TLS_RSA_WITH_AES_128_CBC_SHA, tls.TLS_RSA_WITH_AES_128_CBC_SHA,
tls.TLS_RSA_WITH_AES_256_CBC_SHA, tls.TLS_RSA_WITH_AES_256_CBC_SHA,
}, },
Certificates: [] tls.Certificate{cert}, Certificates: []tls.Certificate{cert},
} }
server.ForceTLS = *localForceTLS server.ForceTLS = *localForceTLS
@@ -238,13 +238,13 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
server.TLSConfig = &tls.Config { server.TLSConfig = &tls.Config{
PreferServerCipherSuites: true, PreferServerCipherSuites: true,
MinVersion: tls.VersionTLS11, MinVersion: tls.VersionTLS11,
// Ciphersuites as defined in stock Go but without 3DES // Ciphersuites as defined in stock Go but without 3DES
// https://golang.org/src/crypto/tls/cipher_suites.go // https://golang.org/src/crypto/tls/cipher_suites.go
CipherSuites: []uint16 { CipherSuites: []uint16{
tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
@@ -263,7 +263,7 @@ func main() {
tls.TLS_RSA_WITH_AES_128_CBC_SHA, tls.TLS_RSA_WITH_AES_128_CBC_SHA,
tls.TLS_RSA_WITH_AES_256_CBC_SHA, tls.TLS_RSA_WITH_AES_256_CBC_SHA,
}, },
Certificates: [] tls.Certificate{cert}, Certificates: []tls.Certificate{cert},
} }
log.Printf("Listen on %s (TLS) ...\n", listener) log.Printf("Listen on %s (TLS) ...\n", listener)