ric/MailHog
1
0
Fork 0
mirror of https://gitlab.com/ric_harvey/MailHog.git synced 2024-11-27 16:24:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor regexes

Browse source
This commit is contained in:
Ian Kent 2014-12-21 17:59:55 +00:00
parent cf42e49baf
commit 24fbb8146a
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
smtp/protocol/protocol.go
View file

@ -336,30 +336,35 @@ func (proto *Protocol) EHLO(args string) (reply *Reply) {
return ReplyOk("Hello "+args, "PIPELINING", "AUTH EXTERNAL CRAM-MD5 LOGIN PLAIN") return ReplyOk("Hello "+args, "PIPELINING", "AUTH EXTERNAL CRAM-MD5 LOGIN PLAIN")
} }
var parseMailBrokenRegexp = regexp.MustCompile("(?i:From):\\s*<([^>]+)>")
var parseMailRFCRegexp = regexp.MustCompile("(?i:From):<([^>]+)>")
// ParseMAIL returns the forward-path from a MAIL command argument // ParseMAIL returns the forward-path from a MAIL command argument
func (proto *Protocol) ParseMAIL(mail string) (string, error) { func (proto *Protocol) ParseMAIL(mail string) (string, error) {
var r *regexp.Regexp var match []string
if proto.RejectBrokenMAILSyntax { if proto.RejectBrokenMAILSyntax {
r = regexp.MustCompile("(?i:From):<([^>]+)>") match = parseMailRFCRegexp.FindStringSubmatch(mail)
} else { } else {
r = regexp.MustCompile("(?i:From):\\s*<([^>]+)>") match = parseMailBrokenRegexp.FindStringSubmatch(mail)
} }
match := r.FindStringSubmatch(mail)
if len(match) != 2 { if len(match) != 2 {
return "", errors.New("Invalid syntax in MAIL command") return "", errors.New("Invalid syntax in MAIL command")
} }
return match[1], nil return match[1], nil
} }
var parseRcptBrokenRegexp = regexp.MustCompile("(?i:To):\\s*<([^>]+)>")
var parseRcptRFCRegexp = regexp.MustCompile("(?i:To):<([^>]+)>")
// ParseRCPT returns the return-path from a RCPT command argument // ParseRCPT returns the return-path from a RCPT command argument
func (proto *Protocol) ParseRCPT(rcpt string) (string, error) { func (proto *Protocol) ParseRCPT(rcpt string) (string, error) {
var r *regexp.Regexp var match []string
if proto.RejectBrokenRCPTSyntax { if proto.RejectBrokenRCPTSyntax {
r = regexp.MustCompile("(?i:To):<([^>]+)>") match = parseRcptRFCRegexp.FindStringSubmatch(rcpt)
} else { } else {
r = regexp.MustCompile("(?i:To):\\s*<([^>]+)>") match = parseRcptBrokenRegexp.FindStringSubmatch(rcpt)
} }
match := r.FindStringSubmatch(rcpt)
if len(match) != 2 { if len(match) != 2 {
return "", errors.New("Invalid syntax in RCPT command") return "", errors.New("Invalid syntax in RCPT command")
} }