Mirrors/trufflehog
2
0
Fork 0
mirror of https://github.com/trufflesecurity/trufflehog.git synced 2024-11-10 07:04:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(git): set GIT_DIR based on ScanOptions.Bare (#3004)

Browse source
This commit is contained in:
Richard Gomez 2024-06-24 10:37:45 -04:00 committed by GitHub
parent de19a39f2c
commit 3c20b000e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkg/sources/git/git.go
View file

@ -524,6 +524,19 @@ func (s *Git) CommitsScanned() uint64 {
const gitDirName = ".git" const gitDirName = ".git"
// getGitDir returns the likely path of the ".git" directory.
// If the repository is bare, it will be at the top-level; otherwise, it
// exists in the ".git" directory at the root of the working tree.
//
// See: https://git-scm.com/docs/gitrepository-layout#_description
func getGitDir(path string, options *ScanOptions) string {
if options.Bare {
return path
} else {
return filepath.Join(path, gitDirName)
}
}
func (s *Git) ScanCommits(ctx context.Context, repo *git.Repository, path string, scanOptions *ScanOptions, reporter sources.ChunkReporter) error { func (s *Git) ScanCommits(ctx context.Context, repo *git.Repository, path string, scanOptions *ScanOptions, reporter sources.ChunkReporter) error {
// Get the remote URL for reporting (may be empty) // Get the remote URL for reporting (may be empty)
remoteURL := getSafeRemoteURL(repo, "origin") remoteURL := getSafeRemoteURL(repo, "origin")
@ -559,12 +572,14 @@ func (s *Git) ScanCommits(ctx context.Context, repo *git.Repository, path string
return nil return nil
} }
gitDir := filepath.Join(path, gitDirName)
logger.Info("scanning repo", logValues...) logger.Info("scanning repo", logValues...)
var depth int64 var (
var lastCommitHash string gitDir = getGitDir(path, scanOptions)
depth int64
lastCommitHash string
)
for diff := range diffChan { for diff := range diffChan {
if scanOptions.MaxDepth > 0 && depth >= scanOptions.MaxDepth { if scanOptions.MaxDepth > 0 && depth >= scanOptions.MaxDepth {
logger.V(1).Info("reached max depth", "depth", depth) logger.V(1).Info("reached max depth", "depth", depth)
@ -787,9 +802,6 @@ func (s *Git) ScanStaged(ctx context.Context, repo *git.Repository, path string,
return nil return nil
} }
reachedBase := false
gitDir := filepath.Join(path, gitDirName)
logger := ctx.Logger() logger := ctx.Logger()
var logValues []any var logValues []any
logValues = append(logValues, "path", path) logValues = append(logValues, "path", path)
@ -805,8 +817,12 @@ func (s *Git) ScanStaged(ctx context.Context, repo *git.Repository, path string,
logger.V(1).Info("scanning staged changes", logValues...) logger.V(1).Info("scanning staged changes", logValues...)
var depth int64 var (
var lastCommitHash string reachedBase = false
gitDir = getGitDir(path, scanOptions)
depth int64
lastCommitHash string
)
for diff := range diffChan { for diff := range diffChan {
fullHash := diff.Commit.Hash fullHash := diff.Commit.Hash
logger := ctx.Logger().WithValues("filename", diff.PathB, "commit", fullHash, "file", diff.PathB) logger := ctx.Logger().WithValues("filename", diff.PathB, "commit", fullHash, "file", diff.PathB)