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

Merge pull request #145 from csaf-poc/rolie-feed-in-label-folder

Browse source 
Move ROLIE feed to respective folder. For Issue #143, #144
This commit is contained in:
Fadi Abbud 2022-05-19 14:17:24 +02:00 • committed by GitHub
commit f6fa366ee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/csaf_aggregator/indices.go
View file

@ -139,10 +139,12 @@ func (w *worker) writeIndex(label string, summaries []summary) error {
func (w *worker) writeROLIE(label string, summaries []summary) error { func (w *worker) writeROLIE(label string, summaries []summary) error {
fname := "csaf-feed-tlp-" + strings.ToLower(label) + ".json" labelFolder := strings.ToLower(label)
fname := "csaf-feed-tlp-" + labelFolder + ".json"
feedURL := w.cfg.Domain + "/.well-known/csaf-aggregator/" + feedURL := w.cfg.Domain + "/.well-known/csaf-aggregator/" +
w.provider.Name + "/" + fname w.provider.Name + "/" + labelFolder + "/" + fname
entries := make([]*csaf.Entry, len(summaries)) entries := make([]*csaf.Entry, len(summaries))
@ -197,7 +199,7 @@ func (w *worker) writeROLIE(label string, summaries []summary) error {
// Sort by descending updated order. // Sort by descending updated order.
rolie.SortEntriesByUpdated() rolie.SortEntriesByUpdated()
path := filepath.Join(w.dir, fname) path := filepath.Join(w.dir, labelFolder, fname)
return util.WriteToFile(path, rolie) return util.WriteToFile(path, rolie)
} }

4
cmd/csaf_aggregator/mirror.go
View file

@ -203,8 +203,8 @@ func (w *worker) writeProviderMetadata() error {
fname := filepath.Join(w.dir, "provider-metadata.json") fname := filepath.Join(w.dir, "provider-metadata.json")
pm := csaf.NewProviderMetadataDomain( pm := csaf.NewProviderMetadataPrefix(
w.cfg.Domain, w.cfg.Domain+"/.well-known/csaf-aggreator/"+w.provider.Name,
w.labelsFromSummaries()) w.labelsFromSummaries())
// Figure out the role // Figure out the role

10
csaf/models.go
View file

@ -607,9 +607,15 @@ func NewProviderMetadata(canonicalURL string) *ProviderMetadata {
// NewProviderMetadataDomain creates a new provider with the given URL // NewProviderMetadataDomain creates a new provider with the given URL
// and tlps feeds. // and tlps feeds.
func NewProviderMetadataDomain(domain string, tlps []TLPLabel) *ProviderMetadata { func NewProviderMetadataDomain(domain string, tlps []TLPLabel) *ProviderMetadata {
return NewProviderMetadataPrefix(domain+"/.well-known/csaf", tlps)
}
// NewProviderMetadataPrefix creates a new provider with a given prefix
// and tlps feeds.
func NewProviderMetadataPrefix(prefix string, tlps []TLPLabel) *ProviderMetadata {
pm := NewProviderMetadata( pm := NewProviderMetadata(
domain + "/.well-known/csaf/provider-metadata.json") prefix + "/provider-metadata.json")
if len(tlps) == 0 { if len(tlps) == 0 {
return pm return pm
@ -622,7 +628,7 @@ func NewProviderMetadataDomain(domain string, tlps []TLPLabel) *ProviderMetadata
for i, t := range tlps { for i, t := range tlps {
lt := strings.ToLower(string(t)) lt := strings.ToLower(string(t))
feed := "csaf-feed-tlp-" + lt + ".json" feed := "csaf-feed-tlp-" + lt + ".json"
url := JSONURL(domain + "/.well-known/csaf/" + lt + "/" + feed) url := JSONURL(prefix + "/" + lt + "/" + feed)
t := t t := t
feeds[i] = Feed{ feeds[i] = Feed{