enhanced the code

Author: shahzadhaider1

main.go

@@ -709,27 +709,31 @@ func runSingleScan(ctx context.Context, cmd string, cfg engine.Config) (metrics,
 	}
 	eng.Start(ctx)
 
-	tmpFile := filepath.Join(os.TempDir(), "truffle-temp-repo")
+	tmpDir := filepath.Join(os.TempDir(), "trufflehog_"+strconv.Itoa(os.Getpid()))
+	// We need to persist the repo(s) if we're using legacy JSON output
+	// because it requires commit SHAs in the output.
+	persistRepo := *gitNoCleanup || *githubNoCleanup || *gitlabNoCleanup
+	if *jsonLegacy && !persistRepo {
+		if err := os.MkdirAll(tmpDir, os.ModePerm); err != nil {
+			return scanMetrics, fmt.Errorf("failed to create temporary directory: %v", err)
+		}
+		*gitNoCleanup, *githubNoCleanup, *gitlabNoCleanup = true, true, true
+		*gitClonePath, *githubClonePath, *gitlabClonePath = tmpDir, tmpDir, tmpDir
+	}
+
 	defer func() {
 		// Clean up temporary artifacts.
 		if err := cleantemp.CleanTempArtifacts(ctx); err != nil {
 			ctx.Logger().Error(err, "error cleaning temp artifacts")
 		}
 
-		if err := os.RemoveAll(tmpFile); err != nil {
-			ctx.Logger().Error(err, "error removing temporary directory")
+		if !persistRepo {
+			if err := os.RemoveAll(tmpDir); err != nil {
+				ctx.Logger().Error(err, "error removing temporary directory")
+			}
 		}
 	}()
 
-	persistRepo := *gitNoCleanup || *githubNoCleanup || *gitlabNoCleanup
-	if *jsonLegacy && !persistRepo {
-		if err := os.MkdirAll(tmpFile, os.ModePerm); err != nil {
-			return scanMetrics, fmt.Errorf("failed to create temporary directory: %v", err)
-		}
-		*gitNoCleanup, *githubNoCleanup, *gitlabNoCleanup = true, true, true
-		*gitClonePath, *githubClonePath, *gitlabClonePath = tmpFile, tmpFile, tmpFile
-	}
-
 	var refs []sources.JobProgressRef
 	switch cmd {
 	case gitScan.FullCommand():

pkg/output/legacy_json.go

@@ -18,38 +18,24 @@ import (
 	"github.com/trufflesecurity/trufflehog/v3/pkg/context"
 	"github.com/trufflesecurity/trufflehog/v3/pkg/detectors"
 	"github.com/trufflesecurity/trufflehog/v3/pkg/pb/sourcespb"
-	"github.com/trufflesecurity/trufflehog/v3/pkg/sources/git"
 )
 
 // LegacyJSONPrinter is a printer that prints results in legacy JSON format for backwards compatibility.
 type LegacyJSONPrinter struct{ mu sync.Mutex }
 
 func (p *LegacyJSONPrinter) Print(ctx context.Context, r *detectors.ResultWithMetadata) error {
-	var repo, repoPath string
+	var repoPath string
 	switch r.SourceType {
 	case sourcespb.SourceType_SOURCE_TYPE_GIT:
-		repo = r.SourceMetadata.GetGit().Repository
 		repoPath = r.SourceMetadata.GetGit().RepositoryLocalPath
 	case sourcespb.SourceType_SOURCE_TYPE_GITHUB:
-		repo = r.SourceMetadata.GetGithub().Repository
 		repoPath = r.SourceMetadata.GetGithub().RepositoryLocalPath
 	case sourcespb.SourceType_SOURCE_TYPE_GITLAB:
-		repo = r.SourceMetadata.GetGitlab().Repository
 		repoPath = r.SourceMetadata.GetGitlab().RepositoryLocalPath
 	default:
 		return fmt.Errorf("unsupported source type for legacy json output: %s", r.SourceType)
 	}
 
-	// cloning the repo again here is not great and only works with unauthed repos
-	var err error
-
-	if repoPath == "" {
-		repoPath, _, err = git.PrepareRepo(ctx, repo, "")
-		if err != nil || repoPath == "" {
-			return fmt.Errorf("error preparing git repo for scanning: %w", err)
-		}
-	}
-
 	legacy, err := convertToLegacyJSON(r, repoPath)
 	if err != nil {
 		return fmt.Errorf("could not convert to legacy JSON: %w", err)

pkg/sources/git/git.go

@@ -354,7 +354,7 @@ func (s *Source) scanDir(ctx context.Context, gitDir string, reporter sources.Ch
 
 	err = func() error {
 		// remove the directory only if it was created as a temporary path, or if it is a clone path and --no-cleanup is not set.
-		if strings.HasPrefix(gitDir, filepath.Join(os.TempDir(), "trufflehog")) || (!s.conn.GetNoCleanup() && s.conn.GetClonePath() != "") {
+		if strings.HasPrefix(gitDir, filepath.Join(os.TempDir(), "trufflehog-")) || (!s.conn.GetNoCleanup() && s.conn.GetClonePath() != "") {
 			defer os.RemoveAll(gitDir)
 		}
 

pkg/sources/github/github.go

@@ -743,7 +743,7 @@ func (s *Source) cloneAndScanRepo(ctx context.Context, repoURL string, repoInfo
 		return duration, err
 	}
 	// remove the path only if it was created as a temporary path, or if it is a clone path and --no-cleanup is not set.
-	if strings.HasPrefix(path, filepath.Join(os.TempDir(), "trufflehog")) || (!s.conn.NoCleanup && s.conn.GetClonePath() != "") {
+	if strings.HasPrefix(path, filepath.Join(os.TempDir(), "trufflehog-")) || (!s.conn.NoCleanup && s.conn.GetClonePath() != "") {
 		defer os.RemoveAll(path)
 	}
 

pkg/sources/gitlab/gitlab.go

@@ -1095,7 +1095,7 @@ func (s *Source) ChunkUnit(ctx context.Context, unit sources.SourceUnit, reporte
 	}
 
 	// remove the path only if it was created as a temporary path, or if it is a clone path and --no-cleanup is not set.
-	if strings.HasPrefix(path, filepath.Join(os.TempDir(), "trufflehog")) || (!s.noCleanup && s.clonePath != "") {
+	if strings.HasPrefix(path, filepath.Join(os.TempDir(), "trufflehog-")) || (!s.noCleanup && s.clonePath != "") {
 		defer os.RemoveAll(path)
 	}