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

smtpclient: only obey SIZE= of server if it isn't 0

Browse source 
since that means there is no explicit limit.
This commit is contained in:
Mechiel Lukkien 2024-02-14 17:46:01 +01:00
parent 8046b323fb
commit 39bfa4338a
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
smtpclient/client.go
View file

@ -136,7 +136,7 @@ type Client struct {
extEcodes bool // Remote server supports sending extended error codes. extEcodes bool // Remote server supports sending extended error codes.
extStartTLS bool // Remote server supports STARTTLS. extStartTLS bool // Remote server supports STARTTLS.
ext8bitmime bool ext8bitmime bool
extSize bool // Remote server supports SIZE parameter. extSize bool // Remote server supports SIZE parameter. Must only be used if > 0.
maxSize int64 // Max size of email message. maxSize int64 // Max size of email message.
extPipelining bool // Remote server supports command pipelining. extPipelining bool // Remote server supports command pipelining.
extSMTPUTF8 bool // Remote server supports SMTPUTF8 extension. extSMTPUTF8 bool // Remote server supports SMTPUTF8 extension.
@ -724,6 +724,7 @@ func (c *Client) hello(ctx context.Context, tlsMode TLSMode, ehloHostname dns.Do
if s == "SMTPUTF8" || strings.HasPrefix(s, "SMTPUTF8 ") { if s == "SMTPUTF8" || strings.HasPrefix(s, "SMTPUTF8 ") {
c.extSMTPUTF8 = true c.extSMTPUTF8 = true
} else if strings.HasPrefix(s, "SIZE ") { } else if strings.HasPrefix(s, "SIZE ") {
// ../rfc/1870:77
c.extSize = true c.extSize = true
if v, err := strconv.ParseInt(s[len("SIZE "):], 10, 64); err == nil { if v, err := strconv.ParseInt(s[len("SIZE "):], 10, 64); err == nil {
c.maxSize = v c.maxSize = v
@ -1031,7 +1032,8 @@ func (c *Client) Deliver(ctx context.Context, mailFrom string, rcptTo string, ms
c.xerrorf(false, 0, "", "", "%w", ErrRequireTLSUnsupported) c.xerrorf(false, 0, "", "", "%w", ErrRequireTLSUnsupported)
} }
if c.extSize && msgSize > c.maxSize { // Max size enforced, only when not zero. ../rfc/1870:79
if c.extSize && c.maxSize > 0 && msgSize > c.maxSize {
c.xerrorf(true, 0, "", "", "%w: message is %d bytes, remote has a %d bytes maximum size", ErrSize, msgSize, c.maxSize) c.xerrorf(true, 0, "", "", "%w: message is %d bytes, remote has a %d bytes maximum size", ErrSize, msgSize, c.maxSize)
} }