arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #574 from hongli-my/fix-nvd-path

Browse Source 
not use path.Join,  stop clair， left  nvd xml like nvd-data3260521972007.xml
This commit is contained in:
Jimmy Zelinskie 2018-07-17 10:32:52 -04:00 committed by GitHub
commit 3babbafb2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/vulnmdsrc/nvd/nvd.go
View File

@ -26,6 +26,7 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os" "os"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -146,7 +147,7 @@ func getDataFeeds(dataFeedHashes map[string]string, localPath string) (map[strin
// Create io.Reader for every data feed. // Create io.Reader for every data feed.
dataFeedReaders := make(map[string]NestedReadCloser) dataFeedReaders := make(map[string]NestedReadCloser)
for _, dataFeedName := range dataFeedNames { for _, dataFeedName := range dataFeedNames {
fileName := localPath + dataFeedName + ".xml" fileName := filepath.Join(localPath, fmt.Sprintf("%s.xml", dataFeedName))
if h, ok := dataFeedHashes[dataFeedName]; ok && h == dataFeedHashes[dataFeedName] { if h, ok := dataFeedHashes[dataFeedName]; ok && h == dataFeedHashes[dataFeedName] {
// The hash is known, the disk should contains the feed. Try to read from it. // The hash is known, the disk should contains the feed. Try to read from it.