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

Handle null reverse paths ("MAIL FROM:<>")

Browse Source 
Null reverse paths are explicitly allowed, and used when sending delivery
notifications (https://tools.ietf.org/html/rfc2821#section-4.5.5).
This commit is contained in:
Alberto Bertogli
2015-10-26 02:30:25 +00:00
parent 5978c96fd6
commit ca9c366087
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
chasquid.go
View File

@@ -263,7 +263,16 @@ func (c *Conn) MAIL(params string) (code int, msg string) {
return 500, "unknown command" return 500, "unknown command"
} }
e, err := mail.ParseAddress(sp[1]) // Special case a null reverse-path, which is explicitly allowed and used
// for notification messages.
// It should be written "<>", we check for that and remove spaces just to
// be more flexible.
e := &mail.Address{}
if strings.Replace(sp[1], " ", "", -1) == "<>" {
e.Address = "<>"
} else {
var err error
e, err = mail.ParseAddress(sp[1])
if err != nil || e.Address == "" { if err != nil || e.Address == "" {
return 501, "malformed address" return 501, "malformed address"
} }
@@ -271,6 +280,10 @@ func (c *Conn) MAIL(params string) (code int, msg string) {
if !strings.Contains(e.Address, "@") { if !strings.Contains(e.Address, "@") {
return 501, "sender address must contain a domain" return 501, "sender address must contain a domain"
} }
}
// Note some servers check (and fail) if we had a previous MAIL command,
// but that's not according to the RFC. We reset the envelope instead.
c.resetEnvelope() c.resetEnvelope()
c.mail_from = e.Address c.mail_from = e.Address