serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-27 08:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

smtpserver: in helo/ehlo for submission don't fail on bad domain/ip address

Browse source 
for submission, we don't care about the value. users typically won't be able to
easily fix the errors (of their mail client software). so we just ignore the
domain/ip address, unless in pedantic mode.

this also parses "additional information after literal addresses" more
strictly/correctly.

for issue #55 by gimpf, thanks for the report!
This commit is contained in:
Mechiel Lukkien 2023-08-25 15:29:02 +02:00
parent f4c20673ff
commit 165639cb38
No known key found for this signature in database
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
smtpserver/server.go
View file

@ -773,15 +773,19 @@ func (c *conn) cmdEhlo(p *parser) {
// ../rfc/5321:1783 // ../rfc/5321:1783
func (c *conn) cmdHello(p *parser, ehlo bool) { func (c *conn) cmdHello(p *parser, ehlo bool) {
// ../rfc/5321:1827, though a few paragraphs earlier at ../rfc/5321:1802 is a claim
// additional data can occur.
p.xspace()
var remote dns.IPDomain var remote dns.IPDomain
if ehlo { if c.submission && !moxvar.Pedantic {
remote = p.xipdomain(true) // Mail clients regularly put bogus information in the hostname/ip. For submission,
// the value is of no use, so there is not much point in annoying the user with
// errors they cannot fix themselves. Except when in pedantic mode.
remote = dns.IPDomain{IP: c.remoteIP}
} else { } else {
remote = dns.IPDomain{Domain: p.xdomain()} p.xspace()
if !c.submission { if ehlo {
remote = p.xipdomain(true)
} else {
remote = dns.IPDomain{Domain: p.xdomain()}
// Verify a remote domain name has an A or AAAA record, CNAME not allowed. ../rfc/5321:722 // Verify a remote domain name has an A or AAAA record, CNAME not allowed. ../rfc/5321:722
cidctx := context.WithValue(mox.Context, mlog.CidKey, c.cid) cidctx := context.WithValue(mox.Context, mlog.CidKey, c.cid)
ctx, cancel := context.WithTimeout(cidctx, time.Minute) ctx, cancel := context.WithTimeout(cidctx, time.Minute)
@ -792,9 +796,15 @@ func (c *conn) cmdHello(p *parser, ehlo bool) {
} }
// For success or temporary resolve errors, we'll just continue. // For success or temporary resolve errors, we'll just continue.
} }
// ../rfc/5321:1827
// Though a few paragraphs earlier is a claim additional data can occur for address
// literals (IP addresses), although the ABNF in that document does not allow it.
// We allow additional text, but only if space-separated.
if len(remote.IP) > 0 && p.space() {
p.remainder() // ../rfc/5321:1802 ../rfc/2821:1632
}
p.xend()
} }
p.remainder() // ../rfc/5321:1802
p.xend()
// Reset state as if RSET command has been issued. ../rfc/5321:2093 ../rfc/5321:2453 // Reset state as if RSET command has been issued. ../rfc/5321:2093 ../rfc/5321:2453
c.rset() c.rset()