Add error handling to refresh token

Author: Yevgeny Pats

client/agent.go

@@ -109,7 +109,9 @@ func (c *FuzzitClient) runlibFuzzerMerge() error {
 		return err
 	}
 
-	c.refreshToken()
+	if err := c.refreshToken(true); err != nil {
+		return err
+	}
 	if err := c.archiveAndUpload("merge",
 		fmt.Sprintf("orgs/%s/targets/%s/corpus.tar.gz", c.Org, c.targetId),
 		"corpus.tar.gz"); err != nil {
@@ -191,7 +193,9 @@ func (c *FuzzitClient) runLibFuzzerFuzzing() error {
 			select {
 			case <-timeout:
 				var fuzzingJob job
-				c.refreshToken()
+				if err := c.refreshToken(true); err != nil {
+					return err
+				}
 				docRef := c.firestoreClient.Doc(fmt.Sprintf("orgs/%s/targets/%s/jobs/%s", c.Org, c.targetId, c.jobId))
 				if docRef == nil {
 					return fmt.Errorf("invalid resource")
@@ -239,7 +243,9 @@ func (c *FuzzitClient) runLibFuzzerFuzzing() error {
 		}
 	}
 
-	c.refreshToken()
+	if err := c.refreshToken(true); err != nil {
+		return err
+	}
 	err = c.uploadCrash(exitCode)
 	if err != nil {
 		return err
@@ -361,19 +367,22 @@ func (c *FuzzitClient) transitionStatus(status string) error {
 }
 
 func (c *FuzzitClient) RunLibFuzzer(targetId string, jobId string, updateDB bool, fuzzingType string) error {
-	err := c.refreshToken()
+	if err := c.refreshToken(true); err != nil {
+		return err
+	}
+
 	c.targetId = targetId
 	c.jobId = jobId
 	c.updateDB = updateDB
 
-	if err = c.transitionToInProgress(); err != nil {
+	if err := c.transitionToInProgress(); err != nil {
 		return err
 	}
 
-	if err = os.Mkdir("corpus", 0644); err != nil {
+	if err := os.Mkdir("corpus", 0644); err != nil {
 		return err
 	}
-	if err = os.Mkdir("seed", 0644); err != nil {
+	if err := os.Mkdir("seed", 0644); err != nil {
 		return err
 	}
 
@@ -411,6 +420,7 @@ func (c *FuzzitClient) RunLibFuzzer(targetId string, jobId string, updateDB bool
 		}
 	}
 
+	var err error
 	if fuzzingType == "regression" {
 		err = c.runLibFuzzerRegression()
 	} else {

client/auth.go

@@ -15,8 +15,8 @@ import (
 	"google.golang.org/api/option"
 )
 
-func (c *FuzzitClient) refreshToken() error {
-	if c.IdToken == "" || (time.Now().Unix()-c.LastRefresh) > 60*45 {
+func (c *FuzzitClient) refreshToken(force bool) error {
+	if c.IdToken == "" || (time.Now().Unix()-c.LastRefresh) > 60*45 || force {
 		createCustomTokenEndpoint := fmt.Sprintf("%s/createCustomToken?api_key=%s", FuzzitEndpoint, url.QueryEscape(c.ApiKey))
 		r, err := c.httpClient.Get(createCustomTokenEndpoint)
 		if err != nil {

client/client.go

@@ -10,7 +10,7 @@ import (
 )
 
 const FuzzitEndpoint = "https://app.fuzzit.dev"
-const Version = "v2.4.43"
+const Version = "v2.4.44"
 
 type Target struct {
 	Name         string `firestore:"target_name"`
@@ -73,7 +73,7 @@ func NewFuzzitClient(apiKey string) (*FuzzitClient, error) {
 	c := &FuzzitClient{}
 	c.httpClient = &http.Client{Timeout: 60 * time.Second}
 	c.ApiKey = apiKey
-	err := c.refreshToken()
+	err := c.refreshToken(false)
 	if err != nil {
 		return nil, err
 	}

client/commands.go

@@ -121,7 +121,7 @@ func (c *FuzzitClient) DownloadFuzzer(dst string, target string, job string) err
 }
 
 func (c *FuzzitClient) GetResource(resource string) error {
-	err := c.refreshToken()
+	err := c.refreshToken(false)
 	if err != nil {
 		return err
 	}
@@ -178,7 +178,7 @@ func (c *FuzzitClient) GetResource(resource string) error {
 }
 
 func (c *FuzzitClient) CreateTarget(target Target, seedPath string, skipIsExists bool) (*firestore.DocumentRef, error) {
-	err := c.refreshToken()
+	err := c.refreshToken(false)
 	if err != nil {
 		return nil, err
 	}
@@ -322,7 +322,7 @@ chmod a+x fuzzit
 }
 
 func (c *FuzzitClient) CreateJob(jobConfig Job, files []string) (*firestore.DocumentRef, error) {
-	err := c.refreshToken()
+	err := c.refreshToken(false)
 	if err != nil {
 		return nil, err
 	}