dashboard/app/getjson_test.go

@@ -6,6 +6,8 @@ package main
 import (
 	"fmt"
 	"testing"
+
+	"github.com/google/syzkaller/dashboard/dashapi"
 )
 
 func TestJSONAPIIntegration(t *testing.T) {
@@ -39,6 +41,25 @@ func TestJSONAPIIntegration(t *testing.T) {
 }`,
 	)
 
+	sampleOpenBugGroupDescr := []byte(`{
+	"version": 1,
+	"Bugs": [
+		{
+			"title": "title1",
+			"link": "/bug?extid=decf42d66dced481afc1"
+		},
+		{
+			"title": "title2",
+			"link": "/bug?extid=0267d1c87b9ed4eb5def"
+		}
+	]
+}`)
+
+	sampleFixedBugGroupDescr := []byte(`{
+	"version": 1,
+	"Bugs": null
+}`)
+
 	c := NewCtx(t)
 	defer c.Close()
 
@@ -56,6 +77,9 @@ func TestJSONAPIIntegration(t *testing.T) {
 	c.client.ReportCrash(crash2)
 	bugReport2 := c.client.pollBug()
 	checkBugPageJSONIs(c, bugReport2.ID, sampleCrashWithReproDescr)
+
+	checkBugGroupPageJSONIs(c, "/test1?json=1", sampleOpenBugGroupDescr)
+	checkBugGroupPageJSONIs(c, "/test1/fixed?json=1", sampleFixedBugGroupDescr)
 }
 
 func checkBugPageJSONIs(c *Ctx, ID string, expectedContent []byte) {
@@ -67,3 +91,59 @@ func checkBugPageJSONIs(c *Ctx, ID string, expectedContent []byte) {
 	actualContent, _ := c.client.GET(url)
 	c.expectEQ(string(actualContent), string(expectedContent))
 }
+
+func checkBugGroupPageJSONIs(c *Ctx, url string, expectedContent []byte) {
+	contentType, _ := c.client.ContentType(url)
+	c.expectEQ(contentType, "application/json")
+
+	actualContent, _ := c.client.GET(url)
+	c.expectEQ(string(actualContent), string(expectedContent))
+}
+
+func TestJSONAPIFixCommits(t *testing.T) {
+	c := NewCtx(t)
+	defer c.Close()
+
+	build1 := testBuild(1)
+	c.client.UploadBuild(build1)
+
+	crash1 := testCrash(build1, 1)
+	c.client.ReportCrash(crash1)
+	rep1 := c.client.pollBug()
+
+	// Specify fixing commit for the bug.
+	c.client.ReportingUpdate(&dashapi.BugUpdate{
+		ID:         rep1.ID,
+		Status:     dashapi.BugStatusOpen,
+		FixCommits: []string{"foo: fix1", "foo: fix2"},
+	})
+
+	c.client.UploadCommits([]dashapi.Commit{
+		{Hash: "hash1", Title: "foo: fix1"},
+	})
+
+	c.client.CommitPoll()
+
+	want := []byte(`{
+	"version": 1,
+	"title": "title1",
+	"fix-commits": [
+		{
+			"title": "foo: fix1",
+			"hash": "hash1"
+		},
+		{
+			"title": "foo: fix2"
+		}
+	],
+	"crashes": [
+		{
+			"kernel-config": "/text?tag=KernelConfig\u0026x=a989f27ebc47e2dc",
+			"kernel-source-commit": "1111111111111111111111111111111111111111",
+			"syzkaller-git": "https://github.com/google/syzkaller/commits/syzkaller_commit1",
+			"syzkaller-commit": "syzkaller_commit1"
+		}
+	]
+}`)
+	checkBugGroupPageJSONIs(c, "/bug?extid=decf42d66dced481afc1&json=1", want)
+}

dashboard/app/main.go

@@ -5,7 +5,6 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"html/template"
 	"net/http"
@@ -463,6 +462,12 @@ func handleMain(c context.Context, w http.ResponseWriter, r *http.Request) error
 		Managers:       makeManagerList(managers, hdr.Namespace),
 		BugFilter:      makeUIBugFilter(c, filter),
 	}
+
+	if isJSONRequested(r) {
+		w.Header().Set("Content-Type", "application/json")
+		return writeJSONVersionOf(w, data)
+	}
+
 	return serveTemplate(w, "main.html", data)
 }
 
@@ -598,6 +603,12 @@ func handleTerminalBugList(c context.Context, w http.ResponseWriter, r *http.Req
 		Stats:     stats,
 		BugFilter: makeUIBugFilter(c, typ.Filter),
 	}
+
+	if isJSONRequested(r) {
+		w.Header().Set("Content-Type", "application/json")
+		return writeJSONVersionOf(w, data)
+	}
+
 	return serveTemplate(w, "terminal.html", data)
 }
 
@@ -1024,11 +1035,8 @@ func isJSONRequested(request *http.Request) bool {
 	return request.FormValue("json") == "1"
 }
 
-func writeJSONVersionOf(writer http.ResponseWriter, bugPage *uiBugPage) error {
-	data, err := json.MarshalIndent(
-		GetExtAPIDescrForBugPage(bugPage),
-		"",
-		"\t")
+func writeJSONVersionOf(writer http.ResponseWriter, page interface{}) error {
+	data, err := GetJSONDescrFor(page)
 	if err != nil {
 		return err
 	}

dashboard/app/public_json_api.go

@@ -3,15 +3,26 @@
 
 package main
 
+import "encoding/json"
+
 // publicApiBugDescription is used to serve the /bug HTTP requests
 // and provide JSON description of the BUG. Backward compatible.
-type PublicAPIBugDescription struct {
-	Version int                         `json:"version"`
-	Title   string                      `json:"title,omitempty"`
-	Crashes []PublicAPICrashDescription `json:"crashes,omitempty"`
+type publicAPIBugDescription struct {
+	Version    int         `json:"version"`
+	Title      string      `json:"title,omitempty"`
+	FixCommits []fixCommit `json:"fix-commits,omitempty"`
+	// links to the discussions
+	Discussions []string                    `json:"discussions,omitempty"`
+	Crashes     []publicAPICrashDescription `json:"crashes,omitempty"`
+}
+
+type fixCommit struct {
+	Title string `json:"title"`
+	Link  string `json:"link,omitempty"`
+	Hash  string `json:"hash,omitempty"`
 }
 
-type PublicAPICrashDescription struct {
+type publicAPICrashDescription struct {
 	SyzReproducer       string `json:"syz-reproducer,omitempty"`
 	CReproducer         string `json:"c-reproducer,omitempty"`
 	KernelConfig        string `json:"kernel-config,omitempty"`
@@ -23,12 +34,32 @@ type PublicAPICrashDescription struct {
 	Architecture        string `json:"architecture,omitempty"`
 }
 
-func GetExtAPIDescrForBugPage(bugPage *uiBugPage) *PublicAPIBugDescription {
+func getExtAPIDescrForBugPage(bugPage *uiBugPage) *publicAPIBugDescription {
 	crash := bugPage.Crashes.Crashes[0]
-	return &PublicAPIBugDescription{
+	return &publicAPIBugDescription{
 		Version: 1,
 		Title:   bugPage.Bug.Title,
-		Crashes: []PublicAPICrashDescription{{
+		Discussions: func() []string {
+			if bugPage.Bug.ExternalLink == "" {
+				return nil
+			}
+			return []string{bugPage.Bug.ExternalLink}
+		}(),
+		FixCommits: func() []fixCommit {
+			if len(bugPage.Bug.Commits) == 0 {
+				return nil
+			}
+			var res []fixCommit
+			for _, commit := range bugPage.Bug.Commits {
+				res = append(res, fixCommit{
+					Title: commit.Title,
+					Hash:  commit.Hash,
+					Link:  commit.Link,
+				})
+			}
+			return res
+		}(),
+		Crashes: []publicAPICrashDescription{{
 			SyzReproducer:      crash.ReproSyzLink,
 			CReproducer:        crash.ReproCLink,
 			KernelConfig:       crash.KernelConfigLink,
@@ -41,3 +72,47 @@ func GetExtAPIDescrForBugPage(bugPage *uiBugPage) *PublicAPIBugDescription {
 		}},
 	}
 }
+
+type publicAPIBugGroup struct {
+	Version int `json:"version"`
+	Bugs    []publicAPIBug
+}
+
+type publicAPIBug struct {
+	Title       string `json:"title,omitempty"`
+	Link        string `json:"link"`
+	LastUpdated string `json:"last-updated,omitempty"`
+}
+
+func getExtAPIDescrForBugGroups(bugGroups []*uiBugGroup) *publicAPIBugGroup {
+	return &publicAPIBugGroup{
+		Version: 1,
+		Bugs: func() []publicAPIBug {
+			var res []publicAPIBug
+			for _, group := range bugGroups {
+				for _, bug := range group.Bugs {
+					res = append(res, publicAPIBug{
+						Title: bug.Title,
+						Link:  bug.Link,
+					})
+				}
+			}
+			return res
+		}(),
+	}
+}
+
+func GetJSONDescrFor(page interface{}) ([]byte, error) {
+	var res interface{}
+	switch i := page.(type) {
+	case *uiBugPage:
+		res = getExtAPIDescrForBugPage(i)
+	case *uiTerminalPage:
+		res = getExtAPIDescrForBugGroups([]*uiBugGroup{i.Bugs})
+	case *uiMainPage:
+		res = getExtAPIDescrForBugGroups(i.Groups)
+	default:
+		return nil, ErrClientNotFound
+	}
+	return json.MarshalIndent(res, "", "\t")
+}

executor/common_linux.h

@@ -5580,6 +5580,7 @@ static long syz_pkey_set(volatile long pkey, volatile long val)
 
 #if SYZ_EXECUTOR || SYZ_SWAP
 #include <fcntl.h>
+#include <linux/falloc.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>

pkg/csource/generated.go

@@ -11767,6 +11767,7 @@ static long syz_pkey_set(volatile long pkey, volatile long val)
 
 #if SYZ_EXECUTOR || SYZ_SWAP
 #include <fcntl.h>
+#include <linux/falloc.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>