mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-06 06:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

auth/dovecot_sasl: Assume TLS is used during authentication

Browse source 
Close #225.
This commit is contained in:
fox.cpp 2020-05-24 00:35:03 +03:00
parent 7ba699e595
commit 0f1b6039f9
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/auth/dovecot_sasl/dovecot_sasl.go
View file

@ -8,6 +8,7 @@ import (
dovecotsasl "github.com/foxcpp/go-dovecot-sasl"
"github.com/foxcpp/maddy/internal/auth"
"github.com/foxcpp/maddy/internal/config"
"github.com/foxcpp/maddy/internal/exterrors"
"github.com/foxcpp/maddy/internal/log"
"github.com/foxcpp/maddy/internal/module"
)
@ -116,13 +117,14 @@ func (a *Auth) AuthPlain(username, password string) error {
if _, ok := a.mechanisms[sasl.Plain]; ok {
cl, err := a.getConn()
if err != nil {
return err
return exterrors.WithTemporary(err, true)
}
defer a.returnConn(cl)
// Pretend it is SMTP even though we really don't know.
// Pretend it is SMTPS even though we really don't know.
// We also have no connection information to pass to the server...
return cl.Do("SMTP", sasl.NewPlainClient("", username, password))
return cl.Do("SMTP", sasl.NewPlainClient("", username, password),
dovecotsasl.Secured, dovecotsasl.NoPenalty)
}
if _, ok := a.mechanisms[sasl.Login]; ok {
cl, err := a.getConn()
@ -131,8 +133,8 @@ func (a *Auth) AuthPlain(username, password string) error {
}
defer a.returnConn(cl)
// Pretend it is SMTP even though we really don't know.
return cl.Do("SMTP", sasl.NewLoginClient(username, password))
return cl.Do("SMTP", sasl.NewLoginClient(username, password),
dovecotsasl.Secured, dovecotsasl.NoPenalty)
}
return auth.ErrUnsupportedMech