jqf bugfixes. bumpt to v2.4.51

Author: Yevgeny Pats

client/agent.go

@@ -21,6 +21,9 @@ const (
 	libFuzzerOOMExitCode     = -9
 	libFuzzerSuccessExitCode = 0
 
+	jqfCrashExitCode   = 3
+	jqfSuccessExitCode = 0
+
 	fuzzingInterval = 3600
 )
 
@@ -44,6 +47,20 @@ func libFuzzerExitCodeToStatus(exitCode int) string {
 	return status
 }
 
+func jqfExitCodeToStatus(exitCode int) string {
+	status := "pass"
+	switch exitCode {
+	case jqfCrashExitCode:
+		status = "crash"
+	case jqfSuccessExitCode:
+		status = "pass"
+	default:
+		status = "failed"
+	}
+
+	return status
+}
+
 func appendPrefixToCmd(cmd *exec.Cmd) error {
 	stderr, err := cmd.StderrPipe()
 	if err != nil {
@@ -371,7 +388,7 @@ func (c *FuzzitClient) RunJQFFuzzing() error {
 		"-jar",
 		"zest-cli.jar",
 		"--exit-on-crash",
-		"--exact-crash-path=crash",
+		"--exact-crash-path=artifact",
 		"--libfuzzer-compat-output",
 		"fuzzer",
 	}
@@ -458,7 +475,7 @@ func (c *FuzzitClient) RunJQFFuzzing() error {
 		return err
 	}
 
-	err = c.transitionStatus(libFuzzerExitCodeToStatus(exitCode))
+	err = c.transitionStatus(jqfExitCodeToStatus(exitCode))
 	if err != nil {
 		return err
 	}

client/client.go

@@ -8,7 +8,7 @@ import (
 )
 
 const FuzzitEndpoint = "https://app.fuzzit.dev"
-const Version = "v2.4.50"
+const Version = "v2.4.51"
 
 type Target struct {
 	Name         string `firestore:"target_name"`

client/commands.go

@@ -206,21 +206,8 @@ func (c *FuzzitClient) CreateLocalJob(jobConfig Job, files []string) error {
 		return err
 	}
 
-	log.Println("Pulling container")
-	image := HostToDocker[jobConfig.Host]
-	if image == "" {
-		if jobConfig.Host == "" {
-			if jobConfig.Engine == "jqf" {
-				image = "openjdk:stretch"
-			} else {
-				image = "gcr.io/fuzzit-public/stretch-llvm8:64bdedf"
-			}
-		} else {
-			image = jobConfig.Host
-		}
-	}
-	log.Printf("running regression in image: %s\n", image)
-	reader, err := cli.ImagePull(ctx, image, types.ImagePullOptions{})
+	log.Printf("Pulling container %s\n", jobConfig.Host)
+	reader, err := cli.ImagePull(ctx, jobConfig.Host, types.ImagePullOptions{})
 	if err != nil {
 		return err
 	}
@@ -229,7 +216,6 @@ func (c *FuzzitClient) CreateLocalJob(jobConfig Job, files []string) error {
 		return err
 	}
 	log.Println("Creating container")
-	log.Printf("org=%s\n", c.Org)
 	createdContainer, err := cli.ContainerCreate(ctx,
 		&container.Config{
 			Env: append(
@@ -239,15 +225,16 @@ func (c *FuzzitClient) CreateLocalJob(jobConfig Job, files []string) error {
 					"FUZZIT_API_KEY=" + c.ApiKey,
 				},
 				jobConfig.EnvironmentVariables...),
-			Image: image,
+			Image:      jobConfig.Host,
+			WorkingDir: "/app",
 			Cmd: []string{
 				"/bin/sh",
 				"-c",
 				fmt.Sprintf(`cd /app
 echo "Downloading fuzzit cli/agent..."
 wget -q -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/download/%s/fuzzit_Linux_x86_64
 chmod a+x fuzzit
-./fuzzit run --type regression %s %s`, Version, c.Org, jobConfig.TargetId),
+./fuzzit run --engine "%s" --type regression --args "%s" %s %s`, Version, jobConfig.Engine, jobConfig.Args, c.Org, jobConfig.TargetId),
 			},
 			AttachStdin: true,
 		},

client/commands_test.go

@@ -85,6 +85,7 @@ func TestCreateLocalJob(t *testing.T) {
 		t.Run(fmt.Sprintf("target:%s, err:%s", tc.target, tc.err), func(t *testing.T) {
 			newJob.Type = "regression"
 			newJob.TargetId = tc.target
+			newJob.Host = "gcr.io/fuzzit-public/stretch-llvm8:64bdedf"
 			err := tc.client.CreateLocalJob(newJob, []string{"testdata/fuzzer.tar.gz"})
 			if err != nil {
 				if err.Error() != tc.err {

cmd/job.go

@@ -41,6 +41,20 @@ var jobCmd = &cobra.Command{
 			log.Fatalf("--engine should be either libfuzzer or jqf. Recieved: %s", newJob.Type)
 		}
 
+		image := client.HostToDocker[newJob.Host]
+		if image == "" {
+			if newJob.Host == "" {
+				if newJob.Engine == "jqf" {
+					image = "openjdk:stretch"
+				} else {
+					image = "gcr.io/fuzzit-public/stretch-llvm8:64bdedf"
+				}
+			} else {
+				image = newJob.Host
+			}
+		}
+		newJob.Host = image
+
 		skipIfNotExist, err := cmd.Flags().GetBool("skip-if-not-exists")
 		if err != nil {
 			log.Fatal(err)
@@ -97,7 +111,7 @@ func init() {
 	jobCmd.Flags().Uint16Var(&newJob.Parallelism, "cpus", 1, "number of cpus to use (only relevant for fuzzing job)")
 	jobCmd.Flags().StringVar(&newJob.Revision, "revision", revision, "Revision tag of fuzzer (populates automatically from git,travis,circleci)")
 	jobCmd.Flags().StringVar(&newJob.Branch, "branch", branch, "Branch of the fuzzer (populates automatically from git,travis,circleci)")
-	jobCmd.Flags().StringVar(&newJob.Host, "host", "stretch-llvm8", "docker image to use when running the fuzzer. Options: stretch-llvm8/stretch-llvm9/bionic-swift51")
+	jobCmd.Flags().StringVar(&newJob.Host, "host", "", "docker image to use when running the fuzzer. Options: stretch-llvm8/stretch-llvm9/bionic-swift51")
 	jobCmd.Flags().StringArrayVarP(&newJob.EnvironmentVariables, "environment", "e", nil,
 		"Additional environment variables for the fuzzer. For example ASAN_OPTINOS, UBSAN_OPTIONS or any other")
 	jobCmd.Flags().StringVar(&newJob.Args, "args", "", "Additional runtime args for the fuzzer")