fix(smtp): keep a copy of every submitted message in the sender's Sent folder
A message sent over SMTP submission was delivered but left nothing behind: the account's Sent folder stayed empty. Webmail files its own copy after sending, and a mail client cannot do it either, since IMAP APPEND is not implemented, so nothing ever filled Sent for SMTP clients. - ProcessOutboundEmailInput.FileSentCopy asks Submit to file the signed message in the sender's Sent folder, as read (not unread), sharing the blob the delivery jobs already reference; one copy per submission, not per recipient - the SMTP submission session sets it; the webmail leaves it off because it files its own copy without the Bcc line, and asking twice would duplicate it - filed only after the message is durably queued, so a submission refused by the send limit leaves nothing behind; a failure to file is logged, never returned, because the mail is already on its way and the client would send it again Tests: unit cases (asked/not asked, shared blob, failure swallowed, limit refusal, no repository) and an end-to-end test on the real submission server that fails with "Sent holds 0 messages" without the fix. Full go test ./... (25 packages) with TEST_DATABASE_URL, go vet and lang-lint are clean.
This commit is contained in:
1 parent
110a240cd9
commit
9c8b9c00fc
5 files changed
+323
No files matched your search
@@ -0,0 +1,139 @@
|
||||
package usecase
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"github.com/google/uuid"
|
||||
|
||||
"lambdamail/protocols/internal/application/port"
|
||||
)
|
||||
|
||||
// recordingMessageRepo stands in for the repository that files a message into
|
||||
// a folder; it records what it was asked to store.
|
||||
type recordingMessageRepo struct {
|
||||
inputs []port.PersistInboundMessageInput
|
||||
err error
|
||||
}
|
||||
|
||||
func (r *recordingMessageRepo) PersistAll(_ context.Context, in []port.PersistInboundMessageInput) ([]int64, error) {
|
||||
if r.err != nil {
|
||||
return nil, r.err
|
||||
}
|
||||
r.inputs = append(r.inputs, in...)
|
||||
return make([]int64, len(in)), nil
|
||||
}
|
||||
|
||||
func sentCopyInput(mailboxID uuid.UUID, fileCopy bool) ProcessOutboundEmailInput {
|
||||
input := submissionInput(mailboxID, "ana@remote.test", "bruno@other.test")
|
||||
input.FileSentCopy = fileCopy
|
||||
input.Body = bytes.NewBufferString("From: user@example.test\r\nTo: ana@remote.test\r\nSubject: Aviso de teste\r\nMessage-ID: <abc@example.test>\r\n\r\nbody")
|
||||
return input
|
||||
}
|
||||
|
||||
// A mail client submitting over SMTP cannot file a copy in Sent itself (IMAP
|
||||
// APPEND is not implemented), so the server does it once the message is queued.
|
||||
func TestSubmit_FilesACopyInSentWhenAsked(t *testing.T) {
|
||||
mailboxID := uuid.New()
|
||||
messages := &recordingMessageRepo{}
|
||||
blobs := &capturingBlobStorage{}
|
||||
|
||||
uc := NewProcessOutboundEmailUseCase(nil, &countingOutboundRepo{}, blobs, nil)
|
||||
uc.SetSentCopies(messages)
|
||||
|
||||
if err := uc.Submit(context.Background(), sentCopyInput(mailboxID, true)); err != nil {
|
||||
t.Fatalf("Submit: %v", err)
|
||||
}
|
||||
|
||||
if len(messages.inputs) != 1 {
|
||||
t.Fatalf("filed %d copies, want exactly 1 (not one per recipient)", len(messages.inputs))
|
||||
}
|
||||
got := messages.inputs[0]
|
||||
if got.MailboxID != mailboxID {
|
||||
t.Errorf("copy filed for mailbox %v, want the sender %v", got.MailboxID, mailboxID)
|
||||
}
|
||||
if got.TargetFolderName != "Sent" {
|
||||
t.Errorf("folder = %q, want Sent", got.TargetFolderName)
|
||||
}
|
||||
if !got.AlreadySeen {
|
||||
t.Error("the sender's own copy must not count as unread mail")
|
||||
}
|
||||
if got.Subject != "Aviso de teste" || got.MessageIDHeader != "abc@example.test" {
|
||||
t.Errorf("headers not extracted: subject=%q message-id=%q", got.Subject, got.MessageIDHeader)
|
||||
}
|
||||
if got.RecipientAddress != "user@example.test" {
|
||||
t.Errorf("recipient address = %q, want the sender's own address", got.RecipientAddress)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSubmit_SentCopySharesTheStoredMessageInsteadOfDuplicatingIt(t *testing.T) {
|
||||
repo := &countingOutboundRepo{}
|
||||
messages := &recordingMessageRepo{}
|
||||
|
||||
uc := NewProcessOutboundEmailUseCase(nil, repo, &capturingBlobStorage{}, nil)
|
||||
uc.SetSentCopies(messages)
|
||||
if err := uc.Submit(context.Background(), sentCopyInput(uuid.New(), true)); err != nil {
|
||||
t.Fatalf("Submit: %v", err)
|
||||
}
|
||||
|
||||
if messages.inputs[0].Blob.ID != repo.jobs[0].BlobID {
|
||||
t.Error("the Sent copy must reference the same blob as the delivery jobs")
|
||||
}
|
||||
}
|
||||
|
||||
// The webmail files its own copy (without the Bcc line the envelope carries),
|
||||
// so asking it to file another one would put every sent message in Sent twice.
|
||||
func TestSubmit_DoesNotFileACopyUnlessAsked(t *testing.T) {
|
||||
messages := &recordingMessageRepo{}
|
||||
|
||||
uc := NewProcessOutboundEmailUseCase(nil, &countingOutboundRepo{}, &capturingBlobStorage{}, nil)
|
||||
uc.SetSentCopies(messages)
|
||||
if err := uc.Submit(context.Background(), sentCopyInput(uuid.New(), false)); err != nil {
|
||||
t.Fatalf("Submit: %v", err)
|
||||
}
|
||||
|
||||
if len(messages.inputs) != 0 {
|
||||
t.Fatalf("filed %d copies although none was requested", len(messages.inputs))
|
||||
}
|
||||
}
|
||||
|
||||
// The mail is already queued when the copy is filed; failing the submission
|
||||
// now would make the client send it again.
|
||||
func TestSubmit_ASentCopyFailureDoesNotFailTheSubmission(t *testing.T) {
|
||||
repo := &countingOutboundRepo{}
|
||||
messages := &recordingMessageRepo{err: errors.New("quota exceeded")}
|
||||
|
||||
uc := NewProcessOutboundEmailUseCase(nil, repo, &capturingBlobStorage{}, nil)
|
||||
uc.SetSentCopies(messages)
|
||||
|
||||
if err := uc.Submit(context.Background(), sentCopyInput(uuid.New(), true)); err != nil {
|
||||
t.Fatalf("Submit must succeed even when the Sent copy cannot be filed: %v", err)
|
||||
}
|
||||
if len(repo.jobs) != 2 {
|
||||
t.Fatalf("the message was not queued: %d jobs", len(repo.jobs))
|
||||
}
|
||||
}
|
||||
|
||||
func TestSubmit_ASubmissionRefusedByTheSendLimitLeavesNothingInSent(t *testing.T) {
|
||||
messages := &recordingMessageRepo{}
|
||||
|
||||
uc := NewProcessOutboundEmailUseCase(nil, &countingOutboundRepo{recentCount: 199}, &capturingBlobStorage{}, nil)
|
||||
uc.SetSentCopies(messages)
|
||||
|
||||
if err := uc.Submit(context.Background(), sentCopyInput(uuid.New(), true)); !errors.Is(err, ErrSendLimitExceeded) {
|
||||
t.Fatalf("error = %v, want ErrSendLimitExceeded", err)
|
||||
}
|
||||
if len(messages.inputs) != 0 {
|
||||
t.Fatal("a message that was refused must not appear in Sent")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSubmit_WorksWithoutASentCopyRepository(t *testing.T) {
|
||||
uc := NewProcessOutboundEmailUseCase(nil, &countingOutboundRepo{}, &capturingBlobStorage{}, nil)
|
||||
|
||||
if err := uc.Submit(context.Background(), sentCopyInput(uuid.New(), true)); err != nil {
|
||||
t.Fatalf("Submit without a Sent repository: %v", err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user