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

Improve expunged message/UID tracking in IMAP sessions, track synchronization history for mailboxes/annotations.

Browse Source 
Keeping the message files around, and the message details in the database, is
useful for IMAP sessions that haven't seen/processed the removal of a message
yet and try to fetch it. Before, we would return errors. Similarly, a session
that has a mailbox selected that is removed can (at least in theory) still read
messages.

The mechanics to do this need keeping removed mailboxes around too. JMAP needs
that anyway, so we now keep modseq/createseq/expunged history for mailboxes
too. And while we're at it, for annotations as well.

For future JMAP support, we now also keep the mailbox parent id around for a
mailbox, with an upgrade step to set the field for existing mailboxes and
fixing up potential missing parents (which could possibly have happened in an
obscure corner case that I doubt anyone ran into).
This commit is contained in:
Mechiel Lukkien
2025-03-05 17:17:57 +01:00
parent 684c716e4d
commit 577944310c
63 changed files with 1945 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webapisrv/server.go
View File

@ -21,6 +21,7 @@ import (
"net"
"net/http"
"net/textproto"
"os"
"reflect"
"runtime/debug"
"slices"
@ -1058,8 +1059,15 @@ func (s server) Send(ctx context.Context, req webapi.SendRequest) (resp webapi.S
acc.WithRLock(func() {
var changes []store.Change
var sentID int64
metricked := false
defer func() {
if sentID != 0 {
p := acc.MessagePath(sentID)
err := os.Remove(p)
log.Check(err, "removing sent message file after error", slog.String("path", p))
}
if x := recover(); x != nil {
if !metricked {
metricServerErrors.WithLabelValues("submit").Inc()
@ -1068,7 +1076,7 @@ func (s server) Send(ctx context.Context, req webapi.SendRequest) (resp webapi.S
}
}()
xdbwrite(ctx, reqInfo.Account, func(tx *bstore.Tx) {
sentmb, err := bstore.QueryTx[store.Mailbox](tx).FilterEqual("Sent", true).Get()
sentmb, err := bstore.QueryTx[store.Mailbox](tx).FilterEqual("Expunged", false).FilterEqual("Sent", true).Get()
if err == bstore.ErrAbsent {
// There is no mailbox designated as Sent mailbox, so we're done.
return
@ -1107,12 +1115,14 @@ func (s server) Send(ctx context.Context, req webapi.SendRequest) (resp webapi.S
metricked = true
}
xcheckf(err, "message submitted to queue, appending message to Sent mailbox")
sentID = sentm.ID
err = tx.Update(&sentmb)
xcheckf(err, "updating mailbox")
changes = append(changes, sentm.ChangeAddUID(), sentmb.ChangeCounts())
})
sentID = 0 // Commit.
store.BroadcastChanges(acc, changes)
})
@ -1190,8 +1200,12 @@ func xmessageGet(ctx context.Context, acc *store.Account, msgID int64) (store.Me
if err := tx.Get(&m); err == bstore.ErrAbsent || err == nil && m.Expunged {
panic(webapi.Error{Code: "messageNotFound", Message: "message not found"})
}
mb = store.Mailbox{ID: m.MailboxID}
return tx.Get(&mb)
var err error
mb, err = store.MailboxID(tx, m.MailboxID)
if err != nil {
return fmt.Errorf("get mailbox: %v", err)
}
return nil
})
xcheckf(err, "get message")
return m, mb

2
webapisrv/server_test.go
View File

@ -82,7 +82,7 @@ func TestServer(t *testing.T) {
defer func() {
err := acc.Close()
log.Check(err, "closing account")
acc.CheckClosed()
acc.WaitClosed()
}()
s := NewServer(100*1024, "/webapi/", false).(server)