jmb/smtpd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Verify that user is properly authenticated before sending mail if AUTH is required (#6)

Browse source 
* Verify that user is properly authenticated before sending mail if AUTH is required

* Add testcase to verify that user is properly authenticated before sending mail if authenticator is setup

* Fix TestErrors() to not misuse auth bypass
This commit is contained in:
Bernhard Fröhlich 2020-06-07 18:48:25 +02:00 • committed by GitHub
parent 7c73bd1d49
commit 32be721d71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
protocol.go
View file

@ -202,6 +202,11 @@ func (session *session) handleMAIL(cmd command) {
return
}
if session.server.Authenticator != nil && session.peer.Username == "" {
session.reply(530, "Authentication Required.")
return
}
if !session.tls && session.server.ForceTLS {
session.reply(502, "Please turn on TLS by issuing a STARTTLS command.")
return

41
smtpd_test.go
View file

@ -391,6 +391,33 @@ func TestAuthNotSupported(t *testing.T) {
}
func TestAuthBypass(t *testing.T) {
addr, closer := runsslserver(t, &smtpd.Server{
Authenticator: func(peer smtpd.Peer, username, password string) error {
return smtpd.Error{Code: 550, Message: "Denied"}
},
ForceTLS: true,
ProtocolLogger: log.New(os.Stdout, "log: ", log.Lshortfile),
})
defer closer()
c, err := smtp.Dial(addr)
if err != nil {
t.Fatalf("Dial failed: %v", err)
}
if err := c.StartTLS(&tls.Config{InsecureSkipVerify: true}); err != nil {
t.Fatalf("STARTTLS failed: %v", err)
}
if err := c.Mail("sender@example.org"); err == nil {
t.Fatal("Unexpected MAIL success")
}
}
func TestConnectionCheck(t *testing.T) {
addr, closer := runserver(t, &smtpd.Server{
@ -1270,12 +1297,8 @@ func TestErrors(t *testing.T) {
t.Fatalf("AUTH didn't fail: %v", err)
}
if err := c.Mail("sender@example.org"); err != nil {
t.Fatalf("MAIL failed: %v", err)
}
if err := c.Mail("sender@example.org"); err == nil {
t.Fatal("Duplicate MAIL didn't fail")
t.Fatalf("MAIL didn't fail")
}
if err := cmd(c.Text, 502, "STARTTLS"); err != nil {
@ -1310,6 +1333,14 @@ func TestErrors(t *testing.T) {
t.Fatalf("AUTH didn't work: %v", err)
}
if err := c.Mail("sender@example.org"); err != nil {
t.Fatalf("MAIL failed: %v", err)
}
if err := c.Mail("sender@example.org"); err == nil {
t.Fatalf("Duplicate MAIL didn't fail")
}
if err := c.Quit(); err != nil {
t.Fatalf("Quit failed: %v", err)
}