Ailur
/
smtp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch the backends to only include what's needed and expanded the AuthBackend to be more capable

This commit is contained in:
Tracker-Friendly 2024-11-25 15:50:16 +00:00
parent a3f9823293
commit 8dd23955ad
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
smtp.go
View File

@ -7,12 +7,12 @@ import (
"net" "net"
"strconv" "strconv"
"strings" "strings"
"time"
"crypto/tls" "crypto/tls"
"net/textproto" "net/textproto"
"git.ailur.dev/ailur/spf" "git.ailur.dev/ailur/spf"
"github.com/google/uuid"
) )
var ( var (
@ -22,7 +22,7 @@ var (
"250-SMTPUTF8", "250-SMTPUTF8",
"250 BINARYMIME", "250 BINARYMIME",
} }
queue = make(map[uuid.UUID]*MailQueueItem) queue = make(map[time.Time]*MailQueueItem)
) )
// MailQueueItem is a struct that represents an item in the mail queue // MailQueueItem is a struct that represents an item in the mail queue
@ -33,7 +33,7 @@ type MailQueueItem struct {
} }
// ViewMailQueue returns the current mail queue // ViewMailQueue returns the current mail queue
func ViewMailQueue() map[uuid.UUID]*MailQueueItem { func ViewMailQueue() map[time.Time]*MailQueueItem {
return queue return queue
} }
@ -53,12 +53,12 @@ type Mail struct {
// DatabaseBackend is a struct that represents a database backend // DatabaseBackend is a struct that represents a database backend
type DatabaseBackend struct { type DatabaseBackend struct {
CheckUser func(*Address) (bool, error) CheckUser func(*Address) (bool, error)
WriteMail func(*Mail) (uuid.UUID, error) WriteMail func(*Mail) error
} }
// AuthenticationBackend is a struct that represents an authentication backend // AuthenticationBackend is a struct that represents an authentication backend
type AuthenticationBackend struct { type AuthenticationBackend struct {
Authenticate func(string) (*Address, error) Authenticate func(conn *textproto.Conn) (*Address, error)
} }
func readMultilineCodeResponse(conn *textproto.Conn) (int, string, error) { func readMultilineCodeResponse(conn *textproto.Conn) (int, string, error) {
@ -83,7 +83,7 @@ func readMultilineCodeResponse(conn *textproto.Conn) (int, string, error) {
} }
func systemError(err error, receiver *Address, database DatabaseBackend) { func systemError(err error, receiver *Address, database DatabaseBackend) {
_, _ = database.WriteMail(&Mail{ _ = database.WriteMail(&Mail{
From: &Address{ From: &Address{
Name: "EMail System", Name: "EMail System",
Address: "system", Address: "system",
@ -93,7 +93,7 @@ func systemError(err error, receiver *Address, database DatabaseBackend) {
}) })
} }
func sendEmail(args SenderArgs, mail *Mail, database DatabaseBackend, queueID uuid.UUID) { func sendEmail(args SenderArgs, mail *Mail, database DatabaseBackend, queueID time.Time) {
mxs, err := net.LookupMX(mail.To[0].Address) mxs, err := net.LookupMX(mail.To[0].Address)
if err != nil { if err != nil {
systemError(err, queue[queueID].From, database) systemError(err, queue[queueID].From, database)
@ -320,7 +320,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
} }
continue continue
} else { } else {
address, err := fr.auth.Authenticate(line) address, err := fr.auth.Authenticate(textProto)
if err != nil { if err != nil {
_ = textProto.PrintfLine("421 4.7.0 Temporary server error") _ = textProto.PrintfLine("421 4.7.0 Temporary server error")
_ = conn.Close() _ = conn.Close()
@ -557,7 +557,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
} }
if !isSubmission { if !isSubmission {
_, err := fr.database.WriteMail(mail) err := fr.database.WriteMail(mail)
if err != nil { if err != nil {
_ = textProto.PrintfLine(err.Error()) _ = textProto.PrintfLine(err.Error())
_ = conn.Close() _ = conn.Close()
@ -571,7 +571,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
return return
} }
} else { } else {
queueID := uuid.New() queueID := time.Now()
queue[queueID] = &MailQueueItem{ queue[queueID] = &MailQueueItem{
From: state.FROM, From: state.FROM,