2023-01-30 16:27:06 +03:00
|
|
|
package smtpserver
|
|
|
|
|
|
|
|
import (
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/mjl-/bstore"
|
|
|
|
|
|
|
|
"github.com/mjl-/mox/mlog"
|
|
|
|
"github.com/mjl-/mox/smtp"
|
|
|
|
"github.com/mjl-/mox/store"
|
|
|
|
)
|
|
|
|
|
|
|
|
type reputationMethod string
|
|
|
|
|
|
|
|
const (
|
|
|
|
methodMsgfromFull reputationMethod = "msgfromfull"
|
|
|
|
methodMsgtoFull reputationMethod = "msgtofull"
|
|
|
|
methodMsgfromDomain reputationMethod = "msgfromdomain"
|
|
|
|
methodMsgfromOrgDomain reputationMethod = "msgfromorgdomain"
|
|
|
|
methodMsgtoDomain reputationMethod = "msgtodomain"
|
|
|
|
methodMsgtoOrgDomain reputationMethod = "msgtoorgdomain"
|
|
|
|
methodDKIMSPF reputationMethod = "dkimspf"
|
|
|
|
methodIP1 reputationMethod = "ip1"
|
|
|
|
methodIP2 reputationMethod = "ip2"
|
|
|
|
methodIP3 reputationMethod = "ip3"
|
|
|
|
methodNone reputationMethod = "none"
|
|
|
|
)
|
|
|
|
|
|
|
|
// Reputation returns whether message m is likely junk.
|
|
|
|
//
|
|
|
|
// This function is called after checking for a manually configured spf mailfrom
|
|
|
|
// allow (e.g. for mailing lists), and after checking for a dmarc reject policy.
|
|
|
|
//
|
|
|
|
// The decision is made based on historic messages delivered to the same
|
|
|
|
// destination mailbox, MailboxOrigID. Because each mailbox may have a different
|
|
|
|
// accept policy, for example mailing lists with an SPF mailfrom allow. We only use
|
|
|
|
// messages that have been marked as read. We expect users to mark junk messages as
|
|
|
|
// such when they read it. And to keep it in their inbox, regular trash or archive
|
|
|
|
// if it is not.
|
|
|
|
//
|
|
|
|
// The basic idea is to keep accepting messages that were accepted in the past, and
|
|
|
|
// keep rejecting those that were rejected. This is relatively easy to check if
|
|
|
|
// mail passes SPF and/or DKIM with Message-From alignment. Regular email from
|
|
|
|
// known people will be let in. But spammers are trickier. They will use new
|
|
|
|
// (sub)domains, no or newly created SPF and/or DKIM identifiers, new localparts,
|
|
|
|
// etc. This function likely ends up returning "inconclusive" for such emails. The
|
|
|
|
// junkfilter will have to take care of a final decision.
|
|
|
|
//
|
|
|
|
// In case of doubt, it doesn't hurt much to accept another mail that a user has
|
|
|
|
// communicated successfully with in the past. If the most recent message is marked
|
|
|
|
// as junk that could have happened accidental. If another message is let in, and
|
|
|
|
// it is again junk, future messages will be rejected.
|
|
|
|
//
|
|
|
|
// Actual spammers will probably try to use identifiers, i.e. (sub)domain, dkim/spf
|
|
|
|
// identifiers and ip addresses for which we have no history. We may only have
|
|
|
|
// ip-based reputation, perhaps only an ip range, perhaps nothing.
|
|
|
|
//
|
|
|
|
// Some profiles of first-time senders:
|
|
|
|
//
|
|
|
|
// - Individuals. They can typically get past the junkfilter if needed.
|
|
|
|
// - Transaction emails. They should get past the junkfilter. If they use one of
|
|
|
|
// the larger email service providers, their reputation could help. If the
|
|
|
|
// junkfilter rejects the message, users can recover the message from the Rejects
|
|
|
|
// mailbox. The first message is typically initiated by a user, e.g. by registering.
|
|
|
|
// - Desired commercial email will have to get past the junkfilter based on its
|
|
|
|
// content. There will typically be earlier communication with the (organizational)
|
|
|
|
// domain that would let the message through.
|
|
|
|
// - Mailing list. May get past the junkfilter. If delivery is to a separate
|
|
|
|
// mailbox, the junkfilter will let it in because of little history. Long enough to
|
|
|
|
// build reputation based on DKIM/SPF signals.
|
|
|
|
//
|
|
|
|
// The decision-making process looks at historic messages. The following properties
|
|
|
|
// are checked until matching messages are found. If they are found, a decision is
|
|
|
|
// returned, which may be inconclusive. The next property on the list is only
|
|
|
|
// checked if a step did not match any messages.
|
|
|
|
//
|
|
|
|
// - Messages matching full "message from" address, either with strict/relaxed
|
|
|
|
// dkim/spf-verification, or without.
|
|
|
|
// - Messages the user sent to the "message from" address.
|
|
|
|
// - Messages matching only the domain of the "message from" address (different
|
|
|
|
// localpart), again with verification or without.
|
|
|
|
// - Messages sent to an address in the domain of the "message from" address.
|
|
|
|
// - The previous two checks again, but now checking against the organizational
|
|
|
|
// domain instead of the exact domain.
|
|
|
|
// - Matching DKIM domains and a matching SPF mailfrom, or mailfrom domain, or ehlo
|
|
|
|
// domain.
|
|
|
|
// - "Exact" IP, or nearby IPs (/24 or /48).
|
|
|
|
//
|
|
|
|
// References:
|
|
|
|
// ../rfc/5863
|
|
|
|
// ../rfc/7960
|
|
|
|
// ../rfc/6376:1915
|
|
|
|
// ../rfc/6376:3716
|
|
|
|
// ../rfc/7208:2167
|
|
|
|
func reputation(tx *bstore.Tx, log *mlog.Log, m *store.Message) (rjunk *bool, rconclusive bool, rmethod reputationMethod, rerr error) {
|
|
|
|
boolptr := func(v bool) *bool {
|
|
|
|
return &v
|
|
|
|
}
|
|
|
|
xfalse := boolptr(false)
|
|
|
|
xtrue := boolptr(true)
|
|
|
|
|
|
|
|
type queryError string
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
x := recover()
|
|
|
|
if x == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if xerr, ok := x.(queryError); ok {
|
|
|
|
rerr = errors.New(string(xerr))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
panic(x)
|
|
|
|
}()
|
|
|
|
|
|
|
|
now := time.Now()
|
|
|
|
|
|
|
|
// messageQuery returns a base query for historic seen messages to the same
|
|
|
|
// mailbox, at most maxAge old, and at most maxCount messages.
|
|
|
|
messageQuery := func(fm *store.Message, maxAge time.Duration, maxCount int) *bstore.Query[store.Message] {
|
|
|
|
q := bstore.QueryTx[store.Message](tx)
|
|
|
|
q.FilterEqual("MailboxOrigID", m.MailboxID)
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
q.FilterFn(func(m store.Message) bool {
|
|
|
|
return m.Junk || m.Notjunk
|
|
|
|
})
|
2023-01-30 16:27:06 +03:00
|
|
|
if fm != nil {
|
|
|
|
q.FilterNonzero(*fm)
|
|
|
|
}
|
|
|
|
q.FilterGreaterEqual("Received", now.Add(-maxAge))
|
|
|
|
q.Limit(maxCount)
|
|
|
|
q.SortDesc("Received")
|
|
|
|
return q
|
|
|
|
}
|
|
|
|
|
|
|
|
// Execute the query, returning messages or returning error through panic.
|
|
|
|
xmessageList := func(q *bstore.Query[store.Message], descr string) []store.Message {
|
|
|
|
t0 := time.Now()
|
|
|
|
l, err := q.List()
|
|
|
|
log.Debugx("querying messages for reputation", err, mlog.Field("msgs", len(l)), mlog.Field("descr", descr), mlog.Field("queryduration", time.Since(t0)))
|
|
|
|
if err != nil {
|
|
|
|
panic(queryError(fmt.Sprintf("listing messages: %v", err)))
|
|
|
|
}
|
|
|
|
return l
|
|
|
|
}
|
|
|
|
|
|
|
|
xrecipientExists := func(q *bstore.Query[store.Recipient]) bool {
|
|
|
|
exists, err := q.Exists()
|
|
|
|
if err != nil {
|
|
|
|
panic(queryError(fmt.Sprintf("checking for recipient: %v", err)))
|
|
|
|
}
|
|
|
|
return exists
|
|
|
|
}
|
|
|
|
|
|
|
|
const year = 365 * 24 * time.Hour
|
|
|
|
|
|
|
|
// Look for historic messages with same "message from" address. We'll
|
|
|
|
// treat any validation (strict/dmarc/relaxed) the same, but "none"
|
|
|
|
// separately.
|
|
|
|
//
|
|
|
|
// We only need 1 message, and sometimes look at a second message. If
|
|
|
|
// the last message or the message before was an accept, we accept. If
|
|
|
|
// the single last or last two were a reject, we reject.
|
|
|
|
//
|
|
|
|
// If there was no validation, any signal is inconclusive.
|
|
|
|
if m.MsgFromDomain != "" {
|
|
|
|
q := messageQuery(&store.Message{MsgFromLocalpart: m.MsgFromLocalpart, MsgFromDomain: m.MsgFromDomain}, 3*year, 2)
|
|
|
|
q.FilterEqual("MsgFromValidated", m.MsgFromValidated)
|
|
|
|
msgs := xmessageList(q, "mgsfromfull")
|
|
|
|
if len(msgs) > 0 {
|
|
|
|
// todo: we may want to look at dkim/spf in this case.
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
spam := msgs[0].Junk && (len(msgs) == 1 || msgs[1].Junk)
|
|
|
|
conclusive := m.MsgFromValidated
|
2023-01-30 16:27:06 +03:00
|
|
|
return &spam, conclusive, methodMsgfromFull, nil
|
|
|
|
}
|
|
|
|
if !m.MsgFromValidated {
|
|
|
|
// Look for historic messages that were validated. If present, this is likely spam.
|
|
|
|
// Only return as conclusively spam if history also says this From-address sent
|
|
|
|
// spam.
|
|
|
|
q := messageQuery(&store.Message{MsgFromLocalpart: m.MsgFromLocalpart, MsgFromDomain: m.MsgFromDomain, MsgFromValidated: true}, 3*year, 2)
|
|
|
|
msgs = xmessageList(q, "msgfromfull-validated")
|
|
|
|
if len(msgs) > 0 {
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
spam := msgs[0].Junk && (len(msgs) == 1 || msgs[1].Junk)
|
|
|
|
return xtrue, spam, methodMsgfromFull, nil
|
2023-01-30 16:27:06 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Look if we ever sent to this address. If so, we accept,
|
|
|
|
qr := bstore.QueryTx[store.Recipient](tx)
|
|
|
|
qr.FilterEqual("Localpart", m.MsgFromLocalpart)
|
|
|
|
qr.FilterEqual("Domain", m.MsgFromDomain)
|
|
|
|
qr.FilterGreaterEqual("Sent", now.Add(-3*year))
|
|
|
|
if xrecipientExists(qr) {
|
|
|
|
return xfalse, true, methodMsgtoFull, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Look for domain match, then for organizational domain match.
|
|
|
|
for _, orgdomain := range []bool{false, true} {
|
|
|
|
qm := store.Message{}
|
|
|
|
var method reputationMethod
|
|
|
|
var descr string
|
|
|
|
if orgdomain {
|
|
|
|
qm.MsgFromOrgDomain = m.MsgFromOrgDomain
|
|
|
|
method = methodMsgfromOrgDomain
|
|
|
|
descr = "msgfromorgdomain"
|
|
|
|
} else {
|
|
|
|
qm.MsgFromDomain = m.MsgFromDomain
|
|
|
|
method = methodMsgfromDomain
|
|
|
|
descr = "msgfromdomain"
|
|
|
|
}
|
|
|
|
|
|
|
|
q := messageQuery(&qm, 2*year, 20)
|
|
|
|
q.FilterEqual("MsgFromValidated", m.MsgFromValidated)
|
|
|
|
msgs := xmessageList(q, descr)
|
|
|
|
if len(msgs) > 0 {
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
nonjunk := 0
|
2023-01-30 16:27:06 +03:00
|
|
|
for _, m := range msgs {
|
|
|
|
if !m.Junk {
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
nonjunk++
|
2023-01-30 16:27:06 +03:00
|
|
|
}
|
|
|
|
}
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
if 100*nonjunk/len(msgs) > 80 {
|
2023-01-30 16:27:06 +03:00
|
|
|
return xfalse, true, method, nil
|
|
|
|
}
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
if nonjunk == 0 {
|
2023-01-30 16:27:06 +03:00
|
|
|
// Only conclusive with at least 3 different localparts.
|
|
|
|
localparts := map[smtp.Localpart]struct{}{}
|
|
|
|
for _, m := range msgs {
|
|
|
|
localparts[m.MsgFromLocalpart] = struct{}{}
|
|
|
|
if len(localparts) == 3 {
|
|
|
|
return xtrue, true, method, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return xtrue, false, method, nil
|
|
|
|
}
|
|
|
|
// Mixed signals from domain. We don't want to block a new sender.
|
|
|
|
return nil, false, method, nil
|
|
|
|
}
|
|
|
|
if !m.MsgFromValidated {
|
|
|
|
// Look for historic messages that were validated. If present, this is likely spam.
|
|
|
|
// Only return as conclusively spam if history also says this From-address sent
|
|
|
|
// spam.
|
|
|
|
q := messageQuery(&qm, 2*year, 2)
|
|
|
|
q.FilterEqual("MsgFromValidated", true)
|
|
|
|
msgs = xmessageList(q, descr+"-validated")
|
|
|
|
if len(msgs) > 0 {
|
improve training of junk filter
before, we used heuristics to decide when to train/untrain a message as junk or
nonjunk: the message had to be seen, be in certain mailboxes. then if a message
was marked as junk, it was junk. and otherwise it was nonjunk. this wasn't good
enough: you may want to keep some messages around as neither junk or nonjunk.
and that wasn't possible.
ideally, we would just look at the imap $Junk and $NotJunk flags. the problem
is that mail clients don't set these flags, or don't make it easy. thunderbird
can set the flags based on its own bayesian filter. it has a shortcut for
marking Junk and moving it to the junk folder (good), but the counterpart of
notjunk only marks a message as notjunk without showing in the UI that it was
marked as notjunk. there is also no "move and mark as notjunk" mechanism. e.g.
"archive" does not mark a message as notjunk. ios mail and mutt don't appear to
have any way to see or change the $Junk and $NotJunk flags.
what email clients do have is the ability to move messages to other
mailboxes/folders. so mox now has a mechanism that allows you to configure
mailboxes that automatically set $Junk or $NotJunk (or clear both) when a
message is moved/copied/delivered to that folder. e.g. a mailbox called junk or
spam or rejects marks its messags as junk. inbox, postmaster, dmarc, tlsrpt,
neutral* mark their messages as neither junk or notjunk. other folders mark
their messages as notjunk. e.g. list/*, archive. this functionality is
optional, but enabled with the quickstart and for new accounts.
also, mox now keeps track of the previous training of a message and will only
untrain/train if needed. before, there probably have been duplicate or missing
(un)trainings.
this also includes a new subcommand "retrain" to recreate the junkfilter for an
account. you should run it after updating to this version. and you should
probably also modify your account config to include the AutomaticJunkFlags.
2023-02-12 01:00:12 +03:00
|
|
|
spam := msgs[0].Junk && (len(msgs) == 1 || msgs[1].Junk)
|
|
|
|
return xtrue, spam, method, nil
|
2023-01-30 16:27:06 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Look if we ever sent to this address. If so, we accept,
|
|
|
|
qr := bstore.QueryTx[store.Recipient](tx)
|
|
|
|
if orgdomain {
|
|
|
|
qr.FilterEqual("OrgDomain", m.MsgFromOrgDomain)
|
|
|
|
method = methodMsgtoOrgDomain
|
|
|
|
} else {
|
|
|
|
qr.FilterEqual("Domain", m.MsgFromDomain)
|
|
|
|
method = methodMsgtoDomain
|
|
|
|
}
|
|
|
|
qr.FilterGreaterEqual("Sent", now.Add(-2*year))
|
|
|
|
if xrecipientExists(qr) {
|
|
|
|
return xfalse, true, method, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// DKIM and SPF.
|
|
|
|
// We only use identities that passed validation. Failed identities are ignored. ../rfc/6376:2447
|
|
|
|
// todo future: we could do something with the DKIM identity (i=) field if it is more specific than just the domain (d=).
|
|
|
|
dkimspfsignals := []float64{}
|
|
|
|
dkimspfmsgs := 0
|
|
|
|
for _, dom := range m.DKIMDomains {
|
|
|
|
// todo: should get dkimdomains in an index for faster lookup. bstore does not yet support "in" indexes.
|
|
|
|
q := messageQuery(nil, year/2, 50)
|
|
|
|
q.FilterFn(func(m store.Message) bool {
|
|
|
|
for _, d := range m.DKIMDomains {
|
|
|
|
if d == dom {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
})
|
|
|
|
msgs := xmessageList(q, "dkimdomain")
|
|
|
|
if len(msgs) > 0 {
|
|
|
|
nspam := 0
|
|
|
|
for _, m := range msgs {
|
|
|
|
if m.Junk {
|
|
|
|
nspam++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pspam := float64(nspam) / float64(len(msgs))
|
|
|
|
dkimspfsignals = append(dkimspfsignals, pspam)
|
|
|
|
dkimspfmsgs = len(msgs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if m.MailFromValidated || m.EHLOValidated {
|
|
|
|
var msgs []store.Message
|
|
|
|
if m.MailFromValidated && m.MailFromDomain != "" {
|
|
|
|
q := messageQuery(&store.Message{MailFromLocalpart: m.MailFromLocalpart, MailFromDomain: m.MailFromDomain}, year/2, 50)
|
|
|
|
msgs = xmessageList(q, "mailfrom")
|
|
|
|
if len(msgs) == 0 {
|
|
|
|
q := messageQuery(&store.Message{MailFromDomain: m.MailFromDomain}, year/2, 50)
|
|
|
|
msgs = xmessageList(q, "mailfromdomain")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(msgs) == 0 && m.EHLOValidated && m.EHLODomain != "" {
|
|
|
|
q := messageQuery(&store.Message{EHLODomain: m.EHLODomain}, year/2, 50)
|
|
|
|
msgs = xmessageList(q, "ehlodomain")
|
|
|
|
}
|
|
|
|
if len(msgs) > 0 {
|
|
|
|
nspam := 0
|
|
|
|
for _, m := range msgs {
|
|
|
|
if m.Junk {
|
|
|
|
nspam++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pspam := float64(nspam) / float64(len(msgs))
|
|
|
|
dkimspfsignals = append(dkimspfsignals, pspam)
|
|
|
|
if len(msgs) > dkimspfmsgs {
|
|
|
|
dkimspfmsgs = len(msgs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(dkimspfsignals) > 0 {
|
|
|
|
var nham, nspam int
|
|
|
|
for _, p := range dkimspfsignals {
|
|
|
|
if p < .1 {
|
|
|
|
nham++
|
|
|
|
} else if p > .9 {
|
|
|
|
nspam++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if nham > 0 && nspam == 0 {
|
|
|
|
return xfalse, true, methodDKIMSPF, nil
|
|
|
|
}
|
|
|
|
if nspam > 0 && nham == 0 {
|
|
|
|
return xtrue, dkimspfmsgs > 1, methodDKIMSPF, nil
|
|
|
|
}
|
|
|
|
return nil, false, methodDKIMSPF, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// IP-based. A wider mask needs more messages to be conclusive.
|
|
|
|
// We require the resulting signal to be strong, i.e. likely ham or likely spam.
|
|
|
|
q := messageQuery(&store.Message{RemoteIPMasked1: m.RemoteIPMasked1}, year/4, 50)
|
|
|
|
msgs := xmessageList(q, "ip1")
|
|
|
|
need := 2
|
|
|
|
method := methodIP1
|
|
|
|
if len(msgs) == 0 {
|
|
|
|
q := messageQuery(&store.Message{RemoteIPMasked2: m.RemoteIPMasked2}, year/4, 50)
|
|
|
|
msgs = xmessageList(q, "ip2")
|
|
|
|
need = 5
|
|
|
|
method = methodIP2
|
|
|
|
}
|
|
|
|
if len(msgs) == 0 {
|
|
|
|
q := messageQuery(&store.Message{RemoteIPMasked3: m.RemoteIPMasked3}, year/4, 50)
|
|
|
|
msgs = xmessageList(q, "ip3")
|
|
|
|
need = 10
|
|
|
|
method = methodIP3
|
|
|
|
}
|
|
|
|
if len(msgs) > 0 {
|
|
|
|
nspam := 0
|
|
|
|
for _, m := range msgs {
|
|
|
|
if m.Junk {
|
|
|
|
nspam++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pspam := float64(nspam) / float64(len(msgs))
|
|
|
|
var spam *bool
|
|
|
|
if pspam < .25 {
|
|
|
|
spam = xfalse
|
|
|
|
} else if pspam > .75 {
|
|
|
|
spam = xtrue
|
|
|
|
}
|
|
|
|
conclusive := len(msgs) >= need && (pspam <= 0.1 || pspam >= 0.9)
|
|
|
|
return spam, conclusive, method, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil, false, methodNone, nil
|
|
|
|
}
|