-
Notifications
You must be signed in to change notification settings - Fork 33
feat: add govulcheck to suppress the go cves #361
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
Open
pohanhuang
wants to merge
4
commits into
neuvector:main
Choose a base branch
from
pohanhuang:feat/add-govulcheck-to-suppress-false-positive
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,4 +30,5 @@ _testmain.go | |
|
|
||
| /scanner | ||
| data/cvedb.regular | ||
| data/govulndb.zip | ||
| /task/scannerTask_test1.go | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package common | ||
|
|
||
| import ( | ||
| "archive/zip" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| scanUtils "github.com/neuvector/neuvector/share/scan" | ||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| func ExtractGovulnDB() error { | ||
| // Check if govulndb directory already exists and is not empty | ||
| if info, err := os.Stat(scanUtils.GovulcheckDBPath); err == nil && info.IsDir() { | ||
| return nil | ||
| } | ||
|
|
||
| zipPath := fmt.Sprintf("%s.zip", scanUtils.GovulcheckDBPath) | ||
|
|
||
| if _, err := os.Stat(zipPath); os.IsNotExist(err) { | ||
| log.WithFields(log.Fields{"path": zipPath}).Error("govulndb.zip not found, skipping extraction") | ||
| return err | ||
| } | ||
|
|
||
| if err := os.RemoveAll(scanUtils.GovulcheckDBPath); err != nil { | ||
| return fmt.Errorf("failed to remove existing govulndb directory: %w", err) | ||
| } | ||
|
|
||
| if err := os.MkdirAll(scanUtils.GovulcheckDBPath, 0o755); err != nil { | ||
| return fmt.Errorf("failed to create govulndb directory: %w", err) | ||
| } | ||
|
|
||
| if err := unzipFile(zipPath, scanUtils.GovulcheckDBPath); err != nil { | ||
| return fmt.Errorf("failed to extract govulndb.zip: %w", err) | ||
| } | ||
|
|
||
| log.WithFields(log.Fields{"target": scanUtils.GovulcheckDBPath}).Info("govulndb extracted successfully") | ||
| return nil | ||
| } | ||
|
|
||
| func unzipFile(zipPath, targetPath string) error { | ||
| reader, err := zip.OpenReader(zipPath) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to open zip file: %w", err) | ||
| } | ||
| defer reader.Close() | ||
|
|
||
| for _, file := range reader.File { | ||
| if err := extractZipFile(file, targetPath); err != nil { | ||
| return fmt.Errorf("failed to extract %s: %w", file.Name, err) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func extractZipFile(file *zip.File, targetPath string) error { | ||
| filePath := filepath.Join(targetPath, file.Name) | ||
|
|
||
| if !strings.HasPrefix(filePath, filepath.Clean(targetPath)+string(os.PathSeparator)) { | ||
| return nil | ||
| } | ||
|
Comment on lines
+63
to
+65
Contributor
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. I'd hardcode the expected file path and ignore others. |
||
|
|
||
| if file.FileInfo().IsDir() { | ||
| return os.MkdirAll(filePath, file.Mode()) | ||
| } | ||
|
|
||
| if err := os.MkdirAll(filepath.Dir(filePath), 0o755); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| outFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, file.Mode()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer outFile.Close() | ||
|
|
||
| rc, err := file.Open() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer rc.Close() | ||
|
|
||
| _, err = io.Copy(outFile, rc) | ||
| return err | ||
| } | ||
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
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
Binary file not shown.
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Maybe you can just
os.Stat()against the expected path? If the zip file doesn't contain the file it's probably an error too.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.
I will just simply check if the extracted result path exist, what do you think?
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.
yes that's what I mean. As long as the end result isn't right we should always re-extract.