SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 11:55:40 +01:00
Code Issues Releases Activity Actions

Merge pull request #512 from csaf-poc/Download_without_tlp

Browse source 
Downloader: Add tlp label to path if no custom directory is configured. Refactor accordingly
This commit is contained in:
JanHoefelmeyer 2023-11-21 11:46:44 +01:00 • committed by GitHub
commit 2fe836bed7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/csaf_downloader/downloader.go
View file

@ -621,26 +621,28 @@ nextAdvisory:
continue continue
} }
if err := d.eval.Extract(`$.document.tracking.initial_release_date`, dateExtract, false, doc); err != nil { if err := d.eval.Extract(
`$.document.tracking.initial_release_date`, dateExtract, false, doc,
); err != nil {
slog.Warn("Cannot extract initial_release_date from advisory", slog.Warn("Cannot extract initial_release_date from advisory",
"url", file.URL()) "url", file.URL())
initialReleaseDate = time.Now() initialReleaseDate = time.Now()
} }
initialReleaseDate = initialReleaseDate.UTC() initialReleaseDate = initialReleaseDate.UTC()
// Advisories that failed validation are store in a special folder. // Advisories that failed validation are stored in a special folder.
var newDir string var newDir string
if valStatus != validValidationStatus { if valStatus != validValidationStatus {
newDir = path.Join(d.cfg.Directory, failedValidationDir, lower) newDir = path.Join(d.cfg.Directory, failedValidationDir)
} else { } else {
newDir = path.Join(d.cfg.Directory, lower) newDir = d.cfg.Directory
} }
// Do we have a configured destination folder? // Do we have a configured destination folder?
if d.cfg.Folder != "" { if d.cfg.Folder != "" {
newDir = path.Join(newDir, d.cfg.Folder) newDir = path.Join(newDir, d.cfg.Folder)
} else { } else {
newDir = path.Join(newDir, strconv.Itoa(initialReleaseDate.Year())) newDir = path.Join(newDir, lower, strconv.Itoa(initialReleaseDate.Year()))
} }
if newDir != lastDir { if newDir != lastDir {