bugfix in v2.4.49

Author: Yevgeny Pats

client/agent.go

@@ -108,7 +108,7 @@ func (c *FuzzitClient) runlibFuzzerMerge() error {
 		return err
 	}
 	if err := c.archiveAndUpload("merge",
-		fmt.Sprintf("orgs/%s/targets/%s/corpus.tar.gz", c.Org, c.targetId),
+		fmt.Sprintf("orgs/%s/targets/%s/corpus.tar.gz", c.Org, c.currentJob.TargetId),
 		"corpus.tar.gz"); err != nil {
 		return err
 	}
@@ -134,16 +134,16 @@ func (c *FuzzitClient) uploadCrash(exitCode int) error {
 	if _, err := os.Stat("artifact"); err == nil {
 		log.Printf("uploading crash...")
 		if err = c.uploadFile("artifact",
-			fmt.Sprintf("orgs/%s/targets/%s/crashes/%s-%s", c.Org, c.targetId, c.jobId, os.Getenv("POD_ID")),
+			fmt.Sprintf("orgs/%s/targets/%s/crashes/%s-%s", c.Org, c.currentJob.TargetId, c.jobId, os.Getenv("POD_ID")),
 			"crash"); err != nil {
 			return err
 		}
-		colRef := c.firestoreClient.Collection(fmt.Sprintf("orgs/%s/targets/%s/crashes", c.Org, c.targetId))
+		colRef := c.firestoreClient.Collection(fmt.Sprintf("orgs/%s/targets/%s/crashes", c.Org, c.currentJob.TargetId))
 		_, _, err = colRef.Add(ctx, crash{
-			TargetName: c.targetId,
+			TargetName: c.currentJob.TargetId,
 			PodId:      os.Getenv("POD_ID"),
 			JobId:      c.jobId,
-			TargetId:   c.targetId,
+			TargetId:   c.currentJob.TargetId,
 			OrgId:      c.Org,
 			ExitCode:   uint32(exitCode),
 			Type:       "CRASH",
@@ -191,7 +191,7 @@ func (c *FuzzitClient) runLibFuzzerFuzzing() error {
 				if err := c.refreshToken(); err != nil {
 					return err
 				}
-				docRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.targetId, c.jobId))
+				docRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.currentJob.TargetId, c.jobId))
 				if docRef == nil {
 					return fmt.Errorf("invalid resource")
 				}
@@ -325,7 +325,7 @@ func (c *FuzzitClient) transitionToInProgress() error {
 	job := Job{}
 	if c.updateDB {
 		// transaction doesnt work for now at go client with oauth token
-		jobRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.targetId, c.jobId))
+		jobRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.currentJob.TargetId, c.jobId))
 		docsnap, err := jobRef.Get(ctx)
 		if err != nil {
 			return err
@@ -352,7 +352,7 @@ func (c *FuzzitClient) transitionStatus(status string) error {
 	}
 
 	// transaction doesnt work for now at go client with oauth token
-	jobRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.targetId, c.jobId))
+	jobRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.currentJob.TargetId, c.jobId))
 	_, err := jobRef.Update(ctx, []firestore.Update{{Path: "status", Value: status}})
 	if err != nil {
 		return err
@@ -403,7 +403,7 @@ func (c *FuzzitClient) RunJQFFuzzing() error {
 				if err := c.refreshToken(); err != nil {
 					return err
 				}
-				docRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.targetId, c.jobId))
+				docRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.currentJob.TargetId, c.jobId))
 				if docRef == nil {
 					return fmt.Errorf("invalid resource")
 				}

client/client.go

@@ -8,12 +8,7 @@ import (
 )
 
 const FuzzitEndpoint = "https://app.fuzzit.dev"
-const Version = "v2.4.49"
-
-const (
-	libFuzzerEngine = "libFuzzerEngine"
-	JQFEngine       = "JQF"
-)
+const Version = "v2.4.50"
 
 type Target struct {
 	Name         string `firestore:"target_name"`
@@ -61,7 +56,6 @@ type FuzzitClient struct {
 	firestoreClient *firestore.Client
 	httpClient      *http.Client
 	currentJob      Job    // this is mainly used by the agent
-	targetId        string // this is mainly used by the agent
 	jobId           string // this is mainly used by the agent
 	updateDB        bool   // this is mainly used by the agent
 	fuzzerFilename  string // this is mainly used by the agent

client/commands.go

@@ -229,6 +229,7 @@ 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(
@@ -246,7 +247,7 @@ func (c *FuzzitClient) CreateLocalJob(jobConfig Job, files []string) error {
 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, c.targetId),
+./fuzzit run --type regression %s %s`, Version, c.Org, jobConfig.TargetId),
 			},
 			AttachStdin: true,
 		},