infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-10 07:14:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

webmail: fix for ignoring error about sending to invalid address

Browse Source 
before, an error about an invalid address was not used, causing a delivery
attempt to an empty address (empty localpart/domain). delivery to that address
would fail, but we should've prevented that message from being queued at all.

additionally, an error in adding the message to the queue was ignored too.
This commit is contained in:
Mechiel Lukkien
2024-03-09 09:51:24 +01:00
parent c57aeac7f0
commit 63cef8e3a5
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webmail/api.go
View File

@ -226,7 +226,7 @@ type File struct {
func parseAddress(msghdr string) (message.NameAddress, error) {
a, err := mail.ParseAddress(msghdr)
if err != nil {
return message.NameAddress{}, nil
return message.NameAddress{}, err
}
// todo: parse more fully according to ../rfc/5322:959
@ -341,12 +341,12 @@ func (w Webmail) MessageSubmit(ctx context.Context, m SubmitMessage) {
}
if err != nil && (errors.Is(err, mox.ErrAccountNotFound) || errors.Is(err, mox.ErrDomainNotFound)) {
metricSubmission.WithLabelValues("badfrom").Inc()
xcheckuserf(ctx, errors.New("address not found"), "looking from address for account")
xcheckuserf(ctx, errors.New("address not found"), `looking up "from" address for account`)
}
xcheckf(ctx, err, "checking if from address is allowed")
if len(recipients) == 0 {
xcheckuserf(ctx, fmt.Errorf("no recipients"), "composing message")
xcheckuserf(ctx, errors.New("no recipients"), "composing message")
}
// Check outgoing message rate limit.
@ -657,7 +657,8 @@ func (w Webmail) MessageSubmit(ctx context.Context, m SubmitMessage) {
}
qml[i] = qm
}
if err := queue.Add(ctx, log, reqInfo.AccountName, dataFile, qml...); err != nil {
err = queue.Add(ctx, log, reqInfo.AccountName, dataFile, qml...)
if err != nil {
metricSubmission.WithLabelValues("queueerror").Inc()
}
xcheckf(ctx, err, "adding messages to the delivery queue")