reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-10-07 00:53:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkg/mgrconfig: do not serialize optional fields

Browse Source 
Since we now show manager config on web page, make it leaner.
This commit is contained in:
Dmitry Vyukov 2019-01-16 14:49:47 +01:00
parent 025b20b5cb
commit d538790b53
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/config/config.go
View File

@ -64,6 +64,7 @@ func checkUnknownFieldsRec(data []byte, prefix string, typ reflect.Type) error {
for i := 0; i < typ.NumField(); i++ { for i := 0; i < typ.NumField(); i++ {
field := typ.Field(i) field := typ.Field(i)
tag := field.Tag.Get("json") tag := field.Tag.Get("json")
tag = strings.TrimSuffix(tag, ",omitempty")
if tag == "-" { if tag == "-" {
continue continue
} }

34
pkg/mgrconfig/mgrconfig.go
View File

@ -25,31 +25,31 @@ type Config struct {
// TCP address to serve HTTP stats page (e.g. "localhost:50000"). // TCP address to serve HTTP stats page (e.g. "localhost:50000").
HTTP string `json:"http"` HTTP string `json:"http"`
// TCP address to serve RPC for fuzzer processes (optional). // TCP address to serve RPC for fuzzer processes (optional).
RPC string `json:"rpc"` RPC string `json:"rpc,omitempty"`
Workdir string `json:"workdir"` Workdir string `json:"workdir"`
// Directory with kernel object files. // Directory with kernel object files.
KernelObj string `json:"kernel_obj"` KernelObj string `json:"kernel_obj"`
// Kernel source directory (if not set defaults to KernelObj). // Kernel source directory (if not set defaults to KernelObj).
KernelSrc string `json:"kernel_src"` KernelSrc string `json:"kernel_src,omitempty"`
// Arbitrary optional tag that is saved along with crash reports (e.g. branch/commit). // Arbitrary optional tag that is saved along with crash reports (e.g. branch/commit).
Tag string `json:"tag"` Tag string `json:"tag,omitempty"`
// Linux image for VMs. // Linux image for VMs.
Image string `json:"image"` Image string `json:"image,omitempty"`
// SSH key for the image (may be empty for some VM types). // SSH key for the image (may be empty for some VM types).
SSHKey string `json:"sshkey"` SSHKey string `json:"sshkey,omitempty"`
// SSH user ("root" by default). // SSH user ("root" by default).
SSHUser string `json:"ssh_user"` SSHUser string `json:"ssh_user,omitempty"`
HubClient string `json:"hub_client"` HubClient string `json:"hub_client,omitempty"`
HubAddr string `json:"hub_addr"` HubAddr string `json:"hub_addr,omitempty"`
HubKey string `json:"hub_key"` HubKey string `json:"hub_key,omitempty"`
// syz-manager will send crash emails to this list of emails using mailx (optional). // syz-manager will send crash emails to this list of emails using mailx (optional).
EmailAddrs []string `json:"email_addrs"` EmailAddrs []string `json:"email_addrs,omitempty"`
DashboardClient string `json:"dashboard_client"` DashboardClient string `json:"dashboard_client,omitempty"`
DashboardAddr string `json:"dashboard_addr"` DashboardAddr string `json:"dashboard_addr,omitempty"`
DashboardKey string `json:"dashboard_key"` DashboardKey string `json:"dashboard_key,omitempty"`
// Path to syzkaller checkout (syz-manager will look for binaries in bin subdir). // Path to syzkaller checkout (syz-manager will look for binaries in bin subdir).
Syzkaller string `json:"syzkaller"` Syzkaller string `json:"syzkaller"`
@ -70,14 +70,14 @@ type Config struct {
// Reproduce, localize and minimize crashers (default: true). // Reproduce, localize and minimize crashers (default: true).
Reproduce bool `json:"reproduce"` Reproduce bool `json:"reproduce"`
EnabledSyscalls []string `json:"enable_syscalls"` EnabledSyscalls []string `json:"enable_syscalls,omitempty"`
DisabledSyscalls []string `json:"disable_syscalls"` DisabledSyscalls []string `json:"disable_syscalls,omitempty"`
// Don't save reports matching these regexps, but reboot VM after them, // Don't save reports matching these regexps, but reboot VM after them,
// matched against whole report output. // matched against whole report output.
Suppressions []string `json:"suppressions"` Suppressions []string `json:"suppressions,omitempty"`
// Completely ignore reports matching these regexps (don't save nor reboot), // Completely ignore reports matching these regexps (don't save nor reboot),
// must match the first line of crash message. // must match the first line of crash message.
Ignores []string `json:"ignores"` Ignores []string `json:"ignores,omitempty"`
// VM type (qemu, gce, android, isolated, etc). // VM type (qemu, gce, android, isolated, etc).
Type string `json:"type"` Type string `json:"type"`