ISSUE-1776: Fixing filename in the results #82
Merged
Conversation
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
noboruma
reviewed
Dec 6, 2023
pkg/server/grpc.go
Outdated
| HostMountDir = "/fenced/mnt/host" | ||
| MalwareScanDir = "/" | ||
| HostMountDir = "/fenced/mnt/host" | ||
| cntnrPathPrefixRegex = `.+?\/overlay2\/[A-z0-9a-z]+\/merged` |
There was a problem hiding this comment.
IIRC merged is not guaranteed, it might be diff, lower or work as per https://pkg.go.dev/github.com/barracks510/go-overlay2
noboruma
reviewed
Dec 6, 2023
pkg/server/grpc.go
Outdated
| @@ -157,7 +163,9 @@ func (s *gRPCServer) FindMalwareInfo(c context.Context, r *pb.MalwareRequest) (* | |||
| } | |||
|
|
|||
| for malware := range malwares { | |||
| if trim { | |||
| if isContainer { | |||
| malware.CompleteFilename = cntnrPathPrefixRegexObj.ReplaceAllString(malware.CompleteFilename, "") | |||
There was a problem hiding this comment.
Since we want to remove a prefix, we might as well just find the end of the prefix and cut a slice out of malware.CompleteFilename (preventing extra string allocation)
varunsharma0286
force-pushed
the
ISSUE-1776
branch
from
daa71e2 to
c1d31ea
Compare
noboruma
approved these changes
Dec 6, 2023
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.
Fixes:
deepfence/ThreatMapper#1776