Empty rolie

cmd/csaf_aggregator/indices.go

@@ -91,6 +91,22 @@ func (w *worker) writeInterims(label string, summaries []summary) error {
 
 func (w *worker) writeCSV(label string, summaries []summary) error {
 
+	fname := filepath.Join(w.dir, label, changesCSV)
+
+	// If we don't have any entries remove existing file.
+	if len(summaries) == 0 {
+		// Does it really exist?
+		if err := os.RemoveAll(fname); err != nil {
+			return fmt.Errorf("unable to remove %q: %w", fname, err)
+		}
+		return nil
+	}
+
+	f, err := os.Create(fname)
+	if err != nil {
+		return err
+	}
+
 	// Do not sort in-place.
 	ss := make([]summary, len(summaries))
 	copy(ss, summaries)
@@ -100,11 +116,6 @@ func (w *worker) writeCSV(label string, summaries []summary) error {
 			ss[j].summary.CurrentReleaseDate)
 	})
 
-	fname := filepath.Join(w.dir, label, changesCSV)
-	f, err := os.Create(fname)
-	if err != nil {
-		return err
-	}
 	out := util.NewFullyQuotedCSWWriter(f)
 
 	record := make([]string, 2)
@@ -137,6 +148,16 @@ func (w *worker) writeCSV(label string, summaries []summary) error {
 func (w *worker) writeIndex(label string, summaries []summary) error {
 
 	fname := filepath.Join(w.dir, label, indexTXT)
+
+	// If we don't have any entries remove existing file.
+	if len(summaries) == 0 {
+		// Does it really exist?
+		if err := os.RemoveAll(fname); err != nil {
+			return fmt.Errorf("unable to remove %q: %w", fname, err)
+		}
+		return nil
+	}
+
 	f, err := os.Create(fname)
 	if err != nil {
 		return err
@@ -157,6 +178,46 @@ func (w *worker) writeIndex(label string, summaries []summary) error {
 	return err2
 }
 
+func (w *worker) writeROLIENoSummaries(label string) error {
+
+	labelFolder := strings.ToLower(label)
+
+	fname := "csaf-feed-tlp-" + labelFolder + ".json"
+
+	feedURL := w.processor.cfg.Domain + "/.well-known/csaf-aggregator/" +
+		w.provider.Name + "/" + labelFolder + "/" + fname
+
+	links := []csaf.Link{{
+		Rel:  "self",
+		HRef: feedURL,
+	}}
+
+	if w.provider.serviceDocument(w.processor.cfg) {
+		links = append(links, csaf.Link{
+			Rel: "service",
+			HRef: w.processor.cfg.Domain + "/.well-known/csaf-aggregator/" +
+				w.provider.Name + "/service.json",
+		})
+	}
+
+	rolie := &csaf.ROLIEFeed{
+		Feed: csaf.FeedData{
+			ID:    "csaf-feed-tlp-" + strings.ToLower(label),
+			Title: "CSAF feed (TLP:" + strings.ToUpper(label) + ")",
+			Link:  links,
+			Category: []csaf.ROLIECategory{{
+				Scheme: "urn:ietf:params:rolie:category:information-type",
+				Term:   "csaf",
+			}},
+			Updated: csaf.TimeStamp(time.Now().UTC()),
+			Entry:   []*csaf.Entry{},
+		},
+	}
+
+	path := filepath.Join(w.dir, labelFolder, fname)
+	return util.WriteToFile(path, rolie)
+}
+
 func (w *worker) writeROLIE(label string, summaries []summary) error {
 
 	labelFolder := strings.ToLower(label)
@@ -311,6 +372,7 @@ func (w *worker) writeService() error {
 func (w *worker) writeIndices() error {
 
 	if len(w.summaries) == 0 || w.dir == "" {
+		w.writeROLIENoSummaries("undefined")
 		return nil
 	}
 

cmd/csaf_checker/processor.go

@@ -265,7 +265,10 @@ func (p *processor) run(domains []string) (*Report, error) {
 			if err == errContinue || err == errStop {
 				continue
 			}
-			return nil, err
+		} else {
+			log.Printf("Failed to find valid provider-metadata.json for domain %s. "+
+				"Continuing with next domain.", d)
+			continue
 		}
 		domain := &Domain{Name: d}
 
@@ -503,12 +506,15 @@ func (p *processor) rolieFeedEntries(feed string) ([]csaf.AdvisoryFile, error) {
 		var rolieDoc any
 		err = json.NewDecoder(bytes.NewReader(all)).Decode(&rolieDoc)
 		return rfeed, rolieDoc, err
-
 	}()
 	if err != nil {
 		p.badProviderMetadata.error("Loading ROLIE feed failed: %v.", err)
 		return nil, errContinue
 	}
+
+	if rfeed.CountEntries() == 0 {
+		p.badROLIEFeed.warn("No entries in %s", feed)
+	}
 	errors, err := csaf.ValidateROLIE(rolieDoc)
 	if err != nil {
 		return nil, err
@@ -1208,8 +1214,6 @@ func (p *processor) checkProviderMetadata(domain string) bool {
 	}
 
 	if !lpmd.Valid() {
-		p.badProviderMetadata.error("No valid provider-metadata.json found.")
-		p.badProviderMetadata.error("STOPPING here - cannot perform other checks.")
 		return false
 	}
 

cmd/csaf_provider/config.go

@@ -31,6 +31,7 @@ const (
 	defaultWeb               = "/var/www/html" // Default web path.
 	defaultNoWebUI           = true
 	defaultUploadLimit       = 50 * 1024 * 1024 // Default limit size of the uploaded file.
+	defaultServiceDocument   = true
 )
 
 type providerMetadataConfig struct {
@@ -226,7 +227,8 @@ func loadConfig() (*config, error) {
 
 	// Preset defaults
 	cfg := config{
-		NoWebUI: defaultNoWebUI,
+		NoWebUI:         defaultNoWebUI,
+		ServiceDocument: defaultServiceDocument,
 	}
 
 	md, err := toml.DecodeFile(path, &cfg)

cmd/csaf_provider/create.go

@@ -17,6 +17,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 	"unicode"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
@@ -153,10 +154,56 @@ func createFeedFolders(c *config, wellknown string) error {
 				return err
 			}
 		}
+		// Create an empty ROLIE feed document
+		if err := createROLIEfeed(c, t, tlpLink); err != nil {
+			return err
+		}
 	}
 	return nil
 }
 
+// createROLIEfeed creates an empty ROLIE feed
+func createROLIEfeed(c *config, t tlp, folder string) error {
+	ts := string(t)
+	feedName := "csaf-feed-tlp-" + ts + ".json"
+
+	feed := filepath.Join(folder, feedName)
+
+	feedURL := csaf.JSONURL(
+		c.CanonicalURLPrefix +
+			"/.well-known/csaf/" + ts + "/" + feedName)
+
+	tlpLabel := csaf.TLPLabel(strings.ToUpper(ts))
+
+	links := []csaf.Link{{
+		Rel:  "self",
+		HRef: string(feedURL),
+	}}
+	// If we have a service document we need to link it.
+	if c.ServiceDocument {
+		links = append(links, csaf.Link{
+			Rel:  "service",
+			HRef: c.CanonicalURLPrefix + "/.well-known/csaf/service.json",
+		})
+	}
+	rolie := &csaf.ROLIEFeed{
+		Feed: csaf.FeedData{
+			ID:    "csaf-feed-tlp-" + ts,
+			Title: "CSAF feed (TLP:" + string(tlpLabel) + ")",
+			Link:  links,
+			Category: []csaf.ROLIECategory{{
+				Scheme: "urn:ietf:params:rolie:category:information-type",
+				Term:   "csaf",
+			}},
+			Updated: csaf.TimeStamp(time.Now().UTC()),
+			Entry:   []*csaf.Entry{},
+		},
+	}
+
+	return util.WriteToFile(feed, rolie)
+
+}
+
 // createOpenPGPFolder creates an openpgp folder besides
 // the provider-metadata.json in the csaf folder.
 func createOpenPGPFolder(c *config, wellknown string) error {

cmd/csaf_provider/rolie.go

@@ -110,6 +110,7 @@ func (c *controller) extendROLIE(
 					Scheme: "urn:ietf:params:rolie:category:information-type",
 					Term:   "csaf",
 				}},
+				Entry: []*csaf.Entry{},
 			},
 		}
 	}

csaf/rolie.go

@@ -185,7 +185,7 @@ type FeedData struct {
 	Link     []Link          `json:"link,omitempty"`
 	Category []ROLIECategory `json:"category,omitempty"`
 	Updated  TimeStamp       `json:"updated"`
-	Entry    []*Entry        `json:"entry,omitempty"`
+	Entry    []*Entry        `json:"entry"`
 }
 
 // ROLIEFeed is a ROLIE feed.
@@ -238,3 +238,8 @@ func (rf *ROLIEFeed) SortEntriesByUpdated() {
 		return time.Time(entries[j].Updated).Before(time.Time(entries[i].Updated))
 	})
 }
+
+// CountEntries returns the number of entries within the feed
+func (rf *ROLIEFeed) CountEntries() int {
+	return len(rf.Feed.Entry)
+}