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

fix: don't drop error messages from loading provider-metadata.json

Browse source 
previously in case case of trying last resort dns, all other error messages were dropped
This commit is contained in:
Marius Goetze 2024-04-19 14:04:12 +02:00 • committed by Paul Schwabauer
parent cb1ed601dd
commit a46c286cf4
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
csaf/providermetaloader.go
View file

@ -173,6 +173,8 @@ func (pmdl *ProviderMetadataLoader) Load(domain string) *LoadedProviderMetadata
// We have a candidate. // We have a candidate.
if wellknownResult.Valid() { if wellknownResult.Valid() {
wellknownGood = wellknownResult wellknownGood = wellknownResult
} else {
pmdl.messages.AppendUnique(wellknownResult.Messages)
} }
// Next load the PMDs from security.txt // Next load the PMDs from security.txt
@ -220,25 +222,28 @@ func (pmdl *ProviderMetadataLoader) Load(domain string) *LoadedProviderMetadata
} }
} }
// Take the good well-known. // Take the good well-known.
wellknownGood.Messages.AppendUnique(pmdl.messages) wellknownGood.Messages = pmdl.messages
return wellknownGood return wellknownGood
} }
// Don't have well-known. Take first good from security.txt. // Don't have well-known. Take first good from security.txt.
ignoreExtras() ignoreExtras()
secGoods[0].Messages.AppendUnique(pmdl.messages) secGoods[0].Messages = pmdl.messages
return secGoods[0] return secGoods[0]
} }
// If we have a good well-known take it. // If we have a good well-known take it.
if wellknownGood != nil { if wellknownGood != nil {
wellknownGood.Messages.AppendUnique(pmdl.messages) wellknownGood.Messages = pmdl.messages
return wellknownGood return wellknownGood
} }
// Last resort: fall back to DNS. // Last resort: fall back to DNS.
dnsURL := "https://csaf.data.security." + domain dnsURL := "https://csaf.data.security." + domain
return pmdl.loadFromURL(dnsURL) dnsURLResult := pmdl.loadFromURL(dnsURL)
pmdl.messages.AppendUnique(dnsURLResult.Messages) // keep order of messages consistent (i.e. last occurred message is last element)
dnsURLResult.Messages = pmdl.messages
return dnsURLResult
} }
// loadFromSecurity loads the PMDs mentioned in the security.txt. // loadFromSecurity loads the PMDs mentioned in the security.txt.