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

check/spf: Handle empty MAIL FROM in accordance with RFC 7208

Browse source 
See #652.
See #603.
This commit is contained in:
fox.cpp 2024-01-21 20:01:00 +03:00
parent 5b5fb72b02
commit ab94e0bb95
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/check/spf/spf.go
View file

@ -314,7 +314,17 @@ func (s *state) CheckConnection(ctx context.Context) module.CheckResult {
return module.CheckResult{} return module.CheckResult{}
} }
mailFrom, err := prepareMailFrom(s.msgMeta.OriginalFrom) mailFromOriginal := s.msgMeta.OriginalFrom
if mailFromOriginal == "" {
// RFC 7208 Section 2.4.
// >When the reverse-path is null, this document
// >defines the "MAIL FROM" identity to be the mailbox composed of the
// >local-part "postmaster" and the "HELO" identity (which might or might
// >not have been checked separately before).
mailFromOriginal = "postmaster@" + s.msgMeta.Conn.Hostname
}
mailFrom, err := prepareMailFrom(mailFromOriginal)
if err != nil { if err != nil {
s.skip = true s.skip = true
return module.CheckResult{ return module.CheckResult{

11
tests/smtp_test.go
View file

@ -122,13 +122,22 @@ func TestCheckSPF(tt *testing.T) {
conn := t.Conn("smtp") conn := t.Conn("smtp")
defer conn.Close() defer conn.Close()
conn.SMTPNegotation("localhost", nil, nil) conn.SMTPNegotation("fail.maddy.test", nil, nil)
conn.Writeln("MAIL FROM:<testing@pass.maddy.test>") conn.Writeln("MAIL FROM:<testing@pass.maddy.test>")
conn.ExpectPattern("250 *") conn.ExpectPattern("250 *")
conn.Writeln("RSET") conn.Writeln("RSET")
conn.ExpectPattern("250 *") conn.ExpectPattern("250 *")
// Actually checks fail.maddy.test.
conn.Writeln("MAIL FROM:<>")
conn.ExpectPattern("552 5.7.0 *")
conn.SMTPNegotation("pass.maddy.test", nil, nil)
conn.Writeln("MAIL FROM:<>")
conn.ExpectPattern("250 *")
conn.Writeln("MAIL FROM:<testing@none.maddy.test>") conn.Writeln("MAIL FROM:<testing@none.maddy.test>")
conn.ExpectPattern("551 5.7.0 *") conn.ExpectPattern("551 5.7.0 *")