Mirrors/yggmail
1
0
Fork 0
mirror of https://github.com/neilalexander/yggmail.git synced 2026-05-21 02:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Accept usernames as email format

Browse Source
This commit is contained in:
Neil Alexander
2021-07-08 23:12:20 +01:00
parent 2093fa901c
commit 8411468451
7 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/imapserver/backend.go
View File

@@ -6,8 +6,10 @@ import (
"github.com/emersion/go-imap"
"github.com/emersion/go-imap/backend"
"github.com/jxskiss/base62"
"github.com/neilalexander/yggmail/internal/config"
"github.com/neilalexander/yggmail/internal/storage"
"github.com/neilalexander/yggmail/internal/utils"
)
type Backend struct {
@@ -17,6 +19,14 @@ type Backend struct {
}
func (b *Backend) Login(_ *imap.ConnInfo, username, password string) (backend.User, error) {
// If our username is email-like, then take just the localpart
if localpart, host, err := utils.ParseAddress(username); err == nil {
if host != base62.EncodeToString(b.Config.PublicKey) {
return nil, fmt.Errorf("failed to authenticate: wrong domain in username")
}
username = localpart
}
if authed, err := b.Storage.TryAuthenticate(username, password); err != nil {
b.Log.Printf("Failed to authenticate IMAP user %q due to error: %s", username, err)
return nil, fmt.Errorf("failed to authenticate: %w", err)

4
internal/imapserver/mailbox.go
View File

@@ -111,13 +111,9 @@ func (mbox *Mailbox) ListMessages(uid bool, seqSet *imap.SeqSet, items []imap.Fe
ids, err := mbox.getIDsFromSeqSet(uid, seqSet)
if err != nil {
fmt.Println("Failed to get IDs from sequences:", err)
return fmt.Errorf("mbox.getIDsFromSeqSet: %w", err)
}
fmt.Println("FETCHING", ids, uid)
fmt.Println("SEQ SET", seqSet)
for _, id := range ids {
mseq, mid, body, seen, answered, flagged, deleted, datetime, err := mbox.backend.Storage.MailSelect(mbox.user.username, mbox.name, int(id))
if err != nil {