Add a generic environment flag for creating jobs

Author: Yevgeny Pats

README.md

@@ -32,6 +32,8 @@ go get -v -u github.com/fuzzitdev/fuzzit/...
 
 ```bash
 brew install fuzzitdev/tap/fuzzit
+# After initial install you can upgrade the version via:
+brew upgrade fuzzit
 ```
 
 ## Compilation

client/client.go

@@ -18,16 +18,15 @@ type Target struct {
 }
 
 type Job struct {
-	TargetId     string `firestore:"target_id"`
-	Args         string `firestore:"args"`
-	Local        bool
-	Type         string `firestore:"type"`
-	Host         string `firestore:"host"`
-	Revision     string `firestore:"revision"`
-	Branch       string `firestore:"branch"`
-	Parallelism  uint16 `firestore:"parallelism"`
-	AsanOptions  string `firestore:"asan_options"`
-	UbsanOptions string `firestore:"ubsan_options"`
+	TargetId             string `firestore:"target_id"`
+	Args                 string `firestore:"args"`
+	Local                bool
+	Type                 string   `firestore:"type"`
+	Host                 string   `firestore:"host"`
+	Revision             string   `firestore:"revision"`
+	Branch               string   `firestore:"branch"`
+	Parallelism          uint16   `firestore:"parallelism"`
+	EnvironmentVariables []string `firestore:"environment_variables"`
 }
 
 // Internal struct

client/commands.go

@@ -249,16 +249,15 @@ func (c *FuzzitClient) CreateLocalJob(jobConfig Job, files []string) error {
 	if err != nil {
 		return err
 	}
-
 	log.Println("Creating container")
 	createdContainer, err := cli.ContainerCreate(ctx, &container.Config{
-		Env: []string{
-			"CORPUS_LINK=" + corpusLink,
-			"SEED_LINK=" + seedLink,
-			"ASAN_OPTIONS=" + jobConfig.AsanOptions,
-			"UBSAN_OPTIONS=" + jobConfig.UbsanOptions,
-			"ARGS=" + jobConfig.Args,
-			"LD_LIBRARY_PATH=/app"},
+		Env: append(
+			[]string{
+				"CORPUS_LINK=" + corpusLink,
+				"SEED_LINK=" + seedLink,
+				"ARGS=" + jobConfig.Args,
+				"LD_LIBRARY_PATH=/app"},
+			jobConfig.EnvironmentVariables...),
 		Image:       "docker.io/fuzzitdev/fuzzit:stretch-llvm8",
 		Cmd:         []string{"/bin/sh", "/app/run.sh"},
 		AttachStdin: true,

cmd/job.go

@@ -70,7 +70,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 tag of fuzzer")
 	jobCmd.Flags().StringVar(&newJob.Branch, "branch", "", "Branch of the fuzzer")
-	jobCmd.Flags().StringVar(&newJob.AsanOptions, "asan_options", "", "Additional args to ASAN_OPTIONS env VARIABLE")
-	jobCmd.Flags().StringVar(&newJob.UbsanOptions, "ubsan_options", "", "Additional args to UBSAN_OPTIONS env VARIABLE")
+	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")
 }

cmd/root.go

@@ -30,7 +30,7 @@ var gFuzzitClient *client.FuzzitClient
 var rootCmd = &cobra.Command{
 	Use:     "fuzzit",
 	Short:   "Continuous fuzzing made simple CLI",
-	Version: "2.4.17",
+	Version: "2.4.18",
 }
 
 func Execute() {