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

Write correct url prefix to provider-metadata.

Browse source
This commit is contained in:
Sascha L. Teichmann 2022-05-19 12:22:06 +02:00
parent a2d96872e1
commit a50ed4ab01
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/csaf_aggregator/indices.go
View file

@ -144,7 +144,7 @@ func (w *worker) writeROLIE(label string, summaries []summary) error {
fname := "csaf-feed-tlp-" + labelFolder + ".json" 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))
@ -199,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

8
csaf/models.go
View file

@ -607,11 +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)
}
prefix := "/.well-known/csaf" // NewProviderMetadataPrefix creates a new provider with a given prefix
// and tlps feeds.
func NewProviderMetadataPrefix(prefix string, tlps []TLPLabel) *ProviderMetadata {
pm := NewProviderMetadata( pm := NewProviderMetadata(
domain + prefix + "/provider-metadata.json") prefix + "/provider-metadata.json")
if len(tlps) == 0 { if len(tlps) == 0 {
return pm return pm