diff options
| -rw-r--r-- | syz-cluster/email-reporter/handler.go | 1 | ||||
| -rw-r--r-- | syz-cluster/email-reporter/handler_test.go | 2 | ||||
| -rw-r--r-- | syz-cluster/overlays/gke/prod/global-config.yaml | 2 | ||||
| -rw-r--r-- | syz-cluster/pkg/app/config.go | 4 | ||||
| -rw-r--r-- | syz-cluster/pkg/emailclient/sender.go | 1 |
5 files changed, 8 insertions, 2 deletions
diff --git a/syz-cluster/email-reporter/handler.go b/syz-cluster/email-reporter/handler.go index c0af2e7d7..5cfd9dbb3 100644 --- a/syz-cluster/email-reporter/handler.go +++ b/syz-cluster/email-reporter/handler.go @@ -89,6 +89,7 @@ func (h *Handler) report(ctx context.Context, rep *api.SessionReport) error { // We assume that email reporting is used for series received over emails. toSend.InReplyTo = rep.Series.ExtID toSend.To = rep.Series.Cc + toSend.Cc = append(toSend.Cc, h.emailConfig.ReportCC...) } msgID, err := h.sender(ctx, toSend) if err != nil { diff --git a/syz-cluster/email-reporter/handler_test.go b/syz-cluster/email-reporter/handler_test.go index 21ea14149..d26002764 100644 --- a/syz-cluster/email-reporter/handler_test.go +++ b/syz-cluster/email-reporter/handler_test.go @@ -57,7 +57,7 @@ func TestModerationReportFlow(t *testing.T) { receivedEmail.Body = nil assert.Equal(t, &emailclient.Email{ To: testSeries.Cc, - Cc: []string{testEmailConfig.ArchiveList}, + Cc: append([]string{testEmailConfig.ArchiveList}, testEmailConfig.ReportCC...), Subject: "[name] Re: " + testSeries.Title, InReplyTo: testSeries.ExtID, BugID: report.ID, diff --git a/syz-cluster/overlays/gke/prod/global-config.yaml b/syz-cluster/overlays/gke/prod/global-config.yaml index 479d80cfd..3d7da0b26 100644 --- a/syz-cluster/overlays/gke/prod/global-config.yaml +++ b/syz-cluster/overlays/gke/prod/global-config.yaml @@ -18,6 +18,8 @@ data: supportEmail: syzkaller@googlegroups.com archiveList: syzbot@lists.linux.dev moderationList: syzkaller-upstream-moderation@googlegroups.com + reportCc: + - syzkaller-bugs@googlegroups.com loreArchiveURL: https://lore.kernel.org/syzbot/0 dashapiConfig: addr: https://syzkaller.appspot.com diff --git a/syz-cluster/pkg/app/config.go b/syz-cluster/pkg/app/config.go index 38cea5e8a..8cbd022c5 100644 --- a/syz-cluster/pkg/app/config.go +++ b/syz-cluster/pkg/app/config.go @@ -46,8 +46,10 @@ type EmailConfig struct { Dashapi *DashapiConfig `yaml:"dashapiConfig"` // Moderation requests will be sent there. ModerationList string `yaml:"moderationList"` - // The list we listen on. + // The list email-reporter listens on. ArchiveList string `yaml:"archiveList"` + // The lists/emails to be Cc'd for actual reports (not moderation). + ReportCC []string `yaml:"reportCc"` // Lore git archive to poll for incoming messages. LoreArchiveURL string `yaml:"loreArchiveURL"` // The prefix which will be added to all reports' titles. diff --git a/syz-cluster/pkg/emailclient/sender.go b/syz-cluster/pkg/emailclient/sender.go index 5bfd86823..33a781d85 100644 --- a/syz-cluster/pkg/emailclient/sender.go +++ b/syz-cluster/pkg/emailclient/sender.go @@ -60,6 +60,7 @@ func TestEmailConfig() *app.EmailConfig { Name: "name", DocsLink: "docs", ModerationList: "moderation@list.com", + ReportCC: []string{"reported@list.com"}, ArchiveList: "archive@list.com", Sender: app.SenderSMTP, SMTP: &app.SMTPConfig{ |