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

Advisories: Time filter download by 'updated' field in ROLIE entries. (#519)

Browse source 
* Use 'updated' field of ROLIE field entries to time filter downloads.

* More suited variable naming
This commit is contained in:
Sascha L. Teichmann 2023-12-04 11:31:14 +01:00 • committed by GitHub
parent 9073a8a282
commit 03e418182d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/csaf_checker/processor.go
View file

@ -33,7 +33,6 @@ import (
"golang.org/x/time/rate" "golang.org/x/time/rate"
"github.com/csaf-poc/csaf_distribution/v3/csaf" "github.com/csaf-poc/csaf_distribution/v3/csaf"
"github.com/csaf-poc/csaf_distribution/v3/internal/models"
"github.com/csaf-poc/csaf_distribution/v3/util" "github.com/csaf-poc/csaf_distribution/v3/util"
) )
@ -548,7 +547,7 @@ func (p *processor) rolieFeedEntries(feed string) ([]csaf.AdvisoryFile, error) {
// Filter if we have date checking. // Filter if we have date checking.
if accept := p.cfg.Range; accept != nil { if accept := p.cfg.Range; accept != nil {
if pub := time.Time(entry.Published); !pub.IsZero() && !accept.Contains(pub) { if t := time.Time(entry.Updated); !t.IsZero() && !accept.Contains(t) {
return return
} }
} }
@ -667,11 +666,6 @@ func (p *processor) integrity(
var folderYear *int var folderYear *int
if m := yearFromURL.FindStringSubmatch(u); m != nil { if m := yearFromURL.FindStringSubmatch(u); m != nil {
year, _ := strconv.Atoi(m[1]) year, _ := strconv.Atoi(m[1])
// Check if the year is in the accepted time interval.
if accept := p.cfg.Range; accept != nil &&
!accept.Intersects(models.Year(year)) {
continue
}
folderYear = &year folderYear = &year
} }

2
csaf/advisories.go
View file

@ -316,7 +316,7 @@ func (afp *AdvisoryFileProcessor) processROLIE(
// Filter if we have date checking. // Filter if we have date checking.
if afp.AgeAccept != nil { if afp.AgeAccept != nil {
if pub := time.Time(entry.Published); !pub.IsZero() && !afp.AgeAccept(pub) { if t := time.Time(entry.Updated); !t.IsZero() && !afp.AgeAccept(t) {
return return
} }
} }

8
internal/models/models.go
View file

@ -31,14 +31,6 @@ func NewTimeInterval(a, b time.Time) TimeRange {
return TimeRange{a, b} return TimeRange{a, b}
} }
// Year returns the time range for a given year.
func Year(year int) TimeRange {
return TimeRange{
time.Date(year, time.January, 1, 0, 0, 0, 0, time.UTC),
time.Date(year, time.December, 31, 23, 59, 59, int(time.Second-time.Nanosecond), time.UTC),
}
}
// guessDate tries to guess an RFC 3339 date time from a given string. // guessDate tries to guess an RFC 3339 date time from a given string.
func guessDate(s string) (time.Time, bool) { func guessDate(s string) (time.Time, bool) {
for _, layout := range []string{ for _, layout := range []string{

24
internal/models/models_test.go
View file

@ -173,27 +173,3 @@ func TestTimeRangeIntersects(t *testing.T) {
} }
} }
} }
// TestTimeRangeYear checks if the Year construction works.
func TestTimeRangeYear(t *testing.T) {
var (
year = Year(1984)
first = time.Date(1984, time.January, 1, 0, 0, 0, 0, time.UTC)
before = first.Add(-time.Nanosecond)
after = time.Date(1984+1, time.January, 1, 0, 0, 0, 0, time.UTC)
last = after.Add(-time.Nanosecond)
)
for _, x := range []struct {
t time.Time
expected bool
}{
{t: first, expected: true},
{t: before, expected: false},
{t: last, expected: true},
{t: after, expected: false},
} {
if got := year.Contains(x.t); got != x.expected {
t.Fatalf("%v: got %t expected %t", x.t, got, x.expected)
}
}
}