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

Add time interval filtering to downloader.

Browse source
This commit is contained in:
Sascha L. Teichmann 2023-07-26 03:22:33 +02:00
parent 0e297fc616
commit de0599ebe3
4 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cmd/csaf_downloader/config.go
View file

@ -10,7 +10,9 @@ package main
import (
"net/http"
"time"
"github.com/csaf-poc/csaf_distribution/v2/internal/models"
"github.com/csaf-poc/csaf_distribution/v2/internal/options"
)
@ -20,13 +22,14 @@ const (
)
type config struct {
Directory *string `short:"d" long:"directory" description:"DIRectory to store the downloaded files in" value-name:"DIR" toml:"directory"`
Insecure bool `long:"insecure" description:"Do not check TLS certificates from provider" toml:"insecure"`
IgnoreSignatureCheck bool `long:"ignoresigcheck" description:"Ignore signature check results, just warn on mismatch" toml:"ignoresigcheck"`
Version bool `long:"version" description:"Display version of the binary" toml:"-"`
Verbose bool `long:"verbose" short:"v" description:"Verbose output" toml:"verbose"`
Rate *float64 `long:"rate" short:"r" description:"The average upper limit of https operations per second (defaults to unlimited)" toml:"rate"`
Worker int `long:"worker" short:"w" description:"NUMber of concurrent downloads" value-name:"NUM" toml:"worker"`
Directory *string `short:"d" long:"directory" description:"DIRectory to store the downloaded files in" value-name:"DIR" toml:"directory"`
Insecure bool `long:"insecure" description:"Do not check TLS certificates from provider" toml:"insecure"`
IgnoreSignatureCheck bool `long:"ignoresigcheck" description:"Ignore signature check results, just warn on mismatch" toml:"ignoresigcheck"`
Version bool `long:"version" description:"Display version of the binary" toml:"-"`
Verbose bool `long:"verbose" short:"v" description:"Verbose output" toml:"verbose"`
Rate *float64 `long:"rate" short:"r" description:"The average upper limit of https operations per second (defaults to unlimited)" toml:"rate"`
Worker int `long:"worker" short:"w" description:"NUMber of concurrent downloads" value-name:"NUM" toml:"worker"`
Range *models.TimeRange `long:"timerange" short:"t" description:"RANGE of time from which advisories to download" value-name:"RANGE" toml:"timerange"`
ExtraHeader http.Header `long:"header" short:"H" description:"One or more extra HTTP header fields" toml:"header"`
@ -35,6 +38,8 @@ type config struct {
RemoteValidatorPresets []string `long:"validatorpreset" description:"One or more PRESETS to validate remotely" value-name:"PRESETS" toml:"validatorpreset"`
Config string `short:"c" long:"config" description:"Path to config TOML file" value-name:"TOML-FILE" toml:"-"`
ageAccept func(time.Time) bool
}
// configPaths are the potential file locations of the config file.

5
cmd/csaf_downloader/downloader.go
View file

@ -153,6 +153,11 @@ func (d *downloader) download(ctx context.Context, domain string) error {
base,
nil)
// Do we need time range based filtering?
if d.cfg.Range != nil {
afp.AgeAccept = d.cfg.Range.Contains
}
return afp.Process(func(label csaf.TLPLabel, files []csaf.AdvisoryFile) error {
return d.downloadFiles(ctx, label, files)
})

19
csaf/advisories.go
View file

@ -14,6 +14,7 @@ import (
"net/http"
"net/url"
"strings"
"time"
"github.com/csaf-poc/csaf_distribution/v2/util"
)
@ -71,11 +72,12 @@ func (haf HashedAdvisoryFile) SignURL() string { return haf.name(3, ".asc") }
// AdvisoryFileProcessor implements the extraction of
// advisory file names from a given provider metadata.
type AdvisoryFileProcessor struct {
client util.Client
expr *util.PathEval
doc any
base *url.URL
log func(format string, args ...any)
AgeAccept func(time.Time) bool
client util.Client
expr *util.PathEval
doc any
base *url.URL
log func(format string, args ...any)
}
// NewAdvisoryFileProcessor constructs an filename extractor
@ -287,6 +289,13 @@ func (afp *AdvisoryFileProcessor) processROLIE(
rfeed.Entries(func(entry *Entry) {
// Filter if we have date checking.
if afp.AgeAccept != nil {
if pub := time.Time(entry.Published); !pub.IsZero() && !afp.AgeAccept(pub) {
return
}
}
var self, sha256, sha512, sign string
for i := range entry.Link {

5
internal/models/models.go
View file

@ -79,3 +79,8 @@ func (tr *TimeRange) UnmarshalText(text []byte) error {
*tr = NewTimeInterval(start, end)
return nil
}
// Contains return true if the given time is inside this time interval.
func (tr TimeRange) Contains(t time.Time) bool {
return !(t.Before(tr[0]) || t.After(tr[1]))
}