sarif timeout added

Author: ginilpg

appknox/sarif_generator.go

@@ -90,7 +90,7 @@ type Help struct {
 	Markdown string `json:"markdown,omitempty"`
 }
 
-func GenerateSARIFGivenFileID(client *Client, fileID int, riskThreshold int) (SARIF, error) {
+func GenerateSARIFGivenFileID(client *Client, fileID int, riskThreshold int,staticScanTimeout time.Duration) (SARIF, error) {
 	ctx := context.Background()
 	var sarifReportProgess int
 	start := time.Now()
@@ -119,7 +119,7 @@ func GenerateSARIFGivenFileID(client *Client, fileID int, riskThreshold int) (SA
 		sarifReportProgess = file.StaticScanProgress
 		bar.SetCurrent(int64(sarifReportProgess), time.Since(start))
 
-		if time.Since(start) > 15*time.Minute {
+		if time.Since(start) > staticScanTimeout {
 			err := errors.New("Request timed out")
 			PrintError(err)
 			os.Exit(1)
@@ -264,7 +264,7 @@ func GenerateSARIFGivenFileID(client *Client, fileID int, riskThreshold int) (SA
 }
 
 func PrintError(err error) {
-	panic("unimplemented")
+	panic(err)
 }
 
 func GenerateSARIFFileContent(sarif SARIF) (string, error) {

cmd/cicheck.go

@@ -46,7 +46,7 @@ var cicheckCmd = &cobra.Command{
 			helper.PrintError(err)
 			os.Exit(1)
 		}
-		timeoutMinutes, _ := cmd.Flags().GetInt("sast-timeout")
+		timeoutMinutes, _ := cmd.Flags().GetInt("timeout")
 		timeout := time.Duration(timeoutMinutes) * time.Minute
 
 		helper.ProcessCiCheck(fileID, riskThresholdInt, timeout)
@@ -58,6 +58,6 @@ func init() {
 	cicheckCmd.Flags().StringP(
 		"risk-threshold", "r", "low", "Risk threshold to fail the command. Available options: low, medium, high")
 	cicheckCmd.Flags().IntP(
-			"sast-timeout", "t", 30, "Static scan timeout in minutes for the CI check (default: 30)")
+			"timeout", "t", 30, "Static scan timeout in minutes for the CI check (default: 30)")
 
 }

cmd/sarif.go

@@ -5,7 +5,8 @@ import (
 	"os"
 	"strconv"
 	"strings"
-
+	"time"
+	
 	"github.com/appknox/appknox-go/helper"
 	"github.com/spf13/cobra"
 )
@@ -45,7 +46,9 @@ var sarifCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		outputFilePath, _ := cmd.Flags().GetString("output")
-		helper.ConvertToSARIFReport(fileID,riskThresholdInt,outputFilePath)
+		timeoutMinutes, _ := cmd.Flags().GetInt("timeout")
+		timeout := time.Duration(timeoutMinutes) * time.Minute
+		helper.ConvertToSARIFReport(fileID,riskThresholdInt,outputFilePath,timeout)
 	},
 }
 
@@ -54,4 +57,6 @@ func init() {
 	sarifCmd.Flags().StringP(
 		"risk-threshold", "r", "low", "Risk threshold to fail the command. Available options: low, medium, high")
 	sarifCmd.PersistentFlags().StringP("output", "o", "report.sarif", "Output file path to save reports")
+	sarifCmd.Flags().IntP(
+		"timeout", "t", 30, "Static scan timeout in minutes for the CI check (default: 30)")
 }

helper/sarif.go

@@ -3,13 +3,14 @@ package helper
 import (
 	"fmt"
 	"os"
-
+	"time"
+	
 	"github.com/appknox/appknox-go/appknox"
 )
 
-func ConvertToSARIFReport(fileID int, riskThreshold int, filePath string) error {
+func ConvertToSARIFReport(fileID int, riskThreshold int, filePath string,staticScanTimeout time.Duration) error {
 	client := getClient()
-	sarif, err := appknox.GenerateSARIFGivenFileID(client, fileID, riskThreshold)
+	sarif, err := appknox.GenerateSARIFGivenFileID(client, fileID, riskThreshold,staticScanTimeout)
 	if err != nil {
 		return err
 	}