2023-01-30 16:27:06 +03:00
|
|
|
package store
|
|
|
|
|
|
|
|
import (
|
|
|
|
"os"
|
|
|
|
"regexp"
|
|
|
|
"strings"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/mjl-/bstore"
|
|
|
|
"github.com/mjl-/sconf"
|
|
|
|
|
|
|
|
"github.com/mjl-/mox/config"
|
|
|
|
"github.com/mjl-/mox/message"
|
|
|
|
"github.com/mjl-/mox/mlog"
|
|
|
|
"github.com/mjl-/mox/mox-"
|
|
|
|
)
|
|
|
|
|
|
|
|
func tcheck(t *testing.T, err error, msg string) {
|
|
|
|
t.Helper()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("%s: %s", msg, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMailbox(t *testing.T) {
|
|
|
|
os.RemoveAll("../testdata/store/data")
|
|
|
|
mox.ConfigStaticPath = "../testdata/store/mox.conf"
|
2023-03-06 01:56:02 +03:00
|
|
|
mox.MustLoadConfig(false)
|
2023-01-30 16:27:06 +03:00
|
|
|
acc, err := OpenAccount("mjl")
|
|
|
|
tcheck(t, err, "open account")
|
|
|
|
defer acc.Close()
|
|
|
|
switchDone := Switchboard()
|
|
|
|
defer close(switchDone)
|
|
|
|
|
|
|
|
log := mlog.New("store")
|
|
|
|
|
|
|
|
msgFile, err := CreateMessageTemp("account-test")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("creating temp msg file: %s", err)
|
|
|
|
}
|
|
|
|
defer msgFile.Close()
|
|
|
|
msgWriter := &message.Writer{Writer: msgFile}
|
|
|
|
if _, err := msgWriter.Write([]byte(" message")); err != nil {
|
|
|
|
t.Fatalf("writing to temp message: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
msgPrefix := []byte("From: <mjl@mox.example\r\nTo: <mjl@mox.example>\r\nCc: <mjl@mox.example>Subject: test\r\nMessage-Id: <m01@mox.example>\r\n\r\n")
|
|
|
|
msgPrefixCatchall := []byte("Subject: catchall\r\n\r\n")
|
|
|
|
m := Message{
|
|
|
|
Received: time.Now(),
|
|
|
|
Size: int64(len(msgPrefix)) + msgWriter.Size,
|
|
|
|
MsgPrefix: msgPrefix,
|
|
|
|
}
|
|
|
|
msent := m
|
|
|
|
var mbsent Mailbox
|
|
|
|
mbrejects := Mailbox{Name: "Rejects", UIDValidity: 1, UIDNext: 1}
|
|
|
|
mreject := m
|
|
|
|
mconsumed := Message{
|
|
|
|
Received: m.Received,
|
|
|
|
Size: int64(len(msgPrefixCatchall)) + msgWriter.Size,
|
|
|
|
MsgPrefix: msgPrefixCatchall,
|
|
|
|
}
|
|
|
|
acc.WithWLock(func() {
|
|
|
|
conf, _ := acc.Conf()
|
|
|
|
err := acc.Deliver(xlog, conf.Destinations["mjl"], &m, msgFile, false)
|
|
|
|
tcheck(t, err, "deliver without consume")
|
|
|
|
|
|
|
|
err = acc.DB.Write(func(tx *bstore.Tx) error {
|
|
|
|
var err error
|
|
|
|
mbsent, err = bstore.QueryTx[Mailbox](tx).FilterNonzero(Mailbox{Name: "Sent"}).Get()
|
|
|
|
tcheck(t, err, "sent mailbox")
|
|
|
|
msent.MailboxID = mbsent.ID
|
|
|
|
msent.MailboxOrigID = mbsent.ID
|
2023-02-16 11:57:27 +03:00
|
|
|
acc.DeliverX(xlog, tx, &msent, msgFile, false, true, true, false)
|
2023-01-30 16:27:06 +03:00
|
|
|
|
|
|
|
err = tx.Insert(&mbrejects)
|
|
|
|
tcheck(t, err, "insert rejects mailbox")
|
|
|
|
mreject.MailboxID = mbrejects.ID
|
|
|
|
mreject.MailboxOrigID = mbrejects.ID
|
2023-02-16 11:57:27 +03:00
|
|
|
acc.DeliverX(xlog, tx, &mreject, msgFile, false, false, true, false)
|
2023-01-30 16:27:06 +03:00
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
tcheck(t, err, "deliver as sent and rejects")
|
|
|
|
|
|
|
|
err = acc.Deliver(xlog, conf.Destinations["mjl"], &mconsumed, msgFile, true)
|
|
|
|
tcheck(t, err, "deliver with consume")
|
|
|
|
|
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
|
|
|
err = acc.DB.Write(func(tx *bstore.Tx) error {
|
|
|
|
m.Junk = true
|
|
|
|
l := []Message{m}
|
|
|
|
err = acc.RetrainMessages(log, tx, l, false)
|
|
|
|
tcheck(t, err, "train as junk")
|
|
|
|
m = l[0]
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
tcheck(t, err, "train messages")
|
|
|
|
})
|
2023-01-30 16:27:06 +03:00
|
|
|
|
|
|
|
m.Junk = false
|
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
|
|
|
m.Notjunk = true
|
2023-01-30 16:27:06 +03:00
|
|
|
jf, _, err := acc.OpenJunkFilter(log)
|
|
|
|
tcheck(t, err, "open junk filter")
|
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
|
|
|
err = acc.DB.Write(func(tx *bstore.Tx) error {
|
|
|
|
return acc.RetrainMessage(log, tx, jf, &m, false)
|
|
|
|
})
|
|
|
|
tcheck(t, err, "retraining as non-junk")
|
2023-01-30 16:27:06 +03:00
|
|
|
err = jf.Close()
|
|
|
|
tcheck(t, err, "close junk filter")
|
|
|
|
|
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
|
|
|
m.Notjunk = false
|
|
|
|
err = acc.DB.Write(func(tx *bstore.Tx) error {
|
|
|
|
return acc.RetrainMessages(log, tx, []Message{m}, false)
|
|
|
|
})
|
|
|
|
tcheck(t, err, "untraining non-junk")
|
2023-01-30 16:27:06 +03:00
|
|
|
|
|
|
|
err = acc.SetPassword("testtest")
|
|
|
|
tcheck(t, err, "set password")
|
|
|
|
|
|
|
|
key0, err := acc.Subjectpass("test@localhost")
|
|
|
|
tcheck(t, err, "subjectpass")
|
|
|
|
key1, err := acc.Subjectpass("test@localhost")
|
|
|
|
tcheck(t, err, "subjectpass")
|
|
|
|
if key0 != key1 {
|
|
|
|
t.Fatalf("different keys for same address")
|
|
|
|
}
|
|
|
|
key2, err := acc.Subjectpass("test2@localhost")
|
|
|
|
tcheck(t, err, "subjectpass")
|
|
|
|
if key2 == key0 {
|
|
|
|
t.Fatalf("same key for different address")
|
|
|
|
}
|
|
|
|
|
|
|
|
acc.WithWLock(func() {
|
|
|
|
err := acc.DB.Write(func(tx *bstore.Tx) error {
|
|
|
|
acc.MailboxEnsureX(tx, "Testbox", true)
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
tcheck(t, err, "ensure mailbox exists")
|
|
|
|
err = acc.DB.Read(func(tx *bstore.Tx) error {
|
|
|
|
acc.MailboxEnsureX(tx, "Testbox", true)
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
tcheck(t, err, "ensure mailbox exists")
|
|
|
|
|
|
|
|
err = acc.DB.Write(func(tx *bstore.Tx) error {
|
|
|
|
acc.MailboxEnsureX(tx, "Testbox2", false)
|
|
|
|
tcheck(t, err, "create mailbox")
|
|
|
|
|
|
|
|
exists := acc.MailboxExistsX(tx, "Testbox2")
|
|
|
|
if !exists {
|
|
|
|
t.Fatalf("mailbox does not exist")
|
|
|
|
}
|
|
|
|
|
|
|
|
exists = acc.MailboxExistsX(tx, "Testbox3")
|
|
|
|
if exists {
|
|
|
|
t.Fatalf("mailbox does exist")
|
|
|
|
}
|
|
|
|
|
|
|
|
xmb := acc.MailboxFindX(tx, "Testbox3")
|
|
|
|
if xmb != nil {
|
|
|
|
t.Fatalf("did find Testbox3: %v", xmb)
|
|
|
|
}
|
|
|
|
xmb = acc.MailboxFindX(tx, "Testbox2")
|
|
|
|
if xmb == nil {
|
|
|
|
t.Fatalf("did not find Testbox2")
|
|
|
|
}
|
|
|
|
|
|
|
|
changes := acc.SubscriptionEnsureX(tx, "Testbox2")
|
|
|
|
if len(changes) == 0 {
|
|
|
|
t.Fatalf("new subscription did not result in changes")
|
|
|
|
}
|
|
|
|
changes = acc.SubscriptionEnsureX(tx, "Testbox2")
|
|
|
|
if len(changes) != 0 {
|
|
|
|
t.Fatalf("already present subscription resulted in changes")
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
tcheck(t, err, "write tx")
|
|
|
|
|
|
|
|
// todo: check that messages are removed and changes sent.
|
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
|
|
|
hasSpace, err := acc.TidyRejectsMailbox(log, "Rejects")
|
2023-01-30 16:27:06 +03:00
|
|
|
tcheck(t, err, "tidy rejects mailbox")
|
|
|
|
if !hasSpace {
|
|
|
|
t.Fatalf("no space for more rejects")
|
|
|
|
}
|
|
|
|
|
|
|
|
acc.RejectsRemove(log, "Rejects", "m01@mox.example")
|
|
|
|
})
|
|
|
|
|
|
|
|
// Run the auth tests twice for possible cache effects.
|
|
|
|
for i := 0; i < 2; i++ {
|
|
|
|
_, err := OpenEmailAuth("mjl@mox.example", "bogus")
|
|
|
|
if err != ErrUnknownCredentials {
|
|
|
|
t.Fatalf("got %v, expected ErrUnknownCredentials", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := 0; i < 2; i++ {
|
|
|
|
acc2, err := OpenEmailAuth("mjl@mox.example", "testtest")
|
|
|
|
tcheck(t, err, "open for email with auth")
|
|
|
|
err = acc2.Close()
|
|
|
|
tcheck(t, err, "close account")
|
|
|
|
}
|
|
|
|
|
|
|
|
acc2, err := OpenEmailAuth("other@mox.example", "testtest")
|
|
|
|
tcheck(t, err, "open for email with auth")
|
|
|
|
err = acc2.Close()
|
|
|
|
tcheck(t, err, "close account")
|
|
|
|
|
|
|
|
_, err = OpenEmailAuth("bogus@mox.example", "testtest")
|
|
|
|
if err != ErrUnknownCredentials {
|
|
|
|
t.Fatalf("got %v, expected ErrUnknownCredentials", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = OpenEmailAuth("mjl@test.example", "testtest")
|
|
|
|
if err != ErrUnknownCredentials {
|
|
|
|
t.Fatalf("got %v, expected ErrUnknownCredentials", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestWriteFile(t *testing.T) {
|
|
|
|
name := "../testdata/account.test"
|
|
|
|
os.Remove(name)
|
|
|
|
defer os.Remove(name)
|
|
|
|
err := writeFile(name, strings.NewReader("test"))
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("writeFile, unexpected error %v", err)
|
|
|
|
}
|
|
|
|
buf, err := os.ReadFile(name)
|
|
|
|
if err != nil || string(buf) != "test" {
|
|
|
|
t.Fatalf("writeFile, read file, got err %v, data %q", err, buf)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMessageRuleset(t *testing.T) {
|
|
|
|
f, err := os.Open("/dev/null")
|
|
|
|
tcheck(t, err, "open")
|
|
|
|
defer f.Close()
|
|
|
|
msgBuf := []byte(strings.ReplaceAll(`List-ID: <test.mox.example>
|
|
|
|
|
|
|
|
test
|
|
|
|
`, "\n", "\r\n"))
|
|
|
|
|
|
|
|
const destConf = `
|
|
|
|
Rulesets:
|
|
|
|
-
|
|
|
|
HeadersRegexp:
|
|
|
|
list-id: <test\.mox\.example>
|
|
|
|
Mailbox: test
|
|
|
|
`
|
|
|
|
var dest config.Destination
|
|
|
|
err = sconf.Parse(strings.NewReader(destConf), &dest)
|
|
|
|
tcheck(t, err, "parse config")
|
|
|
|
// todo: should use regular config initialization functions for this.
|
|
|
|
var hdrs [][2]*regexp.Regexp
|
|
|
|
for k, v := range dest.Rulesets[0].HeadersRegexp {
|
|
|
|
rk, err := regexp.Compile(k)
|
|
|
|
tcheck(t, err, "compile key")
|
|
|
|
rv, err := regexp.Compile(v)
|
|
|
|
tcheck(t, err, "compile value")
|
|
|
|
hdrs = append(hdrs, [...]*regexp.Regexp{rk, rv})
|
|
|
|
}
|
|
|
|
dest.Rulesets[0].HeadersRegexpCompiled = hdrs
|
|
|
|
|
|
|
|
c := MessageRuleset(xlog, dest, &Message{}, msgBuf, f)
|
|
|
|
if c == nil {
|
|
|
|
t.Fatalf("expected ruleset match")
|
|
|
|
}
|
|
|
|
|
|
|
|
msg2Buf := []byte(strings.ReplaceAll(`From: <mjl@mox.example>
|
|
|
|
|
|
|
|
test
|
|
|
|
`, "\n", "\r\n"))
|
|
|
|
c = MessageRuleset(xlog, dest, &Message{}, msg2Buf, f)
|
|
|
|
if c != nil {
|
|
|
|
t.Fatalf("expected no ruleset match")
|
|
|
|
}
|
|
|
|
|
|
|
|
// todo: test the SMTPMailFrom and VerifiedDomains rule.
|
|
|
|
}
|