Fixed Crash Bugs with Automations

Fixed Crash Bugs with Automations

Author: amrudesh1

Dockerfile

@@ -38,12 +38,18 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends ripgrep && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
+    
 WORKDIR /app
 
 COPY . .
 
-RUN go mod download && \
-    go build -o morf .
+RUN go mod download
+
+ENV GOARCH=arm64
+ENV GOOS=linux
+ENV CGO_ENABLED=0
+
+RUN go build -v -x -o morf .
 
 EXPOSE 8888
 

apk/analysis.go

@@ -27,7 +27,6 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/gin-gonic/gin"
-	vip "github.com/spf13/viper"
 	"gorm.io/gorm"
 )
 
@@ -42,6 +41,7 @@ func StartCliExtraction(apkPath string, db *gorm.DB, is_db_req bool) {
 			log.Info(json_data)
 		}
 	}
+
 	packageModel := ExtractPackageData(apkPath)
 	metadata := StartMetaDataCollection(apkPath)
 
@@ -54,7 +54,6 @@ func StartCliExtraction(apkPath string, db *gorm.DB, is_db_req bool) {
 	}
 
 	scanner_data := StartSecScan(utils.GetInputDir() + fileName)
-	scanner_data = utils.SanitizeSecrets(scanner_data)
 	secret_data, secret_error := json.Marshal(scanner_data)
 
 	if secret_error != nil {
@@ -78,16 +77,11 @@ func StartCliExtraction(apkPath string, db *gorm.DB, is_db_req bool) {
 		util.CreateBackUpDir(fs)
 	}
 
-	util.WriteToFile(fs, vip.GetString("backup_path")+fileName+"_"+secret.APKVersion+".json", string(json_data))
-	util.WriteToFile(fs, vip.GetString("backup_path")+fileName+"_"+"Secrets_"+secret.APKVersion+".json", string(secret_data))
-
-	util.WriteToFile(fs, "results"+"/"+fileName+"_"+secret.APKVersion+".json", string(json_data))
-	util.WriteToFile(fs, "results"+"/"+fileName+"_"+"Secrets_"+secret.APKVersion+".json", string(secret_data))
-
-	log.Info("APK Data saved to: " + vip.GetString("backup_path") + "/" + fileName + "_" + secret.APKVersion + ".json")
+	utils.CreateReport(fs, secret, json_data, secret_data, fileName)
 }
 
 func StartJiraProcess(jiramodel models.JiraModel, db *gorm.DB, c *gin.Context) {
+
 	apk_path := util.DownloadFileUsingSlack(jiramodel, c)
 	if apk_path == "" {
 		return
@@ -114,6 +108,7 @@ func StartJiraProcess(jiramodel models.JiraModel, db *gorm.DB, c *gin.Context) {
 	if secret_error != nil {
 		log.Error(secret_error)
 	}
+
 	secret := util.CreateSecretModel(apk_path, packageModel, metadata, scanner_data, secret_data)
 	database.InsertSecrets(secret, db)
 
@@ -158,17 +153,12 @@ func StartExtractProcess(apkPath string, db *gorm.DB, c *gin.Context, isSlack bo
 		log.Error(json_error)
 	}
 
-	//Check if backup folder exists
 	//Check if backup folder exists
 	if !util.CheckBackUpDirExists(fs) {
 		util.CreateBackUpDir(fs)
 	}
 
-	util.WriteToFile(fs, vip.GetString("backup_path")+apkPath+"_"+secret.APKVersion+".json", string(json_data))
-	util.WriteToFile(fs, vip.GetString("backup_path")+apkPath+"_"+"Secrets_"+secret.APKVersion+".json", string(secret_data))
-
-	util.WriteToFile(fs, "results"+"/"+apkPath+"_"+secret.APKVersion+".json", string(json_data))
-	util.WriteToFile(fs, "results"+"/"+apkPath+"_"+"Secrets_"+secret.APKVersion+".json", string(secret_data))
+	utils.CreateReport(fs, secret, json_data, secret_data, apkPath)
 
 	if !isSlack {
 		c.JSON(http.StatusOK, gin.H{

apk/metadata.go

@@ -50,7 +50,6 @@ func StartMetaDataCollection(apkPath string) models.MetaDataModel {
 	}
 
 	// Move APK to input directory
-
 	apkPath = utils.CopyApktoInputDir(fs, apkPath)
 	fmt.Println("Starting metadata collection for " + apkPath)
 

apk/packageparse.go

@@ -37,9 +37,10 @@ func ExtractPackageData(apkPath string) models.PackageDataModel {
 		log.Error("AAPT not found in the system")
 		log.Error("Please install AAPT or add it to the system path")
 		aapt_success, aapt_error = exec.Command("tools/aapt", "dump", "badging", apkPath).Output()
+	} else {
+		aapt_success, aapt_error = exec.Command("aapt", "dump", "badging", apkPath).Output()
 	}
 
-	aapt_success, aapt_error = exec.Command("aapt", "dump", "badging", apkPath).Output()
 	aapt_byte_to_string := aapt_success[:]
 
 	if aapt_error != nil {

apk/scanner.go

@@ -52,14 +52,7 @@ type PatternList struct {
 var secretPatterns SecretPatterns
 var secretModel []models.SecretModel
 
-func CheckAPK(apkPath string) {
-	PacakgeData := ExtractPackageData("scan.apk")
-	log.Info(PacakgeData)
-}
-
 func StartSecScan(apkPath string) []models.SecretModel {
-	//Decompile the sources of the APK file
-
 	counter := 0
 	log.Println("Decompiling the APK file for sources")
 	fmt.Println(apkPath)
@@ -82,7 +75,7 @@ func StartSecScan(apkPath string) []models.SecretModel {
 
 	if counter == 2 {
 		log.Println("Decompiling the APK file successful")
-		return StartScan(utils.GetFilesDir())
+		return utils.SanitizeSecrets(StartScan(utils.GetSourceDir()))
 	}
 
 	return nil
@@ -95,6 +88,7 @@ func readPatternFile(patternFilePath string) []byte {
 }
 
 func StartScan(apkPath string) []models.SecretModel {
+	log.Info("Scanning for secrets in the code")
 	files := utils.ReadDir(utils.GetAppFS(), "patterns")
 
 	var wg sync.WaitGroup