Skip to content

Create override imap folders if needed #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jyellick wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Create override imap folders if needed #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions delivery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,30 +96,17 @@ func (d *Delivery) Mailbox(name string) error {

for _, u := range d.users {
if mboxName := d.mboxOverrides[u.username]; mboxName != "" {
_, mbox, err := u.GetMailbox(mboxName, true, nil)
_, mbox, err := u.GetOrCreateMailbox(mboxName, true, nil)
if err == nil {
d.mboxes = append(d.mboxes, *mbox.(*Mailbox))
continue
}
}

_, mbox, err := u.GetMailbox(name, true, nil)
_, mbox, err := u.GetOrCreateMailbox(name, true, nil)
if err != nil {
if err != backend.ErrNoSuchMailbox {
d.mboxes = nil
return err
}

if err := u.CreateMailbox(name); err != nil && err != backend.ErrMailboxAlreadyExists {
d.mboxes = nil
return err
}

_, mbox, err = u.GetMailbox(name, true, nil)
if err != nil {
d.mboxes = nil
return err
}
d.mboxes = nil
return err
}

d.mboxes = append(d.mboxes, *mbox.(*Mailbox))
Expand All @@ -141,7 +128,7 @@ func (d *Delivery) SpecialMailbox(attribute, fallbackName string) error {
}
for _, u := range d.users {
if mboxName := d.mboxOverrides[u.username]; mboxName != "" {
_, mbox, err := u.GetMailbox(mboxName, true, nil)
_, mbox, err := u.GetOrCreateMailbox(mboxName, true, nil)
if err == nil {
d.mboxes = append(d.mboxes, *mbox.(*Mailbox))
continue
Expand Down
66 changes: 50 additions & 16 deletions delivery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,26 +185,33 @@ func TestDelivery_AddRcpt_NonExistent(t *testing.T) {
}

func TestDelivery_Mailbox(t *testing.T) {
test := func(t *testing.T, create bool) {
test := func(t *testing.T, create bool, override string) {
b := initTestBackend().(*Backend)
defer cleanBackend(b)
assert.NilError(t, b.CreateUser(t.Name()), "CreateUser")
u, err := b.GetUser(t.Name())
assert.NilError(t, err, "GetUser")
destMboxName := "Box"
if override != "" {
destMboxName = override
}
if create {
assert.NilError(t, u.CreateMailbox("Box"))
assert.NilError(t, u.CreateMailbox(destMboxName))
}

delivery := b.NewDelivery()
if override != "" {
delivery.UserMailbox(u.Username(), destMboxName, nil)
}

assert.NilError(t, delivery.AddRcpt(t.Name(), textproto.Header{}), "AddRcpt")

assert.NilError(t, delivery.Mailbox("Box"))
assert.NilError(t, delivery.BodyRaw(strings.NewReader(testMsg)), "BodyRaw")
assert.NilError(t, delivery.Commit(), "Commit")

_, mbox, err := u.GetMailbox("Box", true, &noopConn{})
assert.NilError(t, err, "GetMailbox Box")
_, mbox, err := u.GetMailbox(destMboxName, true, &noopConn{})
assert.NilError(t, err, "GetMailbox %s", destMboxName)
defer mbox.Close()

seq, _ := imap.ParseSeqSet("*")
Expand All @@ -216,33 +223,50 @@ func TestDelivery_Mailbox(t *testing.T) {
checkTestMsg(t, msg)
}

test(t, true)
t.Run("nonexistent", func(t *testing.T) {
test(t, false)
})
for _, tt := range []struct {
name string
create bool
override string
}{
{"existent", true, ""},
{"nonexistent", false, ""},
{"existent_override", true, "Other"},
{"nonexistent_override", false, "Other"},
} {
t.Run(tt.name, func(t *testing.T) {
test(t, tt.create, tt.override)
})
}
}

func TestDelivery_SpecialMailbox(t *testing.T) {
test := func(t *testing.T, create bool, specialUse string) {
test := func(t *testing.T, create bool, specialUse, override string) {
b := initTestBackend().(*Backend)
defer cleanBackend(b)
assert.NilError(t, b.CreateUser(t.Name()), "CreateUser")
u, err := b.GetUser(t.Name())
assert.NilError(t, err, "GetUser")
destMboxName := "Box"
if override != "" {
destMboxName = override
}
if create {
assert.NilError(t, u.(*User).CreateMailboxSpecial("Box", specialUse))
assert.NilError(t, u.(*User).CreateMailboxSpecial(destMboxName, specialUse))
}

delivery := b.NewDelivery()
if override != "" {
delivery.UserMailbox(u.Username(), destMboxName, nil)
}

assert.NilError(t, delivery.AddRcpt(t.Name(), textproto.Header{}), "AddRcpt")

assert.NilError(t, delivery.SpecialMailbox(specialUse, "Box"))
assert.NilError(t, delivery.BodyRaw(strings.NewReader(testMsg)), "BodyRaw")
assert.NilError(t, delivery.Commit(), "Commit")

_, mbox, err := u.GetMailbox("Box", true, &noopConn{})
assert.NilError(t, err, "GetMailbox Box")
_, mbox, err := u.GetMailbox(destMboxName, true, &noopConn{})
assert.NilError(t, err, "GetMailbox %s", destMboxName)
defer mbox.Close()

seq, _ := imap.ParseSeqSet("*")
Expand Down Expand Up @@ -273,10 +297,20 @@ func TestDelivery_SpecialMailbox(t *testing.T) {
}
}

test(t, true, imap.JunkAttr)
t.Run("nonexistent", func(t *testing.T) {
test(t, false, imap.JunkAttr)
})
for _, tt := range []struct {
name string
create bool
override string
}{
{"existent", true, ""},
{"nonexistent", false, ""},
{"existent_override", true, "Other"},
{"nonexistent_override", false, "Other"},
} {
t.Run(tt.name, func(t *testing.T) {
test(t, tt.create, imap.JunkAttr, tt.override)
})
}
}

func TestDelivery_BodyParsed(t *testing.T) {
Expand Down
13 changes: 13 additions & 0 deletions user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,19 @@ func (u *User) ListMailboxes(subscribed bool) ([]imap.MailboxInfo, error) {
return res, nil
}

func (u *User) GetOrCreateMailbox(name string, readOnly bool, conn backend.Conn) (*imap.MailboxStatus, backend.Mailbox, error) {
status, mbox, err := u.GetMailbox(name, readOnly, conn)
if err == nil || err != backend.ErrNoSuchMailbox {
return status, mbox, err
}

if err := u.CreateMailbox(name); err != nil && err != backend.ErrMailboxAlreadyExists {
return nil, nil, err
}

return u.GetMailbox(name, readOnly, conn)
}

func (u *User) GetMailbox(name string, readOnly bool, conn backend.Conn) (*imap.MailboxStatus, backend.Mailbox, error) {
var mbox *Mailbox

Expand Down