Fix duplicate findings when scanning directory with path only rules #1639
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey @biggusbeetus thanks for the PR! I think this is indeed a bug we should fix. WDYT about this implementation? diff --git a/detect/detect.go b/detect/detect.go
index b4b7c94..8b48d12 100644
--- a/detect/detect.go
+++ b/detect/detect.go
@@ -109,6 +109,8 @@ type Fragment struct {
// newlineIndices is a list of indices of newlines in the raw content.
// This is used to calculate the line location of a finding
newlineIndices [][]int
+
+ firstFragmentFilePath bool
}
// NewDetector creates a new detector with the given config
@@ -306,7 +308,7 @@ func (d *Detector) detectRule(fragment Fragment, currentRaw string, r config.Rul
if r.Path != nil && r.Regex == nil && len(encodedSegments) == 0 {
// Path _only_ rule
- if r.Path.MatchString(fragment.FilePath) {
+ if r.Path.MatchString(fragment.FilePath) && fragment.firstFragmentFilePath {
finding := report.Finding{
Description: r.Description,
File: fragment.FilePath,
diff --git a/detect/directory.go b/detect/directory.go
index a796bdc..7099c37 100644
--- a/detect/directory.go
+++ b/detect/directory.go
@@ -49,6 +49,8 @@ func (d *Detector) DetectFiles(paths <-chan sources.ScanTarget) ([]report.Findin
}
}
+ firstFragment := true
+
// Buffer to hold file chunks
buf := make([]byte, chunkSize)
totalLines := 0
@@ -114,10 +116,15 @@ func (d *Detector) DetectFiles(paths <-chan sources.ScanTarget) ([]report.Findin
linesInChunk := strings.Count(chunk, "\n")
totalLines += linesInChunk
fragment := Fragment{
- Raw: chunk,
- Bytes: peekBuf.Bytes(),
- FilePath: pa.Path,
+ Raw: chunk,
+ Bytes: peekBuf.Bytes(),
+ FilePath: pa.Path,
+ firstFragmentFilePath: firstFragment,
}
+
+ // Reset firstFragment after the first chunk
+ firstFragment = false
+
if pa.Symlink != "" {
fragment.SymlinkFile = pa.Symlink
}I think that should work |
… rules" This reverts commit 40a5e76.
…x/directory_path_only_duplicates
|
Hi zricethezav, I think this should work :) |
068e4c9 to
92c163c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Explain the purpose of the PR.
Checklist:
Not needed as it is covered by current tests.
Fixes #1638