Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Rearrange some method parameters in the Filesystem source (#4806)
Charlie Gunyonbc31aa9770ae
diff --git a/pkg/sources/filesystem/filesystem.go b/pkg/sources/filesystem/filesystem.goindex 4dfb06761..0760fccee 100644--- a/pkg/sources/filesystem/filesystem.go+++ b/pkg/sources/filesystem/filesystem.go@@ -135,7 +135,7 @@ func (s *Source) Chunks(ctx trContext.Context, chunksChan chan *sources.Chunk, _workerPool := new(errgroup.Group)workerPool.SetLimit(s.concurrency)initialDepth := 1- err = s.scanSymlink(ctx, cleanPath, chunksChan, workerPool, initialDepth, rootPath)+ err = s.scanSymlink(ctx, chunksChan, workerPool, rootPath, initialDepth, cleanPath)_ = workerPool.Wait()s.ClearEncodedResumeInfoFor(rootPath)} else if fileInfo.IsDir() {@@ -143,7 +143,7 @@ func (s *Source) Chunks(ctx trContext.Context, chunksChan chan *sources.Chunk, _workerPool := new(errgroup.Group)workerPool.SetLimit(s.concurrency)initialDepth := 1- err = s.scanDir(ctx, cleanPath, chunksChan, workerPool, initialDepth, rootPath)+ err = s.scanDir(ctx, chunksChan, workerPool, rootPath, initialDepth, cleanPath)_ = workerPool.Wait()s.ClearEncodedResumeInfoFor(rootPath)} else {@@ -152,7 +152,7 @@ func (s *Source) Chunks(ctx trContext.Context, chunksChan chan *sources.Chunk, _continue}ctx.Logger().V(5).Info("Root path is a file", "path", cleanPath)- err = s.scanFile(ctx, cleanPath, chunksChan)+ err = s.scanFile(ctx, chunksChan, cleanPath)}if err != nil && !errors.Is(err, io.EOF) {@@ -167,11 +167,11 @@ func (s *Source) Chunks(ctx trContext.Context, chunksChan chan *sources.Chunk, _func (s *Source) scanSymlink(ctx trContext.Context,- path string,chunksChan chan *sources.Chunk,workerPool *errgroup.Group,- depth int,rootPath string,+ depth int,+ path string,) error {if depth > s.maxSymlinkDepth {return errors.New("max symlink depth reached")@@ -196,7 +196,7 @@ func (s *Source) scanSymlink("resolvedPath", resolvedPath,"depth", depth,)- return s.scanSymlink(ctx, resolvedPath, chunksChan, workerPool, depth+1, rootPath)+ return s.scanSymlink(ctx, chunksChan, workerPool, rootPath, depth+1, resolvedPath)}if fileInfo.IsDir() {@@ -207,7 +207,7 @@ func (s *Source) scanSymlink("depth", depth,)- return s.scanDir(ctx, resolvedPath, chunksChan, workerPool, depth+1, rootPath)+ return s.scanDir(ctx, chunksChan, workerPool, rootPath, depth+1, resolvedPath)}ctx.Logger().V(5).Info("found symlink to file",@@ -228,7 +228,7 @@ func (s *Source) scanSymlink(ctx.Logger().V(5).Info("skipping non-regular file", "path", resolvedPath)return nil}- if err := s.scanFile(ctx, resolvedPath, chunksChan); err != nil {+ if err := s.scanFile(ctx, chunksChan, resolvedPath); err != nil {ctx.Logger().Error(err, "error scanning file", "path", resolvedPath)}s.SetEncodedResumeInfoFor(resumptionKey, cleanPath)@@ -240,11 +240,11 @@ func (s *Source) scanSymlink(func (s *Source) scanDir(ctx trContext.Context,- path string,chunksChan chan *sources.Chunk,workerPool *errgroup.Group,- depth int,rootPath string,+ depth int,+ path string,) error {// check if the full path is not matching any pattern in include// FilterRuleSet and matching any exclude FilterRuleSet.@@ -308,7 +308,7 @@ func (s *Source) scanDir(// traverse into it to find where to resume.if entry.IsDir() && strings.HasPrefix(resumeAfter, entryPath+string(filepath.Separator)) {// Recurse into this directory to find the resume point.- if err := s.scanDir(ctx, entryPath, chunksChan, workerPool, depth, rootPath); err != nil {+ if err := s.scanDir(ctx, chunksChan, workerPool, rootPath, depth, entryPath); err != nil {ctx.Logger().Error(err, "error scanning directory", "path", entryPath)}// After recursing, clear local resumeAfter. The child scanDir will have@@ -328,12 +328,12 @@ func (s *Source) scanDir(ctx.Logger().Info("skipping, following symlinks is not allowed", "path", entryPath)continue}- if err := s.scanSymlink(ctx, entryPath, chunksChan, workerPool, depth, rootPath); err != nil {+ if err := s.scanSymlink(ctx, chunksChan, workerPool, rootPath, depth, entryPath); err != nil {ctx.Logger().Error(err, "error scanning symlink", "path", entryPath)}} else if entry.IsDir() {ctx.Logger().V(5).Info("Entry found is a directory", "path", entryPath)- if err := s.scanDir(ctx, entryPath, chunksChan, workerPool, depth, rootPath); err != nil {+ if err := s.scanDir(ctx, chunksChan, workerPool, rootPath, depth, entryPath); err != nil {ctx.Logger().Error(err, "error scanning directory", "path", entryPath)}} else {@@ -342,7 +342,7 @@ func (s *Source) scanDir(}ctx.Logger().V(5).Info("Entry found is a file", "path", entryPath)workerPool.Go(func() error {- if err := s.scanFile(ctx, entryPath, chunksChan); err != nil {+ if err := s.scanFile(ctx, chunksChan, entryPath); err != nil {ctx.Logger().Error(err, "error scanning file", "path", entryPath)}s.SetEncodedResumeInfoFor(resumptionKey, entryPath)@@ -356,7 +356,7 @@ func (s *Source) scanDir(var skipSymlinkErr = errors.New("skipping symlink")-func (s *Source) scanFile(ctx trContext.Context, path string, chunksChan chan *sources.Chunk) error {+func (s *Source) scanFile(ctx trContext.Context, chunksChan chan *sources.Chunk, path string) error {fileCtx := trContext.WithValues(ctx, "path", path)fileStat, err := os.Lstat(path)if err != nil {@@ -445,7 +445,7 @@ func (s *Source) ChunkUnit(ctx trContext.Context, unit sources.SourceUnit, reporworkerPool := new(errgroup.Group)workerPool.SetLimit(s.concurrency)initialDepth := 1- scanErr = s.scanSymlink(ctx, cleanPath, ch, workerPool, initialDepth, rootPath)+ scanErr = s.scanSymlink(ctx, ch, workerPool, rootPath, initialDepth, cleanPath)_ = workerPool.Wait()s.ClearEncodedResumeInfoFor(rootPath)@@ -455,7 +455,7 @@ func (s *Source) ChunkUnit(ctx trContext.Context, unit sources.SourceUnit, reporworkerPool.SetLimit(s.concurrency)initialDepth := 1// TODO: Finer grain error tracking of individual chunks.- scanErr = s.scanDir(ctx, cleanPath, ch, workerPool, initialDepth, rootPath)+ scanErr = s.scanDir(ctx, ch, workerPool, rootPath, initialDepth, cleanPath)_ = workerPool.Wait()s.ClearEncodedResumeInfoFor(rootPath)} else {@@ -466,7 +466,7 @@ func (s *Source) ChunkUnit(ctx trContext.Context, unit sources.SourceUnit, reporlogger.Info("skipping non-regular file", "path", cleanPath)return}- scanErr = s.scanFile(ctx, cleanPath, ch)+ scanErr = s.scanFile(ctx, ch, cleanPath)}}()diff --git a/pkg/sources/filesystem/filesystem_symlink_test.go b/pkg/sources/filesystem/filesystem_symlink_test.goindex 9cc67fc58..6af5bbcba 100644--- a/pkg/sources/filesystem/filesystem_symlink_test.go+++ b/pkg/sources/filesystem/filesystem_symlink_test.go@@ -508,7 +508,7 @@ func TestScanSymlink_NoError(t *testing.T) {go func() {workerPool := new(errgroup.Group)workerPool.SetLimit(src.concurrency)- err := src.scanSymlink(ctx, filepath.Join(baseDir, "A"), chunks, workerPool, 1, filepath.Join(baseDir, "A"))+ err := src.scanSymlink(ctx, chunks, workerPool, filepath.Join(baseDir, "A"), 1, filepath.Join(baseDir, "A"))_ = workerPool.Wait()require.NoError(t, err)close(chunks)@@ -560,9 +560,9 @@ func TestScanSymlink_MaxDepthExceeded(t *testing.T) {err = src.scanSymlink(ctx,- filepath.Join(baseDir, "A"),chunks,workerPool,+ filepath.Join(baseDir, "A"),1,filepath.Join(baseDir, "A"),)@@ -602,9 +602,9 @@ func TestScanSymlink_FileTarget(t *testing.T) {err = src.scanSymlink(ctx,- symlinkPath,chunks,workerPool,+ symlinkPath,1,symlinkPath,)@@ -644,9 +644,9 @@ func TestScanSymlink_SelfLoop(t *testing.T) {err = src.scanSymlink(ctx,- symlinkPath,chunks,workerPool,+ symlinkPath,1,symlinkPath,)@@ -680,9 +680,9 @@ func TestScanSymlink_BrokenSymlink(t *testing.T) {err = src.scanSymlink(ctx,- symlinkPath,chunks,workerPool,+ symlinkPath,0,symlinkPath,)@@ -719,9 +719,9 @@ func TestScanSymlink_TwoFileLoop(t *testing.T) {err = src.scanSymlink(ctx,- fileA,chunks,workerPool,+ fileA,0,fileA,)diff --git a/pkg/sources/filesystem/filesystem_test.go b/pkg/sources/filesystem/filesystem_test.goindex aa79c5c6c..5a964d671 100644--- a/pkg/sources/filesystem/filesystem_test.go+++ b/pkg/sources/filesystem/filesystem_test.go@@ -116,7 +116,7 @@ func TestScanFile(t *testing.T) {ctx := trContext.WithLogger(trContext.Background(), logr.Discard())go func() {defer close(chunksChan)- err = source.scanFile(ctx, tmpfile.Name(), chunksChan)+ err = source.scanFile(ctx, chunksChan, tmpfile.Name())assert.Nil(t, err)}()@@ -148,7 +148,7 @@ func TestScanBinaryFile(t *testing.T) {go func() {defer close(chunksChan)- errChan <- source.scanFile(ctx, tmpfile.Name(), chunksChan)+ errChan <- source.scanFile(ctx, chunksChan, tmpfile.Name())}()err = <-errChan