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

Merge pull request #268 from csaf-poc/no-rolie-index-changes-listings

There are no index.txt, changes.csv in ROLIE dists.
This commit is contained in:
JanHoefelmeyer 2022-08-01 13:18:36 +02:00 committed by GitHub
commit 9890a417b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -85,30 +85,21 @@ type whereType byte
const ( const (
rolieMask = whereType(1) << iota rolieMask = whereType(1) << iota
rolieIndexMask
rolieChangesMask
indexMask indexMask
changesMask changesMask
listingMask listingMask
rolieListingMask
) )
func (wt whereType) String() string { func (wt whereType) String() string {
switch wt { switch wt {
case rolieMask: case rolieMask:
return "ROLIE" return "ROLIE"
case rolieIndexMask:
return "index.txt [ROLIE]"
case rolieChangesMask:
return "changes.csv [ROLIE]"
case indexMask: case indexMask:
return "index.txt" return "index.txt"
case changesMask: case changesMask:
return "changes.csv" return "changes.csv"
case listingMask: case listingMask:
return "directory listing" return "directory listing"
case rolieListingMask:
return "directory listing [ROLIE]"
default: default:
var mixed []string var mixed []string
for mask := rolieMask; mask <= changesMask; mask <<= 1 { for mask := rolieMask; mask <= changesMask; mask <<= 1 {
@ -706,14 +697,6 @@ func (p *processor) processROLIEFeed(feed string) error {
return err return err
} }
if err := p.checkIndex(base, rolieIndexMask); err != nil && err != errContinue {
return err
}
if err := p.checkChanges(base, rolieChangesMask); err != nil && err != errContinue {
return err
}
return nil return nil
} }
@ -954,7 +937,7 @@ func (p *processor) checkMissing(string) error {
for _, f := range files { for _, f := range files {
v := p.alreadyChecked[f] v := p.alreadyChecked[f]
var where []string var where []string
for mask := rolieMask; mask <= rolieListingMask; mask <<= 1 { for mask := rolieMask; mask <= listingMask; mask <<= 1 {
if maxMask&mask == mask { if maxMask&mask == mask {
var in string var in string
if v&mask == mask { if v&mask == mask {