Skip to content

Fix SMTP forwardPath parsing: remove postmaster special-case #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patelsmuseum wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix SMTP forwardPath parsing: remove postmaster special-case #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions mail/rfc5321/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"errors"
"net"
"strconv"
"strings"
)

const (
Expand Down Expand Up @@ -104,14 +103,14 @@ func (s *Parser) forwardPath() (err error) {
return err
}
// special case for forwardPath only - can just be addressed to postmaster
if i := strings.Index(strings.ToLower(s.LocalPart), postmasterLocalPart); i == 0 {
s.LocalPart = postmasterLocalPart
return nil // atExpected will be ignored, postmaster doesn't need @
}
//if i := strings.Index(strings.ToLower(s.LocalPart), postmasterLocalPart); i == 0 {
// s.LocalPart = postmasterLocalPart
// return nil // atExpected will be ignored, postmaster doesn't need @
//}
return err // it may return atExpected
}

//MailFrom accepts the following syntax: Reverse-path [SP Mail-parameters] CRLF
// MailFrom accepts the following syntax: Reverse-path [SP Mail-parameters] CRLF
func (s *Parser) MailFrom(input []byte) (err error) {
s.set(input)
if err := s.reversePath(); err != nil {
Expand All @@ -133,8 +132,9 @@ func (s *Parser) MailFrom(input []byte) (err error) {

const postmasterLocalPart = "postmaster"

//RcptTo accepts the following syntax: ( "<Postmaster@" Domain ">" / "<Postmaster>" /
// Forward-path ) [SP Rcpt-parameters] CRLF
// RcptTo accepts the following syntax: ( "<Postmaster@" Domain ">" / "<Postmaster>" /
//
// Forward-path ) [SP Rcpt-parameters] CRLF
func (s *Parser) RcptTo(input []byte) (err error) {
s.set(input)
if err := s.forwardPath(); err != nil {
Expand Down Expand Up @@ -354,8 +354,9 @@ func (s *Parser) mailbox() error {
}

// "[" ( IPv4-address-literal /
// IPv6-address-literal /
// General-address-literal ) "]"
//
// IPv6-address-literal /
// General-address-literal ) "]"
func (s *Parser) addressLiteral() error {
ch := s.next()
if ch == '[' {
Expand Down Expand Up @@ -435,7 +436,7 @@ func (s *Parser) snum() error {
return errors.New("too many digits")
}

//IPv6:" IPv6-addr
// IPv6:" IPv6-addr
func (s *Parser) ipv6AddressLiteral() error {
var ip bytes.Buffer
for c := s.next(); ; c = s.next() {
Expand Down Expand Up @@ -528,7 +529,7 @@ func (s *Parser) QcontentSMTP() error {
}
}

//Dot-string = Atom *("." Atom)
// Dot-string = Atom *("." Atom)
func (s *Parser) dotString() error {
for {
if err := s.atom(); err != nil {
Expand Down Expand Up @@ -613,7 +614,7 @@ func isLetDig(c byte) bool {
return false
}

//ehlo = "EHLO" SP ( Domain / address-literal ) CRLF
// ehlo = "EHLO" SP ( Domain / address-literal ) CRLF
// Note: "HELO" is ignored here
func (s *Parser) Ehlo(input []byte) (domain string, ip net.IP, err error) {
s.set(input)
Expand Down