mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

endpoint/smtp: Move limit enforcement before "incoming message" log record

Browse source 
Avoid the possibility of logs flooding before limits can be applied.
This commit is contained in:
fox.cpp 2020-02-15 15:51:56 +03:00
parent c3ebbb05a0
commit 4a875e69dc
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/endpoint/smtp/smtp.go
View file

@ -126,6 +126,18 @@ func (s *Session) startDelivery(ctx context.Context, from string, opts smtp.Mail
} }
msgMeta.OriginalFrom = from msgMeta.OriginalFrom = from
_, domain, err := address.Split(cleanFrom)
if err != nil {
return "", err
}
remoteIP, ok := msgMeta.Conn.RemoteAddr.(*net.TCPAddr)
if !ok {
remoteIP = &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1)}
}
if err := s.endp.limits.TakeMsg(context.Background(), remoteIP.IP, domain); err != nil {
return "", err
}
if s.connState.AuthUser != "" { if s.connState.AuthUser != "" {
s.log.Msg("incoming message", s.log.Msg("incoming message",
"src_host", msgMeta.Conn.Hostname, "src_host", msgMeta.Conn.Hostname,
@ -145,18 +157,6 @@ func (s *Session) startDelivery(ctx context.Context, from string, opts smtp.Mail
s.msgCtx, s.msgTask = trace.NewTask(ctx, "Incoming Message") s.msgCtx, s.msgTask = trace.NewTask(ctx, "Incoming Message")
_, domain, err := address.Split(cleanFrom)
if err != nil {
return "", err
}
remoteIP, ok := msgMeta.Conn.RemoteAddr.(*net.TCPAddr)
if !ok {
remoteIP = &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1)}
}
if err := s.endp.limits.TakeMsg(s.msgCtx, remoteIP.IP, domain); err != nil {
return "", err
}
mailCtx, mailTask := trace.NewTask(s.msgCtx, "MAIL FROM") mailCtx, mailTask := trace.NewTask(s.msgCtx, "MAIL FROM")
defer mailTask.End() defer mailTask.End()