From d30fcff93686232d4c4cfa51a9f6c2b89cb5d3fc Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Wed, 23 Jul 2025 15:46:46 +0200 Subject: syz-cluster: ask to leave a credit tag Update the email template to include a suggestion to add a Tested-By tag to the affected series. --- syz-cluster/overlays/gke/prod/global-config.yaml | 1 + syz-cluster/pkg/app/config.go | 2 ++ syz-cluster/pkg/report/email_test.go | 8 +++++--- syz-cluster/pkg/report/template.txt | 8 ++++++++ syz-cluster/pkg/report/testdata/1.moderation.txt | 6 ++++++ syz-cluster/pkg/report/testdata/1.upstream.txt | 6 ++++++ syz-cluster/pkg/report/testdata/2.moderation.txt | 6 ++++++ syz-cluster/pkg/report/testdata/2.upstream.txt | 6 ++++++ 8 files changed, 40 insertions(+), 3 deletions(-) (limited to 'syz-cluster') diff --git a/syz-cluster/overlays/gke/prod/global-config.yaml b/syz-cluster/overlays/gke/prod/global-config.yaml index 3d7da0b26..d49884c85 100644 --- a/syz-cluster/overlays/gke/prod/global-config.yaml +++ b/syz-cluster/overlays/gke/prod/global-config.yaml @@ -16,6 +16,7 @@ data: name: "syzbot ci" sender: dashapi supportEmail: syzkaller@googlegroups.com + creditEmail: syzbot@syzkaller.appspotmail.com archiveList: syzbot@lists.linux.dev moderationList: syzkaller-upstream-moderation@googlegroups.com reportCc: diff --git a/syz-cluster/pkg/app/config.go b/syz-cluster/pkg/app/config.go index 8cbd022c5..015ba1222 100644 --- a/syz-cluster/pkg/app/config.go +++ b/syz-cluster/pkg/app/config.go @@ -38,6 +38,8 @@ type EmailConfig struct { DocsLink string `yaml:"docs"` // Contact email. SupportEmail string `yaml:"supportEmail"` + // The address will be suggested for the Tested-by tag. + CreditEmail string `yaml:"creditEmail"` // The means to send the emails ("smtp", "dashapi"). Sender string `yaml:"sender"` // Will be used if Sender is "smtp". diff --git a/syz-cluster/pkg/report/email_test.go b/syz-cluster/pkg/report/email_test.go index ca509d593..d9374364e 100644 --- a/syz-cluster/pkg/report/email_test.go +++ b/syz-cluster/pkg/report/email_test.go @@ -6,13 +6,14 @@ package report import ( "encoding/json" "flag" - "github.com/google/syzkaller/syz-cluster/pkg/api" - "github.com/google/syzkaller/syz-cluster/pkg/app" - "github.com/stretchr/testify/assert" "os" "path/filepath" "strings" "testing" + + "github.com/google/syzkaller/syz-cluster/pkg/api" + "github.com/google/syzkaller/syz-cluster/pkg/app" + "github.com/stretchr/testify/assert" ) var flagWrite = flag.Bool("write", false, "overwrite out.txt files") @@ -21,6 +22,7 @@ func TestRender(t *testing.T) { config := &app.EmailConfig{ Name: "syzbot", DocsLink: "http://docs/link", + CreditEmail: "credit@email.com", SupportEmail: "support@email.com", } flag.Parse() diff --git a/syz-cluster/pkg/report/template.txt b/syz-cluster/pkg/report/template.txt index 165af9d2f..2450a0ee9 100644 --- a/syz-cluster/pkg/report/template.txt +++ b/syz-cluster/pkg/report/template.txt @@ -53,6 +53,14 @@ syz repro: {{.LinkSyzRepro}} {{.Report -}} {{end}} +{{- if .Config.CreditEmail}} + +*** + +If these findings have caused you to resend the series or submit a +separate fix, please add the following tag to your commit message: +Tested-by: {{.Config.CreditEmail}} {{- end}} + --- This report is generated by a bot. It may contain errors. {{- if .Config.DocsLink}} diff --git a/syz-cluster/pkg/report/testdata/1.moderation.txt b/syz-cluster/pkg/report/testdata/1.moderation.txt index 84351f50f..55692da3b 100644 --- a/syz-cluster/pkg/report/testdata/1.moderation.txt +++ b/syz-cluster/pkg/report/testdata/1.moderation.txt @@ -45,6 +45,12 @@ Report Line D Report Line E Report Line F +*** + +If these findings have caused you to resend the series or submit a +separate fix, please add the following tag to your commit message: +Tested-by: credit@email.com + --- This report is generated by a bot. It may contain errors. See http://docs/link for more information about syzbot. diff --git a/syz-cluster/pkg/report/testdata/1.upstream.txt b/syz-cluster/pkg/report/testdata/1.upstream.txt index 75da6f026..96231fb6c 100644 --- a/syz-cluster/pkg/report/testdata/1.upstream.txt +++ b/syz-cluster/pkg/report/testdata/1.upstream.txt @@ -45,6 +45,12 @@ Report Line D Report Line E Report Line F +*** + +If these findings have caused you to resend the series or submit a +separate fix, please add the following tag to your commit message: +Tested-by: credit@email.com + --- This report is generated by a bot. It may contain errors. See http://docs/link for more information about syzbot. diff --git a/syz-cluster/pkg/report/testdata/2.moderation.txt b/syz-cluster/pkg/report/testdata/2.moderation.txt index 0693c81e1..338e1dcfc 100644 --- a/syz-cluster/pkg/report/testdata/2.moderation.txt +++ b/syz-cluster/pkg/report/testdata/2.moderation.txt @@ -28,6 +28,12 @@ Report Line A Report Line B Report Line C +*** + +If these findings have caused you to resend the series or submit a +separate fix, please add the following tag to your commit message: +Tested-by: credit@email.com + --- This report is generated by a bot. It may contain errors. See http://docs/link for more information about syzbot. diff --git a/syz-cluster/pkg/report/testdata/2.upstream.txt b/syz-cluster/pkg/report/testdata/2.upstream.txt index 04b798613..95ca8b06d 100644 --- a/syz-cluster/pkg/report/testdata/2.upstream.txt +++ b/syz-cluster/pkg/report/testdata/2.upstream.txt @@ -28,6 +28,12 @@ Report Line A Report Line B Report Line C +*** + +If these findings have caused you to resend the series or submit a +separate fix, please add the following tag to your commit message: +Tested-by: credit@email.com + --- This report is generated by a bot. It may contain errors. See http://docs/link for more information about syzbot. -- cgit mrf-deployment