Skip to content

Commit 3a8df82

Browse files
committed
syz-cluster: configure a Cc list for reported bugs
Cc syzkaller-bugs@googlegroups.com in all upstreamed syzbot ci findings.
1 parent bff2599 commit 3a8df82

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed

syz-cluster/email-reporter/handler.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ func (h *Handler) report(ctx context.Context, rep *api.SessionReport) error {
8989
// We assume that email reporting is used for series received over emails.
9090
toSend.InReplyTo = rep.Series.ExtID
9191
toSend.To = rep.Series.Cc
92+
toSend.Cc = append(toSend.Cc, h.emailConfig.ReportCC...)
9293
}
9394
msgID, err := h.sender(ctx, toSend)
9495
if err != nil {

syz-cluster/email-reporter/handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestModerationReportFlow(t *testing.T) {
5757
receivedEmail.Body = nil
5858
assert.Equal(t, &emailclient.Email{
5959
To: testSeries.Cc,
60-
Cc: []string{testEmailConfig.ArchiveList},
60+
Cc: append([]string{testEmailConfig.ArchiveList}, testEmailConfig.ReportCC...),
6161
Subject: "[name] Re: " + testSeries.Title,
6262
InReplyTo: testSeries.ExtID,
6363
BugID: report.ID,

syz-cluster/overlays/gke/prod/global-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ data:
1818
supportEmail: syzkaller@googlegroups.com
1919
archiveList: syzbot@lists.linux.dev
2020
moderationList: syzkaller-upstream-moderation@googlegroups.com
21+
reportCc:
22+
- syzkaller-bugs@googlegroups.com
2123
loreArchiveURL: https://lore.kernel.org/syzbot/0
2224
dashapiConfig:
2325
addr: https://syzkaller.appspot.com

syz-cluster/pkg/app/config.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ type EmailConfig struct {
4646
Dashapi *DashapiConfig `yaml:"dashapiConfig"`
4747
// Moderation requests will be sent there.
4848
ModerationList string `yaml:"moderationList"`
49-
// The list we listen on.
49+
// The list email-reporter listens on.
5050
ArchiveList string `yaml:"archiveList"`
51+
// The lists/emails to be Cc'd for actual reports (not moderation).
52+
ReportCC []string `yaml:"reportCc"`
5153
// Lore git archive to poll for incoming messages.
5254
LoreArchiveURL string `yaml:"loreArchiveURL"`
5355
// The prefix which will be added to all reports' titles.

syz-cluster/pkg/emailclient/sender.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func TestEmailConfig() *app.EmailConfig {
6060
Name: "name",
6161
DocsLink: "docs",
6262
ModerationList: "moderation@list.com",
63+
ReportCC: []string{"reported@list.com"},
6364
ArchiveList: "archive@list.com",
6465
Sender: app.SenderSMTP,
6566
SMTP: &app.SMTPConfig{

0 commit comments

Comments
 (0)