diff options
| -rw-r--r-- | dashboard/app/email_test.go | 8 | ||||
| -rw-r--r-- | dashboard/app/reporting_email.go | 2 | ||||
| -rw-r--r-- | pkg/email/parser.go | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go index 3c7a2d200..b35fcd8dc 100644 --- a/dashboard/app/email_test.go +++ b/dashboard/app/email_test.go @@ -1349,7 +1349,7 @@ func TestSingleListForward(t *testing.T) { EmailOptCC([]string{"some@list.com"}), EmailOptSubject("fix bug title")) forwarded := c.pollEmailBug() - c.expectEQ(forwarded.Subject, "fix bug title") + c.expectEQ(forwarded.Subject, "Forwarded: fix bug title") c.expectEQ(forwarded.Sender, sender) c.expectEQ(forwarded.To, []string{"test@syzkaller.com"}) c.expectEQ(len(forwarded.Cc), 0) @@ -1388,7 +1388,7 @@ func TestTwoListsForward(t *testing.T) { EmailOptCC(nil), EmailOptSubject("fix bug title")) forwarded := c.pollEmailBug() - c.expectEQ(forwarded.Subject, "fix bug title") + c.expectEQ(forwarded.Subject, "Forwarded: fix bug title") c.expectEQ(forwarded.Sender, sender) c.expectEQ(forwarded.To, []string{"some@list.com", "test@syzkaller.com"}) c.expectEQ(len(forwarded.Cc), 0) @@ -1423,12 +1423,14 @@ func TestForwardEmailInbox(t *testing.T) { from := "syzbot+prefixABCD@testapp.appspotmail.com" c.incomingEmail(from, "#syz invalid", + EmailOptSubject("test subject"), EmailOptMessageID(1), EmailOptFrom("someone@mail.com"), EmailOptCC([]string{"some@list.com"})) msg := c.pollEmailBug() require.NotNil(t, msg) assert.Equal(t, `"syzbot" <syzbot@testapp.appspotmail.com>`, msg.Sender) + assert.Equal(t, "Forwarded: test subject", msg.Subject) assert.ElementsMatch(t, []string{"forward@a.com", "forward@b.com"}, msg.To, "must be sent to the author and the missing lists") assert.ElementsMatch(t, []string{"\"syzbot\" <" + from + ">", "someone@mail.com"}, msg.Cc) @@ -1438,7 +1440,7 @@ forward@a.com, forward@b.com. *** -Subject: crash1 +Subject: test subject Author: someone@mail.com #syz invalid diff --git a/dashboard/app/reporting_email.go b/dashboard/app/reporting_email.go index 78db7fb90..56c956c0e 100644 --- a/dashboard/app/reporting_email.go +++ b/dashboard/app/reporting_email.go @@ -1442,7 +1442,7 @@ Author: %s Sender: from, To: mailingLists, Cc: cc, - Subject: msg.Subject, + Subject: email.ForwardedPrefix + msg.Subject, Body: body, Headers: mail.Header{"In-Reply-To": []string{inReplyTo}}, }) diff --git a/pkg/email/parser.go b/pkg/email/parser.go index 9e629ad05..63f758bd2 100644 --- a/pkg/email/parser.go +++ b/pkg/email/parser.go @@ -60,6 +60,8 @@ const ( cmdTest5 ) +const ForwardedPrefix = "Forwarded: " + var groupsLinkRe = regexp.MustCompile(`(?m)\nTo view this discussion (?:on the web )?visit` + ` (https://groups\.google\.com/.*?)\.(:?$|\n|\r)`) |