Compare commits
No commits in common. "main" and "v1.0.4" have entirely different histories.
2 changed files with 36 additions and 28 deletions
|
|
@ -22,9 +22,10 @@ var DatabaseBackend = smtp.DatabaseBackend{
|
|||
|
||||
// AuthenticationBackend is a smtp.AuthenticationBackend implementation that always returns a fixed address for Authenticate.
|
||||
var AuthenticationBackend = smtp.AuthenticationBackend{
|
||||
Authenticate: func(initial string, conn *textproto.Conn) (smtp.CheckAddress, error) {
|
||||
return func(address *smtp.Address) (bool, error) {
|
||||
return true, nil
|
||||
Authenticate: func(initial string, conn *textproto.Conn) (*smtp.Address, error) {
|
||||
return &smtp.Address{
|
||||
Name: "test",
|
||||
Address: "example.org",
|
||||
}, nil
|
||||
},
|
||||
}
|
||||
|
|
|
|||
57
smtp.go
57
smtp.go
|
|
@ -58,12 +58,9 @@ type DatabaseBackend struct {
|
|||
|
||||
// AuthenticationBackend is a struct that represents an authentication backend
|
||||
type AuthenticationBackend struct {
|
||||
Authenticate func(initial string, conn *textproto.Conn) (CheckAddress, error)
|
||||
SupportedMechanisms []string
|
||||
Authenticate func(initial string, conn *textproto.Conn) (*Address, error)
|
||||
}
|
||||
|
||||
type CheckAddress func(*Address) (bool, error)
|
||||
|
||||
func readMultilineCodeResponse(conn *textproto.Conn) (int, string, error) {
|
||||
var lines strings.Builder
|
||||
for {
|
||||
|
|
@ -150,7 +147,7 @@ func speakMultiLine(conn *textproto.Conn, lines []string) error {
|
|||
type Receiver struct {
|
||||
underlyingListener net.Listener
|
||||
hostname string
|
||||
ownedDomains map[string]struct{}
|
||||
ownedDomains map[string]any
|
||||
enforceTLS bool
|
||||
tlsConfig *tls.Config
|
||||
database DatabaseBackend
|
||||
|
|
@ -159,9 +156,9 @@ type Receiver struct {
|
|||
|
||||
// NewReceiver creates a new 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]struct{})
|
||||
var ownedDomainsMap = make(map[string]any)
|
||||
for _, domain := range ownedDomains {
|
||||
ownedDomainsMap[domain] = struct{}{}
|
||||
ownedDomainsMap[domain] = nil
|
||||
}
|
||||
return &Receiver{
|
||||
underlyingListener: conn,
|
||||
|
|
@ -194,7 +191,7 @@ func (fr *Receiver) Serve() error {
|
|||
func (fr *Receiver) handleConnection(conn net.Conn) {
|
||||
var state struct {
|
||||
HELO bool
|
||||
AUTH CheckAddress
|
||||
AUTH *Address
|
||||
TLS bool
|
||||
FROM *Address
|
||||
RCPT []*Address
|
||||
|
|
@ -212,6 +209,8 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
|
|||
return
|
||||
}
|
||||
|
||||
fmt.Println("Connection from", conn.RemoteAddr().String())
|
||||
|
||||
for {
|
||||
line, err := textProto.ReadLine()
|
||||
if err != nil {
|
||||
|
|
@ -282,9 +281,6 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
|
|||
if fr.enforceTLS {
|
||||
capabilities = append(capabilities, "250-REQUIRETLS")
|
||||
}
|
||||
if fr.auth.SupportedMechanisms != nil {
|
||||
capabilities = append(capabilities, "250-AUTH "+strings.Join(fr.auth.SupportedMechanisms, " "))
|
||||
}
|
||||
capabilities = append(capabilities, defaultCapabilities...)
|
||||
state.HELO = true
|
||||
err = speakMultiLine(textProto, capabilities)
|
||||
|
|
@ -324,14 +320,14 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
|
|||
}
|
||||
continue
|
||||
} else {
|
||||
checkAddress, err := fr.auth.Authenticate(strings.TrimPrefix(line, "AUTH "), textProto)
|
||||
address, err := fr.auth.Authenticate(strings.TrimPrefix(line, "AUTH "), textProto)
|
||||
if err != nil {
|
||||
_ = textProto.PrintfLine(err.Error())
|
||||
_ = textProto.PrintfLine("421 4.7.0 Temporary server error")
|
||||
_ = conn.Close()
|
||||
return
|
||||
}
|
||||
|
||||
if checkAddress == nil {
|
||||
if address == nil {
|
||||
err = textProto.PrintfLine("535 5.7.8 Authentication failed")
|
||||
if err != nil {
|
||||
_ = textProto.PrintfLine("421 4.7.0 Temporary server error")
|
||||
|
|
@ -339,7 +335,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
|
|||
return
|
||||
}
|
||||
} else {
|
||||
state.AUTH = checkAddress
|
||||
state.AUTH = address
|
||||
err = textProto.PrintfLine("235 2.7.0 Authentication successful")
|
||||
if err != nil {
|
||||
_ = textProto.PrintfLine("421 4.7.0 Temporary server error")
|
||||
|
|
@ -414,14 +410,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
|
|||
continue
|
||||
}
|
||||
|
||||
ok, err := state.AUTH(address)
|
||||
if err != nil {
|
||||
_ = textProto.PrintfLine("421 4.7.0 Temporary server error")
|
||||
_ = conn.Close()
|
||||
return
|
||||
}
|
||||
|
||||
if !ok {
|
||||
if *address != *state.AUTH {
|
||||
err = textProto.PrintfLine("535 5.7.8 Authenticated wrong user")
|
||||
if err != nil {
|
||||
_ = textProto.PrintfLine("421 4.7.0 Temporary server error")
|
||||
|
|
@ -590,6 +579,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
|
|||
Host: strings.Split(conn.RemoteAddr().String(), ":")[0],
|
||||
}
|
||||
go sendEmail(SenderArgs{
|
||||
Hostname: fr.hostname,
|
||||
EnforceTLS: fr.enforceTLS,
|
||||
}, mail, fr.database, queueID)
|
||||
|
||||
|
|
@ -618,6 +608,7 @@ func (fr *Receiver) handleConnection(conn net.Conn) {
|
|||
|
||||
// SenderArgs is a struct that represents the arguments for the Sender
|
||||
type SenderArgs struct {
|
||||
Hostname string
|
||||
EnforceTLS bool
|
||||
}
|
||||
|
||||
|
|
@ -648,7 +639,7 @@ func Send(args SenderArgs, mail *Mail, conn net.Conn, mxHost string) (err error)
|
|||
return errors.New("unexpected greeting - " + line)
|
||||
}
|
||||
|
||||
err = textConn.PrintfLine("EHLO %s", mxHost)
|
||||
err = textConn.PrintfLine("EHLO %s", args.Hostname)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -682,11 +673,16 @@ func Send(args SenderArgs, mail *Mail, conn net.Conn, mxHost string) (err error)
|
|||
InsecureSkipVerify: false,
|
||||
})
|
||||
|
||||
err = tlsConn.Handshake()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
textConn = textproto.NewConn(tlsConn)
|
||||
|
||||
// Just use HELO, no point using EHLO when we already have all the capabilities
|
||||
// This also gets us out of using readMultilineCodeResponse
|
||||
err = textConn.PrintfLine("HELO %s", mxHost)
|
||||
err = textConn.PrintfLine("HELO %s", args.Hostname)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -709,7 +705,10 @@ func Send(args SenderArgs, mail *Mail, conn net.Conn, mxHost string) (err error)
|
|||
}
|
||||
|
||||
code, line, err = textConn.ReadCodeLine(0)
|
||||
fmt.Println(code, line, err)
|
||||
if err != nil {
|
||||
// For some reason the EHLO stuff ends up here
|
||||
fmt.Println("5")
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
@ -724,7 +723,9 @@ func Send(args SenderArgs, mail *Mail, conn net.Conn, mxHost string) (err error)
|
|||
}
|
||||
|
||||
code, line, err = textConn.ReadCodeLine(0)
|
||||
fmt.Println(code, line, err)
|
||||
if err != nil {
|
||||
fmt.Println("6")
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
@ -739,7 +740,9 @@ func Send(args SenderArgs, mail *Mail, conn net.Conn, mxHost string) (err error)
|
|||
}
|
||||
|
||||
code, line, err = textConn.ReadCodeLine(0)
|
||||
fmt.Println(code, line, err)
|
||||
if err != nil {
|
||||
fmt.Println("7")
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
@ -759,7 +762,9 @@ func Send(args SenderArgs, mail *Mail, conn net.Conn, mxHost string) (err error)
|
|||
}
|
||||
|
||||
code, line, err = textConn.ReadCodeLine(0)
|
||||
fmt.Println(code, line, err)
|
||||
if err != nil {
|
||||
fmt.Println("8")
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
@ -773,7 +778,9 @@ func Send(args SenderArgs, mail *Mail, conn net.Conn, mxHost string) (err error)
|
|||
}
|
||||
|
||||
code, line, err = textConn.ReadCodeLine(0)
|
||||
fmt.Println(code, line, err)
|
||||
if err != nil {
|
||||
fmt.Println("9")
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue