Kaiy Belist
39759db7c2
- Bridge Node Support: Added functionality to manage mail (send/receive) on remote nodes via a bridge node. Full transparent management requires a private key on the bridge, while the remote node can operate with only a public key. - End-to-End Encryption (E2EE): Integrated E2EE using age. Encryption and decryption occur strictly at the bridge level; node administrators cannot access message content. - New Addressing Schema: Transitioned from nodepub@yggmail to userpub@nodepub. - Key Adaptation: Implemented ed25519 to x25519 coordinate adaptation, allowing signing keys to be used for encryption. Changed - Address Encoding: Switched from hex16 to base32 for the address space. - Memory Optimization: Replaced direct memory allocations with streaming for mail processing to reduce RAM overhead. - Code Refactoring: Performed decomposition of the original inherited codebase to improve maintainability. Fixed - Mail Updates: Fixed the mail retrieval mechanism to ensure near-instant updates for incoming messages. Changes to be committed: modified: .gitignore modified: README.md modified: cmd/yggmail/main.go modified: go.mod modified: go.sum new file: internal/account/manager.go new file: internal/account/session.go modified: internal/imapserver/backend.go modified: internal/imapserver/imap.go modified: internal/imapserver/mailbox.go modified: internal/imapserver/notify.go modified: internal/imapserver/user.go new file: internal/notify/notify.go new file: internal/notify/remote/remote.go new file: internal/remote/client.go new file: internal/remote/handlers.go new file: internal/remote/io.go new file: internal/remote/server.go new file: internal/remote/sign.go new file: internal/remote/types/request.pb.go new file: internal/remote/types/request.proto new file: internal/remote/types/response.pb.go new file: internal/remote/types/response.proto new file: internal/shell/shell.go modified: internal/smtpsender/sender.go modified: internal/smtpserver/backend.go modified: internal/smtpserver/session_local.go modified: internal/smtpserver/session_remote.go modified: internal/smtpserver/smtp.go new file: internal/storage/filestore/filestore.go new file: internal/storage/local/storage.go new file: internal/storage/remote/mail.go new file: internal/storage/remote/mailbox.go new file: internal/storage/remote/queue.go new file: internal/storage/remote/storage.go new file: internal/storage/remote/watch.go modified: internal/storage/sqlite3/sqlite3.go new file: internal/storage/sqlite3/table_accounts.go modified: internal/storage/sqlite3/table_mailboxes.go modified: internal/storage/sqlite3/table_mails.go modified: internal/storage/sqlite3/table_queue.go modified: internal/storage/storage.go modified: internal/storage/types/types.go modified: internal/utils/address.go new file: internal/utils/age/age.go new file: internal/utils/age/bech32/bech32.go new file: internal/utils/crypt.go new file: internal/utils/e2ee/crypt.go new file: internal/utils/e2ee/e2ee_test.go new file: internal/utils/e2ee/msg.go new file: internal/utils/x25519.go modified: internal/welcome/welcome.go
96 lines
2.2 KiB
Go
96 lines
2.2 KiB
Go
/*
|
|
* Copyright (c) 2021 Neil Alexander
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
package smtpserver
|
|
|
|
import (
|
|
"crypto/ed25519"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/emersion/go-smtp"
|
|
"github.com/neilalexander/yggmail/internal/account"
|
|
"github.com/neilalexander/yggmail/internal/remote"
|
|
"github.com/neilalexander/yggmail/internal/storage"
|
|
"github.com/neilalexander/yggmail/internal/utils"
|
|
"github.com/neilalexander/yggmail/internal/utils/e2ee"
|
|
)
|
|
|
|
type SessionLocal struct {
|
|
backend *Backend
|
|
storage storage.Storage
|
|
state *smtp.ConnectionState
|
|
session *account.Session
|
|
from string
|
|
rcpt []string
|
|
}
|
|
|
|
func (s *SessionLocal) Mail(from string, opts smtp.MailOptions) error {
|
|
s.rcpt = s.rcpt[:0]
|
|
|
|
_, aPk, err := utils.ParseAddress(from)
|
|
if err != nil {
|
|
return fmt.Errorf("parseAddress: %w", err)
|
|
}
|
|
if !aPk.Equal(s.session.Publickey()) {
|
|
return fmt.Errorf("not allowed to send outgoing mail as account: %s", utils.EncodeString(aPk))
|
|
}
|
|
|
|
s.from = from
|
|
return nil
|
|
}
|
|
|
|
func (s *SessionLocal) Rcpt(to string) error {
|
|
s.rcpt = append(s.rcpt, to)
|
|
return nil
|
|
}
|
|
|
|
func (s *SessionLocal) Data(r io.Reader) error {
|
|
payload, size, err := remote.ReadRawData(io.NopCloser(r))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var rcpt []ed25519.PublicKey
|
|
for _, r := range s.rcpt {
|
|
_, aPk, err := utils.ParseAddress(r)
|
|
if err != nil {
|
|
s.backend.Log.Println("Data: Parse address: cant parse: ", r)
|
|
continue
|
|
}
|
|
rcpt = append(rcpt, aPk)
|
|
}
|
|
payload, err = e2ee.EncryptFilter(payload.(io.ReadSeekCloser), s.from, rcpt, s.session.Sign, s.session.Encrypt)
|
|
if err != nil {
|
|
s.backend.Log.Printf("\nSMTP DATA: error encrypt: %w", err)
|
|
return err
|
|
}
|
|
|
|
payload, size, err = remote.ReadRawData(payload)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := s.backend.Queues.QueueFor(s.storage, s.session.Username(), s.from, s.rcpt, payload, size); err != nil {
|
|
return fmt.Errorf("s.backend.Queues.QueueFor: %w", err)
|
|
}
|
|
|
|
s.backend.Log.Println("SMTP L: Queued mail for", s.rcpt)
|
|
|
|
return nil
|
|
}
|
|
|
|
func (s *SessionLocal) Reset() {
|
|
s.rcpt = s.rcpt[:0]
|
|
s.from = ""
|
|
}
|
|
|
|
func (s *SessionLocal) Logout() error {
|
|
return nil
|
|
}
|