Add support for any network + improve logs & errors #4
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,11 +16,17 @@ import ( | |
| ) | ||
|
|
||
| func connectionChecker(peer smtpd.Peer) error { | ||
| if *allowedSender == "" { | ||
| // disable network check, and allow any peer | ||
| return nil | ||
| } | ||
|
|
||
| var peerIP net.IP | ||
| if addr, ok := peer.Addr.(*net.TCPAddr); ok { | ||
| peerIP = net.ParseIP(addr.IP.String()) | ||
| } else { | ||
| log.Printf("Denied - failed to parseIP") | ||
| return smtpd.Error{Code: 421, Message: "Denied - failed to parse IP"} | ||
| } | ||
|
|
||
| nets := strings.Split(*allowedNets, " ") | ||
|
|
@@ -33,55 +39,62 @@ func connectionChecker(peer smtpd.Peer) error { | |
| } | ||
| } | ||
|
|
||
| log.Printf("IP out of allowed network range, peerIP:[%s]", peerIP) | ||
| return smtpd.Error{Code: 421, Message: "Denied - IP out of allowed network range"} | ||
| } | ||
|
|
||
| func senderChecker(peer smtpd.Peer, addr string) error { | ||
| if *allowedSender == "" { | ||
| // disable sender check, allow anyone to send mail | ||
| return nil | ||
| } | ||
|
Comment on lines
+47
to
+50
There was a problem hiding this comment. I think the motivation for this was more correctly handled in upstream decke/smtprelay#7. |
||
|
|
||
| // check sender address from auth file if user is authenticated | ||
| if *allowedUsers != "" && peer.Username != "" { | ||
| _, email, err := AuthFetch(peer.Username) | ||
| if err != nil { | ||
| log.Printf("sender address not allowed") | ||
| return smtpd.Error{Code: 451, Message: "sender address not allowed"} | ||
| } | ||
|
|
||
| if strings.ToLower(addr) != strings.ToLower(email) { | ||
| log.Printf("sender address not allowed") | ||
| return smtpd.Error{Code: 451, Message: "sender address not allowed"} | ||
| } | ||
| } | ||
|
|
||
| re, err := regexp.Compile(*allowedSender) | ||
| if err != nil { | ||
| log.Printf("allowed_sender invalid: %v\n", err) | ||
| return smtpd.Error{Code: 451, Message: "sender address not allowed"} | ||
| } | ||
|
|
||
| if re.MatchString(addr) { | ||
| return nil | ||
| } | ||
|
|
||
| log.Printf("sender address not allowed") | ||
| return smtpd.Error{Code: 451, Message: "sender address not allowed"} | ||
| } | ||
|
|
||
| func recipientChecker(peer smtpd.Peer, addr string) error { | ||
| if *allowedRecipients == "" { | ||
| // allow any recipient, disable recipient check | ||
| return nil | ||
| } | ||
|
|
||
| re, err := regexp.Compile(*allowedRecipients) | ||
| if err != nil { | ||
| log.Printf("allowed_recipients invalid: %v\n", err) | ||
| return smtpd.Error{Code: 451, Message: "Invalid recipient address"} | ||
| } | ||
|
|
||
| if re.MatchString(addr) { | ||
| return nil | ||
| } | ||
|
|
||
| log.Printf("Invalid recipient address, addr: %s", addr) | ||
| return smtpd.Error{Code: 451, Message: "Invalid recipient address"} | ||
| } | ||
|
|
||
| func authChecker(peer smtpd.Peer, username string, password string) error { | ||
|
|
@@ -105,15 +118,6 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error { | |
| var auth smtp.Auth | ||
| host, _, _ := net.SplitHostPort(*remoteHost) | ||
|
|
||
| if *remoteUser != "" && *remotePass != "" { | ||
| switch *remoteAuth { | ||
| case "plain": | ||
|
|
@@ -155,7 +159,7 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error { | |
| } | ||
|
|
||
| func main() { | ||
| // Cipher suites as defined in stock Go but without 3DES and RC4 | ||
| // https://golang.org/src/crypto/tls/cipher_suites.go | ||
| var tlsCipherSuites = []uint16{ | ||
| tls.TLS_AES_128_GCM_SHA256, | ||
|
|
@@ -187,6 +191,9 @@ func main() { | |
| os.Exit(0) | ||
| } | ||
|
|
||
| // print version on start | ||
| log.Printf("starting smtprelay, version: %s\n", VERSION) | ||
|
|
||
| if *logFile != "" { | ||
| f, err := os.OpenFile(*logFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600) | ||
| if err != nil { | ||
|
|
@@ -202,6 +209,7 @@ func main() { | |
| for i := range listeners { | ||
| listener := listeners[i] | ||
|
|
||
| // TODO: expose smtpd config options (timeouts, message size, and recipients) | ||
| server := &smtpd.Server{ | ||
| Hostname: *hostName, | ||
| WelcomeMessage: *welcomeMsg, | ||
|
|
@@ -284,6 +292,7 @@ func main() { | |
| } | ||
| } | ||
|
|
||
| // TODO: handle SIGTERM and gracefully shutdown | ||
| for true { | ||
| time.Sleep(time.Minute) | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this have been
*allowedNets?This will be fixed in upstream decke/smtprelay#18.