From 7042566e4bdaaec059aea4f53eeefc4f362648cd Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 7 Jan 2020 14:32:50 +0100 Subject: pkg/email: accept #syz- prefix for commands Some users spell the command as "#syz-dup:". Support this and few more variations. --- pkg/email/parser.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'pkg/email/parser.go') diff --git a/pkg/email/parser.go b/pkg/email/parser.go index 9c37331f7..589598ba2 100644 --- a/pkg/email/parser.go +++ b/pkg/email/parser.go @@ -47,8 +47,6 @@ const ( cmdTest5 ) -const commandPrefix = "#syz " - var groupsLinkRe = regexp.MustCompile("\nTo view this discussion on the web visit" + " (https://groups\\.google\\.com/.*?)\\.(?:\r)?\n") @@ -192,16 +190,25 @@ func CanonicalEmail(email string) string { return strings.ToLower(addr.Address) } +const commandPrefix = "#syz" + // extractCommand extracts command to syzbot from email body. // Commands are of the following form: // ^#syz cmd args... func extractCommand(body string) (cmd Command, str, args string) { - cmdPos := strings.Index("\n"+body, "\n"+commandPrefix) + nbody := "\n" + body + cmdPos := -1 + for _, delim := range []string{" ", "-", ":"} { + cmdPos = strings.Index(nbody, "\n"+commandPrefix+delim) + if cmdPos != -1 { + break + } + } if cmdPos == -1 { cmd = CmdNone return } - cmdPos += len(commandPrefix) + cmdPos += len(commandPrefix) + 1 for cmdPos < len(body) && body[cmdPos] == ' ' { cmdPos++ } -- cgit mrf-deployment