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

Made the authentication mechanisms more modular by returning an authentication function rather than an address

This commit is contained in:
Tracker-Friendly 2024-12-08 15:13:33 +00:00
parent 509ef2a315
commit ff35d6f004
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
smtp.go
View File

@ -58,9 +58,11 @@ type DatabaseBackend struct {
// 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(initial string, conn *textproto.Conn) (*Address, error) Authenticate func(initial string, conn *textproto.Conn) (CheckAddress, error)
} }
type CheckAddress func(*Address) (bool, error)
func readMultilineCodeResponse(conn *textproto.Conn) (int, string, error) { func readMultilineCodeResponse(conn *textproto.Conn) (int, string, error) {
var lines strings.Builder var lines strings.Builder
for { for {
@ -147,7 +149,7 @@ func speakMultiLine(conn *textproto.Conn, lines []string) error {
type Receiver struct { type Receiver struct {
underlyingListener net.Listener underlyingListener net.Listener
hostname string hostname string
ownedDomains map[string]any ownedDomains map[string]struct{}
enforceTLS bool enforceTLS bool
tlsConfig *tls.Config tlsConfig *tls.Config
database DatabaseBackend database DatabaseBackend
@ -156,9 +158,9 @@ type Receiver struct {
// NewReceiver creates a new Receiver // NewReceiver creates a new Receiver
func NewReceiver(conn net.Listener, hostname string, ownedDomains []string, enforceTLS bool, database DatabaseBackend, authentication AuthenticationBackend, tlsConfig *tls.Config) *Receiver { func NewReceiver(conn net.Listener, hostname string, ownedDomains []string, enforceTLS bool, database DatabaseBackend, authentication AuthenticationBackend, tlsConfig *tls.Config) *Receiver {
var ownedDomainsMap = make(map[string]any) var ownedDomainsMap = make(map[string]struct{})
for _, domain := range ownedDomains { for _, domain := range ownedDomains {
ownedDomainsMap[domain] = nil ownedDomainsMap[domain] = struct{}{}
} }
return &Receiver{ return &Receiver{
underlyingListener: conn, underlyingListener: conn,
@ -191,7 +193,7 @@ func (fr *Receiver) Serve() error {
func (fr *Receiver) handleConnection(conn net.Conn) { func (fr *Receiver) handleConnection(conn net.Conn) {
var state struct { var state struct {
HELO bool HELO bool
AUTH *Address AUTH CheckAddress
TLS bool TLS bool
FROM *Address FROM *Address
RCPT []*Address RCPT []*Address
@ -320,14 +322,14 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
} }
continue continue
} else { } else {
address, err := fr.auth.Authenticate(strings.TrimPrefix(line, "AUTH "), textProto) checkAddress, err := fr.auth.Authenticate(strings.TrimPrefix(line, "AUTH "), 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()
return return
} }
if address == nil { if checkAddress == nil {
err = textProto.PrintfLine("535 5.7.8 Authentication failed") err = textProto.PrintfLine("535 5.7.8 Authentication failed")
if err != nil { if err != nil {
_ = textProto.PrintfLine("421 4.7.0 Temporary server error") _ = textProto.PrintfLine("421 4.7.0 Temporary server error")
@ -335,7 +337,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
return return
} }
} else { } else {
state.AUTH = address state.AUTH = checkAddress
err = textProto.PrintfLine("235 2.7.0 Authentication successful") err = textProto.PrintfLine("235 2.7.0 Authentication successful")
if err != nil { if err != nil {
_ = textProto.PrintfLine("421 4.7.0 Temporary server error") _ = textProto.PrintfLine("421 4.7.0 Temporary server error")
@ -410,7 +412,14 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
continue continue
} }
if *address != *state.AUTH { ok, err := state.AUTH(address)
if err != nil {
_ = textProto.PrintfLine("421 4.7.0 Temporary server error")
_ = conn.Close()
return
}
if !ok {
err = textProto.PrintfLine("535 5.7.8 Authenticated wrong user") err = textProto.PrintfLine("535 5.7.8 Authenticated wrong user")
if err != nil { if err != nil {
_ = textProto.PrintfLine("421 4.7.0 Temporary server error") _ = textProto.PrintfLine("421 4.7.0 Temporary server error")