Move compilation of allowed_recipients to ConfigLoad()

This has several benefits:
- Configuration errors are caught at startup rather than upon a connection
- recipientChecker() has less work to do for each connection
This commit is contained in:
Jonathon Reinhart
2021-03-14 12:26:40 -04:00
parent a896ab2847
commit 7c0ba34025
2 changed files with 24 additions and 22 deletions

View File

@@ -28,7 +28,8 @@ var (
allowedNets = []*net.IPNet{}
allowedSenderStr = flag.String("allowed_sender", "", "Regular expression for valid FROM EMail addresses")
allowedSender *regexp.Regexp
allowedRecipients = flag.String("allowed_recipients", "", "Regular expression for valid TO EMail addresses")
allowedRecipStr = flag.String("allowed_recipients", "", "Regular expression for valid TO EMail addresses")
allowedRecipients *regexp.Regexp
allowedUsers = flag.String("allowed_users", "", "Path to file with valid users/passwords")
remoteHost = flag.String("remote_host", "", "Outgoing SMTP server")
remoteUser = flag.String("remote_user", "", "Username for authentication on outgoing SMTP server")
@@ -61,18 +62,26 @@ func setupAllowedNetworks() {
}
}
func setupAllowedSender() {
if (*allowedSenderStr == "") {
return
}
func setupAllowedPatterns() {
var err error
if (*allowedSenderStr != "") {
allowedSender, err = regexp.Compile(*allowedSenderStr)
if err != nil {
log.WithField("allowed_sender", *allowedSenderStr).
WithError(err).
Fatal("allowed_sender pattern invalid")
}
}
if (*allowedRecipStr != "") {
allowedRecipients, err = regexp.Compile(*allowedRecipStr)
if err != nil {
log.WithField("allowed_recipients", *allowedRecipStr).
WithError(err).
Fatal("allowed_recipients pattern invalid")
}
}
}
func ConfigLoad() {
@@ -86,5 +95,5 @@ func ConfigLoad() {
}
setupAllowedNetworks()
setupAllowedSender()
setupAllowedPatterns()
}

15
main.go
View File

@@ -7,7 +7,6 @@ import (
"net/smtp"
"net/textproto"
"os"
"regexp"
"strings"
"time"
@@ -121,19 +120,13 @@ func senderChecker(peer smtpd.Peer, addr string) error {
}
func recipientChecker(peer smtpd.Peer, addr string) error {
if *allowedRecipients == "" {
if allowedRecipients == nil {
// Any recipient is permitted
return nil
}
re, err := regexp.Compile(*allowedRecipients)
if err != nil {
log.WithFields(logrus.Fields{
"allowed_recipients": *allowedRecipients,
}).WithError(err).Warn("allowed_recipients pattern invalid")
return smtpd.Error{Code: 451, Message: "Bad recipient address"}
}
if re.MatchString(addr) {
if allowedRecipients.MatchString(addr) {
// Permitted by regex
return nil
}