From 441a53cfd9add97862f7c5494dc6845bfd209b5b Mon Sep 17 00:00:00 2001 From: Bernhard Froehlich Date: Sat, 3 Apr 2021 19:00:38 +0000 Subject: [PATCH] Fix code formatting with gofmt -s --- config.go | 27 ++++++++++++--------------- config_test.go | 24 ++++++++++++------------ logger.go | 2 +- main.go | 20 ++++++++++---------- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/config.go b/config.go index 155069a..40bf13d 100644 --- a/config.go +++ b/config.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/vharitonsky/iniflags" "github.com/sirupsen/logrus" + "github.com/vharitonsky/iniflags" ) var ( @@ -47,7 +47,6 @@ func localAuthRequired() bool { return *allowedUsers != "" } - func setupAllowedNetworks() { for _, netstr := range splitstr(*allowedNetsStr, ' ') { baseIP, allowedNet, err := net.ParseCIDR(netstr) @@ -61,7 +60,7 @@ func setupAllowedNetworks() { // meaning the address refers to a host and not a network. if !allowedNet.IP.Equal(baseIP) { log.WithFields(logrus.Fields{ - "given_net": netstr, + "given_net": netstr, "proper_net": allowedNet, }).Fatal("Invalid network in allowed_nets (host bits set)") } @@ -73,7 +72,7 @@ func setupAllowedNetworks() { func setupAllowedPatterns() { var err error - if (*allowedSenderStr != "") { + if *allowedSenderStr != "" { allowedSender, err = regexp.Compile(*allowedSenderStr) if err != nil { log.WithField("allowed_sender", *allowedSenderStr). @@ -82,7 +81,7 @@ func setupAllowedPatterns() { } } - if (*allowedRecipStr != "") { + if *allowedRecipStr != "" { allowedRecipients, err = regexp.Compile(*allowedRecipStr) if err != nil { log.WithField("allowed_recipients", *allowedRecipStr). @@ -92,7 +91,6 @@ func setupAllowedPatterns() { } } - func setupRemoteAuth() { logger := log.WithField("remote_auth", *remoteAuthStr) @@ -123,7 +121,7 @@ func setupRemoteAuth() { host, _, err := net.SplitHostPort(*remoteHost) if err != nil { logger.WithField("remote_host", *remoteHost). - Fatal("Invalid remote_host") + Fatal("Invalid remote_host") } switch *remoteAuthStr { @@ -144,13 +142,13 @@ type protoAddr struct { func splitProto(s string) protoAddr { idx := strings.Index(s, "://") if idx == -1 { - return protoAddr { - address: s, + return protoAddr{ + address: s, } } - return protoAddr { - protocol: s[0 : idx], - address: s[idx+3 : len(s)], + return protoAddr{ + protocol: s[0:idx], + address: s[idx+3:], } } @@ -161,10 +159,9 @@ func setupListeners() { if localAuthRequired() && pa.protocol == "" { log.WithField("address", pa.address). Fatal("Local authentication (via allowed_users file) " + - "not allowed with non-TLS listener") + "not allowed with non-TLS listener") } - listenAddrs = append(listenAddrs, pa) } } @@ -175,7 +172,7 @@ func ConfigLoad() { // Set up logging as soon as possible setupLogger() - if (*remoteHost == "") { + if *remoteHost == "" { log.Warn("remote_host not set; mail will not be forwarded!") } diff --git a/config_test.go b/config_test.go index 602192b..f707219 100644 --- a/config_test.go +++ b/config_test.go @@ -6,24 +6,24 @@ import ( func TestSplitProto(t *testing.T) { var tests = []struct { - input string - proto string - addr string + input string + proto string + addr string }{ { - input: "localhost", - proto: "", - addr: "localhost", + input: "localhost", + proto: "", + addr: "localhost", }, { - input: "tls://my.local.domain", - proto: "tls", - addr: "my.local.domain", + input: "tls://my.local.domain", + proto: "tls", + addr: "my.local.domain", }, { - input: "starttls://my.local.domain", - proto: "starttls", - addr: "my.local.domain", + input: "starttls://my.local.domain", + proto: "starttls", + addr: "my.local.domain", }, } diff --git a/logger.go b/logger.go index 4fe99e8..5d47fc9 100644 --- a/logger.go +++ b/logger.go @@ -16,7 +16,7 @@ func setupLogger() { log = logrus.New() // Handle logfile - if (*logFile == "") { + if *logFile == "" { log.SetOutput(os.Stderr) } else { writer, err := os.OpenFile(*logFile, os.O_CREATE|os.O_RDWR|os.O_APPEND, 0600) diff --git a/main.go b/main.go index ba77aa5..8e239eb 100644 --- a/main.go +++ b/main.go @@ -86,7 +86,7 @@ func senderChecker(peer smtpd.Peer, addr string) error { if err != nil { // Shouldn't happen: authChecker already validated username+password log.WithFields(logrus.Fields{ - "peer": peer.Addr, + "peer": peer.Addr, "username": peer.Username, }).WithError(err).Warn("could not fetch auth user") return smtpd.Error{Code: 451, Message: "Bad sender address"} @@ -94,8 +94,8 @@ func senderChecker(peer smtpd.Peer, addr string) error { if !addrAllowed(addr, user.allowedAddresses) { log.WithFields(logrus.Fields{ - "peer": peer.Addr, - "username": peer.Username, + "peer": peer.Addr, + "username": peer.Username, "sender_address": addr, }).Warn("sender address not allowed for authenticated user") return smtpd.Error{Code: 451, Message: "Bad sender address"} @@ -114,7 +114,7 @@ func senderChecker(peer smtpd.Peer, addr string) error { log.WithFields(logrus.Fields{ "sender_address": addr, - "peer": peer.Addr, + "peer": peer.Addr, }).Warn("sender address not allowed by allowed_sender pattern") return smtpd.Error{Code: 451, Message: "Bad sender address"} } @@ -131,7 +131,7 @@ func recipientChecker(peer smtpd.Peer, addr string) error { } log.WithFields(logrus.Fields{ - "peer": peer.Addr, + "peer": peer.Addr, "recipient_address": addr, }).Warn("recipient address not allowed by allowed_recipients pattern") return smtpd.Error{Code: 451, Message: "Bad recipient address"} @@ -141,7 +141,7 @@ func authChecker(peer smtpd.Peer, username string, password string) error { err := AuthCheckPassword(username, password) if err != nil { log.WithFields(logrus.Fields{ - "peer": peer.Addr, + "peer": peer.Addr, "username": username, }).WithError(err).Warn("auth error") return smtpd.Error{Code: 535, Message: "Authentication credentials invalid"} @@ -157,13 +157,13 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error { logger := log.WithFields(logrus.Fields{ "from": env.Sender, - "to": env.Recipients, + "to": env.Recipients, "peer": peerIP, "host": *remoteHost, "uuid": generateUUID(), }) - if (*remoteHost == "") { + if *remoteHost == "" { logger.Warning("remote_host not set; discarding mail") return nil } @@ -197,7 +197,7 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error { logger.WithFields(logrus.Fields{ "err_code": err.Code, - "err_msg": err.Msg, + "err_msg": err.Msg, }).Error("delivery failed") default: smtpError = smtpd.Error{Code: 554, Message: "Forwarding failed"} @@ -246,7 +246,7 @@ func getTLSConfig() *tls.Config { if *localCert == "" || *localKey == "" { log.WithFields(logrus.Fields{ "cert_file": *localCert, - "key_file": *localKey, + "key_file": *localKey, }).Fatal("TLS certificate/key file not defined in config") }