- 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
124 lines
3.5 KiB
Go
124 lines
3.5 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"
|
|
"log"
|
|
|
|
"github.com/emersion/go-smtp"
|
|
"github.com/neilalexander/yggmail/internal/account"
|
|
"github.com/neilalexander/yggmail/internal/notify"
|
|
"github.com/neilalexander/yggmail/internal/smtpsender"
|
|
"github.com/neilalexander/yggmail/internal/storage"
|
|
"github.com/neilalexander/yggmail/internal/storage/remote"
|
|
"github.com/neilalexander/yggmail/internal/utils"
|
|
)
|
|
|
|
type BackendMode int
|
|
|
|
const (
|
|
BackendModeInternal BackendMode = iota
|
|
BackendModeExternal
|
|
)
|
|
|
|
type Backend struct {
|
|
Mode BackendMode
|
|
Log *log.Logger
|
|
Queues *smtpsender.Queues
|
|
Storage storage.Storage
|
|
Notify *notify.Notify
|
|
Account *account.Manager
|
|
NodePublicKey ed25519.PublicKey
|
|
// Config *config.Config
|
|
}
|
|
|
|
func (b *Backend) Login(state *smtp.ConnectionState, username, password string) (smtp.Session, error) {
|
|
switch b.Mode {
|
|
case BackendModeInternal:
|
|
// If our username is email-like, then take just the localpart
|
|
dPk, aPk, err := utils.ParseAddress(username)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to authenticate: wrong domain or username")
|
|
}
|
|
|
|
// Work in domain mode: Get account
|
|
session, err := b.Account.Login(username, password)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to autheticate: %w", err)
|
|
}
|
|
|
|
username = utils.EncodeString(aPk)
|
|
var storage storage.Storage
|
|
|
|
if !b.NodePublicKey.Equal(dPk) {
|
|
storage = remote.NewRemoteStorage(dPk, session, b.Queues.Transport)
|
|
b.Log.Println("SMTP L: Authenticate with remote storage as", username)
|
|
//return nil, fmt.Errorf("failed to authenticate: wrong domain in username")
|
|
} else {
|
|
storage = b.Storage
|
|
b.Log.Println("SMTP L: Authenticate with local storage as", username)
|
|
}
|
|
|
|
defer b.Log.Printf("Authenticated SMTP user as %q\n", username)
|
|
|
|
return &SessionLocal{
|
|
backend: b,
|
|
session: session,
|
|
storage: storage,
|
|
state: state,
|
|
}, nil
|
|
|
|
case BackendModeExternal:
|
|
return nil, fmt.Errorf("not expecting authenticated connection on external backend")
|
|
}
|
|
|
|
return nil, fmt.Errorf("authenticated login failed")
|
|
}
|
|
|
|
func (b *Backend) AnonymousLogin(state *smtp.ConnectionState) (smtp.Session, error) {
|
|
switch b.Mode {
|
|
case BackendModeInternal:
|
|
return nil, fmt.Errorf("not expecting anonymous connection on internal backend")
|
|
|
|
case BackendModeExternal:
|
|
return nil, fmt.Errorf("not expecting anonymous connection on smtp. RPC Only")
|
|
// // The connection came from our overlay listener, so we should check
|
|
// // that they are who they claim to be
|
|
|
|
// // Transport Layer address. Hex
|
|
// nodePk, err := hex.DecodeString(state.RemoteAddr.String())
|
|
// if err != nil {
|
|
// return nil, fmt.Errorf("hex.DecodeString: %w", err)
|
|
// }
|
|
// // HELO Hostname. Format
|
|
// hostPk, err := utils.DecodeString(state.Hostname)
|
|
// if err != nil {
|
|
// return nil, fmt.Errorf("utils.DecodeKey: %w", err)
|
|
// }
|
|
|
|
// nPk := ed25519.PublicKey(nodePk)
|
|
// hPk := ed25519.PublicKey(hostPk)
|
|
|
|
// if !nPk.Equal(hPk) {
|
|
// return nil, fmt.Errorf("you are not who you claim to be")
|
|
// }
|
|
|
|
// b.Log.Println("SMTP Local: Incoming session from", state.Hostname)
|
|
// return &SessionRemote{
|
|
// backend: b,
|
|
// state: state,
|
|
// public: nPk[:],
|
|
// }, nil
|
|
}
|
|
|
|
return nil, fmt.Errorf("anonymous login failed")
|
|
}
|