serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-01-14 01:06:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

when rejecting a message, add field "msgfrom" to the logging line

Browse source
This commit is contained in:
Mechiel Lukkien 2023-03-09 17:21:27 +01:00
parent b0641a1901
commit eb26e9b921
No known key found for this signature in database
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
smtp/address.go
View file

@ -102,11 +102,17 @@ func (a Address) IsZero() bool {
// formatted with non-ASCII characters. If localpart has non-ASCII characters, // formatted with non-ASCII characters. If localpart has non-ASCII characters,
// they are returned regardless of smtputf8. // they are returned regardless of smtputf8.
func (a Address) Pack(smtputf8 bool) string { func (a Address) Pack(smtputf8 bool) string {
if a.IsZero() {
return ""
}
return a.Localpart.String() + "@" + a.Domain.XName(smtputf8) return a.Localpart.String() + "@" + a.Domain.XName(smtputf8)
} }
// String returns the address in string form with non-ASCII characters. // String returns the address in string form with non-ASCII characters.
func (a Address) String() string { func (a Address) String() string {
if a.IsZero() {
return ""
}
return a.Localpart.String() + "@" + a.Domain.Name() return a.Localpart.String() + "@" + a.Domain.Name()
} }

2
smtpserver/server.go
View file

@ -2193,7 +2193,7 @@ func (c *conn) deliver(ctx context.Context, recvHdrFor func(string) string, msgW
} }
} }
log.Info("incoming message rejected", mlog.Field("reason", a.reason)) log.Info("incoming message rejected", mlog.Field("reason", a.reason), mlog.Field("msgfrom", msgFrom))
metricDelivery.WithLabelValues("reject", a.reason).Inc() metricDelivery.WithLabelValues("reject", a.reason).Inc()
c.setSlow(true) c.setSlow(true)
addError(rcptAcc, a.code, a.secode, a.userError, a.errmsg) addError(rcptAcc, a.code, a.secode, a.userError, a.errmsg)