From 61f1b229ecf332e79b7d9e33e965a1a23310c01d Mon Sep 17 00:00:00 2001 From: Reto Brunner Date: Sun, 26 May 2019 12:24:18 +0200 Subject: Skip non selectable mailboxes in directory listing If a MailboxInfo has the attribute \Noselect, it is not possible to use this name as a selectable mailbox. Therefore it should not be passed to the directory handlers. The issue pops up if one has a hierarchy like this: INBOX INBOX/lists/stuff INBOX/lists/otherStuff Even though lists is not a valid inbox (doesn't contain mail, only other maildirs) it will show up in the directory listing, when we iterate over the MailboxInfo. It does have the corresponding attribute set though and we can simply filter it out. --- worker/imap/list.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'worker/imap') diff --git a/worker/imap/list.go b/worker/imap/list.go index 75f189f..6aecbca 100644 --- a/worker/imap/list.go +++ b/worker/imap/list.go @@ -12,6 +12,10 @@ func (imapw *IMAPWorker) handleListDirectories(msg *types.ListDirectories) { go func() { for mbox := range mailboxes { + if !canOpen(mbox) { + // no need to pass this to handlers if it can't be opened + continue + } imapw.worker.PostMessage(&types.Directory{ Message: types.RespondTo(msg), Name: mbox.Name, @@ -30,3 +34,12 @@ func (imapw *IMAPWorker) handleListDirectories(msg *types.ListDirectories) { &types.Done{types.RespondTo(msg)}, nil) } } + +func canOpen(mbox *imap.MailboxInfo) bool { + for _, attr := range mbox.Attributes { + if attr == imap.NoSelectAttr { + return false + } + } + return true +} -- cgit 1.4.1-2-gfad0 ommit/console.mu?h=hlt&id=224474d7fd04263b7300d22df337c33b97de5fe5'>commit diff stats

path: root/console.mu

blob: cc81c2323dbb557f1323ea7f363d78e453160a04 (plain) (blame)