Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-18 14:47:03 +00:00
Code Releases Activity

Tidy up MAIL FROM and RCPT TO address handling

Browse Source 
This patch has small aesthetic changes to make the address handling in
MAIL FROM and RCPT TO a bit more readable.
This commit is contained in:
Alberto Bertogli
2016-10-08 18:08:13 +01:00
parent 2b46f300ca
commit 5b0501e584
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
chasquid.go
View File

@@ -621,8 +621,8 @@ func (c *Conn) MAIL(params string) (code int, msg string) {
return 500, "unknown command" return 500, "unknown command"
} }
addr := "" rawAddr := ""
_, err := fmt.Sscanf(params[5:], "%s ", &addr) _, err := fmt.Sscanf(params[5:], "%s ", &rawAddr)
if err != nil { if err != nil {
return 500, "malformed command - " + err.Error() return 500, "malformed command - " + err.Error()
} }
@@ -635,29 +635,29 @@ func (c *Conn) MAIL(params string) (code int, msg string) {
// for notification messages. // for notification messages.
// It should be written "<>", we check for that and remove spaces just to // It should be written "<>", we check for that and remove spaces just to
// be more flexible. // be more flexible.
e := &mail.Address{} addr := ""
if strings.Replace(addr, " ", "", -1) == "<>" { if strings.Replace(rawAddr, " ", "", -1) == "<>" {
e.Address = "<>" addr = "<>"
} else { } else {
var err error e, err := mail.ParseAddress(rawAddr)
e, err = mail.ParseAddress(addr)
if err != nil || e.Address == "" { if err != nil || e.Address == "" {
return 501, "malformed address" return 501, "malformed address"
} }
addr = e.Address
if !strings.Contains(e.Address, "@") { if !strings.Contains(addr, "@") {
return 501, "sender address must contain a domain" return 501, "sender address must contain a domain"
} }
// https://tools.ietf.org/html/rfc5321#section-4.5.3.1.3 // https://tools.ietf.org/html/rfc5321#section-4.5.3.1.3
if len(e.Address) > 256 { if len(addr) > 256 {
return 501, "address too long" return 501, "address too long"
} }
// SPF check - https://tools.ietf.org/html/rfc7208#section-2.4 // SPF check - https://tools.ietf.org/html/rfc7208#section-2.4
if tcp, ok := c.netconn.RemoteAddr().(*net.TCPAddr); ok { if tcp, ok := c.netconn.RemoteAddr().(*net.TCPAddr); ok {
c.spfResult, c.spfError = spf.CheckHost( c.spfResult, c.spfError = spf.CheckHost(
tcp.IP, envelope.DomainOf(e.Address)) tcp.IP, envelope.DomainOf(addr))
c.tr.Debugf("SPF %v (%v)", c.spfResult, c.spfError) c.tr.Debugf("SPF %v (%v)", c.spfResult, c.spfError)
spfResultCount.Add(string(c.spfResult), 1) spfResultCount.Add(string(c.spfResult), 1)
@@ -670,14 +670,13 @@ func (c *Conn) MAIL(params string) (code int, msg string) {
} }
} }
e.Address, err = envelope.IDNAToUnicode(e.Address) addr, err = envelope.IDNAToUnicode(addr)
if err != nil { if err != nil {
return 501, "malformed address (IDNA conversion failed)" return 501, "malformed address (IDNA conversion failed)"
} }
} }
c.mailFrom = e.Address c.mailFrom = addr
return 250, "You feel like you are being watched" return 250, "You feel like you are being watched"
} }
@@ -705,35 +704,31 @@ func (c *Conn) RCPT(params string) (code int, msg string) {
return 452, "too many recipients" return 452, "too many recipients"
} }
// TODO: Write our own parser (we have different needs, mail.ParseAddress
// is useful for other things).
// Allow utf8, but prevent "control" characters.
e, err := mail.ParseAddress(rawAddr) e, err := mail.ParseAddress(rawAddr)
if err != nil || e.Address == "" { if err != nil || e.Address == "" {
return 501, "malformed address" return 501, "malformed address"
} }
e.Address, err = envelope.IDNAToUnicode(e.Address) addr, err := envelope.IDNAToUnicode(e.Address)
if err != nil { if err != nil {
return 501, "malformed address (IDNA conversion failed)" return 501, "malformed address (IDNA conversion failed)"
} }
// https://tools.ietf.org/html/rfc5321#section-4.5.3.1.3 // https://tools.ietf.org/html/rfc5321#section-4.5.3.1.3
if len(e.Address) > 256 { if len(addr) > 256 {
return 501, "address too long" return 501, "address too long"
} }
localDst := envelope.DomainIn(e.Address, c.localDomains) localDst := envelope.DomainIn(addr, c.localDomains)
if !localDst && !c.completedAuth { if !localDst && !c.completedAuth {
return 503, "relay not allowed" return 503, "relay not allowed"
} }
if localDst && !c.userExists(e.Address) { if localDst && !c.userExists(addr) {
return 550, "recipient unknown, please check the address for typos" return 550, "recipient unknown, please check the address for typos"
} }
c.rcptTo = append(c.rcptTo, e.Address) c.rcptTo = append(c.rcptTo, addr)
return 250, "You have an eerie feeling..." return 250, "You have an eerie feeling..."
} }