Mirrors/yggmail
1
0
Fork 0
mirror of https://github.com/neilalexander/yggmail.git synced 2026-05-06 11:56:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Single user refactor

Browse Source
This commit is contained in:
Neil Alexander
2021-07-09 00:08:26 +01:00
parent 8411468451
commit 0735fa74de
15 changed files with 190 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/smtpserver/session_local.go
View File

@@ -21,12 +21,12 @@ type SessionLocal struct {
}
func (s *SessionLocal) Mail(from string, opts smtp.MailOptions) error {
_, host, err := utils.ParseAddress(from)
pk, err := utils.ParseAddress(from)
if err != nil {
return fmt.Errorf("parseAddress: %w", err)
}
if host != base62.EncodeToString(s.backend.Config.PublicKey) {
if !pk.Equal(s.backend.Config.PublicKey) {
return fmt.Errorf("not allowed to send outgoing mail as %s", from)
}
@@ -56,22 +56,23 @@ func (s *SessionLocal) Data(r io.Reader) error {
servers := make(map[string]struct{})
for _, rcpt := range s.rcpt {
localpart, host, err := utils.ParseAddress(rcpt)
pk, err := utils.ParseAddress(rcpt)
if err != nil {
return fmt.Errorf("parseAddress: %w", err)
}
host := base62.EncodeToString(pk)
if _, ok := servers[host]; ok {
continue
}
servers[host] = struct{}{}
if host == base62.EncodeToString(s.backend.Config.PublicKey) {
if pk.Equal(s.backend.Config.PublicKey) {
var b bytes.Buffer
if err := m.WriteTo(&b); err != nil {
return fmt.Errorf("m.WriteTo: %w", err)
}
if _, err := s.backend.Storage.MailCreate(localpart, "INBOX", b.Bytes()); err != nil {
if _, err := s.backend.Storage.MailCreate("INBOX", b.Bytes()); err != nil {
return fmt.Errorf("s.backend.Storage.StoreMessageFor: %w", err)
}
continue