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

Embed nvd's downloading and storing of meta data into a function to help with resource management

Browse Source
This commit is contained in:
Jean Michel MacKay 2018-09-07 17:13:31 -04:00
parent 3959f416fa
commit f34f94320a
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,24 +165,26 @@ func getDataFeeds(dataFeedHashes map[string]string, localPath string) (map[strin
} }
} }
downloadAndSave := func() error {
// Download data feed. // Download data feed.
r, err := httputil.GetWithUserAgent(fmt.Sprintf(dataFeedURL, dataFeedName)) r, err := httputil.GetWithUserAgent(fmt.Sprintf(dataFeedURL, dataFeedName))
if err != nil { if err != nil {
log.WithError(err).WithField(logDataFeedName, dataFeedName).Error("could not download NVD data feed") log.WithError(err).WithField(logDataFeedName, dataFeedName).Error("could not download NVD data feed")
return dataFeedReaders, dataFeedHashes, commonerr.ErrCouldNotDownload return commonerr.ErrCouldNotDownload
} }
defer r.Body.Close() defer r.Body.Close()
if !httputil.Status2xx(r) { if !httputil.Status2xx(r) {
log.WithField("StatusCode", r.StatusCode).Error("Failed to download NVD data feed") log.WithField("StatusCode", r.StatusCode).Error("Failed to download NVD data feed")
return dataFeedReaders, dataFeedHashes, commonerr.ErrCouldNotDownload return commonerr.ErrCouldNotDownload
} }
// Un-gzip it. // Un-gzip it.
gr, err := gzip.NewReader(r.Body) gr, err := gzip.NewReader(r.Body)
if err != nil { if err != nil {
log.WithError(err).WithField(logDataFeedName, dataFeedName).Error("could not read NVD data feed") log.WithError(err).WithField(logDataFeedName, dataFeedName).Error("could not read NVD data feed")
return dataFeedReaders, dataFeedHashes, commonerr.ErrCouldNotDownload return commonerr.ErrCouldNotDownload
} }
// Store it to a file at the same time if possible. // Store it to a file at the same time if possible.
@ -191,11 +193,19 @@ func getDataFeeds(dataFeedHashes map[string]string, localPath string) (map[strin
if err != nil { if err != nil {
log.WithError(err).Warning("could not stream NVD data feed to filesystem") log.WithError(err).Warning("could not stream NVD data feed to filesystem")
} }
defer f.Close()
dataFeedReaders[dataFeedName] = fileName dataFeedReaders[dataFeedName] = fileName
f.Close()
} else { } else {
log.WithError(err).Warning("could not store NVD data feed to filesystem") log.WithError(err).Warning("could not store NVD data feed to filesystem")
} }
return nil
}
err := downloadAndSave()
if err != nil {
return dataFeedReaders, dataFeedHashes, err
}
} }
} }