-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(secret): enhance secret scanning for python binary files #7223
Merged
Merged
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
5aca422
feat: enhance secret scanning for specific binary files
afdesk 61260c7
Merge branch 'main' of github.com:afdesk/trivy into feat/secret-binary
afdesk 62fda69
feat: add pyc files
afdesk 910f84e
refactor: rename array of allowed extensions
afdesk b9a8a58
skip unprintable chars
afdesk ee234ad
splite unprintable chars with spaces
afdesk 06cb7a0
test: add python binary
afdesk 17dd62e
update docs
afdesk 9619cf7
skip printing binary files
afdesk 965a73d
read printable chars by line with minimum length
afdesk 77d8c3e
refactor: rename
afdesk d12e32c
refactor: remove spagetti code
afdesk 906a59b
refactor: use bytes.Buffer
knqyf263 1ee8b8d
Merge branch 'main' into feat/secret-binary
knqyf263 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Binary file not shown.
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ import ( | |
"os" | ||
"os/exec" | ||
"path/filepath" | ||
"unicode" | ||
|
||
xio "github.com/aquasecurity/trivy/pkg/x/io" | ||
) | ||
|
@@ -93,3 +94,31 @@ func IsBinary(content xio.ReadSeekerAt, fileSize int64) (bool, error) { | |
|
||
return false, nil | ||
} | ||
|
||
func ExtractPrintableBytes(content xio.ReadSeekerAt) ([]byte, error) { | ||
var printalbe []byte | ||
current := make([]byte, 1) | ||
|
||
wasReadable := false | ||
|
||
for { | ||
_, err := content.Read(current) | ||
if err == io.EOF { | ||
break | ||
} else if err != nil { | ||
return nil, err | ||
} | ||
if unicode.IsPrint(rune(current[0])) { | ||
if !wasReadable { | ||
printalbe = append(printalbe, byte(' ')) | ||
wasReadable = true | ||
} | ||
printalbe = append(printalbe, current[0]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This implementation concats all single printable characters, leading to the long string. Even in a binary file, there are many printable character strings when viewed on a per-byte basis. I think the |
||
} else { | ||
wasReadable = false | ||
} | ||
|
||
} | ||
|
||
return printalbe, nil | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if we omit the
is
prefix?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done