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

Type messages of a checker topic to avoid code duplication

This commit is contained in:
Sascha L. Teichmann 2022-04-22 12:02:21 +02:00 committed by GitHub
parent 880122315d
commit 3df91fa051
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 115 additions and 153 deletions

View file

@ -34,6 +34,9 @@ import (
"github.com/csaf-poc/csaf_distribution/util" "github.com/csaf-poc/csaf_distribution/util"
) )
// topicMessages stores the collected topicMessages for a specific topic.
type topicMessages []string
type processor struct { type processor struct {
opts *options opts *options
client *http.Client client *http.Client
@ -46,14 +49,14 @@ type processor struct {
pmd interface{} pmd interface{}
keys []*crypto.KeyRing keys []*crypto.KeyRing
badIntegrities []string badIntegrities topicMessages
badPGPs []string badPGPs topicMessages
badSignatures []string badSignatures topicMessages
badProviderMetadatas []string badProviderMetadata topicMessages
badSecurities []string badSecurity topicMessages
badIndices []string badIndices topicMessages
badChanges []string badChanges topicMessages
badFolders []string badFolders topicMessages
expr *util.PathEval expr *util.PathEval
} }
@ -105,6 +108,24 @@ func (wt whereType) String() string {
} }
} }
// add adds a message to this topic.
func (m *topicMessages) add(format string, args ...interface{}) {
*m = append(*m, fmt.Sprintf(format, args...))
}
// use signals that we going to use this topic.
func (m *topicMessages) use() {
if *m == nil {
*m = []string{}
}
}
// reset resets the messages to this topic.
func (m *topicMessages) reset() { *m = nil }
// used returns true if we have used this topic.
func (m *topicMessages) used() bool { return *m != nil }
// newProcessor returns a processor structure after assigning the given options to the opts attribute // newProcessor returns a processor structure after assigning the given options to the opts attribute
// and initializing the "alreadyChecked" and "expr" fields. // and initializing the "alreadyChecked" and "expr" fields.
func newProcessor(opts *options) *processor { func newProcessor(opts *options) *processor {
@ -127,13 +148,13 @@ func (p *processor) clean() {
p.pmd = nil p.pmd = nil
p.keys = nil p.keys = nil
p.badIntegrities = nil p.badIntegrities.reset()
p.badPGPs = nil p.badPGPs.reset()
p.badSignatures = nil p.badSignatures.reset()
p.badProviderMetadatas = nil p.badProviderMetadata.reset()
p.badSecurities = nil p.badSecurity.reset()
p.badIndices = nil p.badIndices.reset()
p.badChanges = nil p.badChanges.reset()
} }
// run calls checkDomain function for each domain in the given "domains" parameter. // run calls checkDomain function for each domain in the given "domains" parameter.
@ -247,65 +268,6 @@ func (p *processor) httpClient() *http.Client {
return p.client return p.client
} }
// use checks the given array and initializes an empty array if its nil.
func use(s *[]string) {
if *s == nil {
*s = []string{}
}
}
func used(s []string) bool {
return s != nil
}
// badIntegrity appends a message to the value of "badIntegrity" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badIntegrity(format string, args ...interface{}) {
p.badIntegrities = append(p.badIntegrities, fmt.Sprintf(format, args...))
}
// badSignature appends a message to the value of "badSignature" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badSignature(format string, args ...interface{}) {
p.badSignatures = append(p.badSignatures, fmt.Sprintf(format, args...))
}
// badProviderMetadata appends a message to the value of "badProviderMetadatas" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badProviderMetadata(format string, args ...interface{}) {
p.badProviderMetadatas = append(p.badProviderMetadatas, fmt.Sprintf(format, args...))
}
// badPGP appends a message to the value of "badPGPs" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badPGP(format string, args ...interface{}) {
p.badPGPs = append(p.badPGPs, fmt.Sprintf(format, args...))
}
// badSecurity appends a message to the value of "badSecurity" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badSecurity(format string, args ...interface{}) {
p.badSecurities = append(p.badSecurities, fmt.Sprintf(format, args...))
}
// badIndex appends a message to the value of "badIndices" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badIndex(format string, args ...interface{}) {
p.badIndices = append(p.badIndices, fmt.Sprintf(format, args...))
}
// badChange appends a message to the value of "badChanges" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badChange(format string, args ...interface{}) {
p.badChanges = append(p.badChanges, fmt.Sprintf(format, args...))
}
// badFolder appends a message to the value of "badFolders" field of
// the "processor" struct according to the given format and parameters.
func (p *processor) badFolder(format string, args ...interface{}) {
p.badFolders = append(p.badFolders, fmt.Sprintf(format, args...))
}
var yearFromURL = regexp.MustCompile(`.*/(\d{4})/[^/]+$`) var yearFromURL = regexp.MustCompile(`.*/(\d{4})/[^/]+$`)
func (p *processor) integrity( func (p *processor) integrity(
@ -370,25 +332,25 @@ func (p *processor) integrity(
} }
// Check if file is in the right folder. // Check if file is in the right folder.
use(&p.badFolders) p.badFolders.use()
if date, err := p.expr.Eval( if date, err := p.expr.Eval(
`$.document.tracking.initial_release_date`, doc); err != nil { `$.document.tracking.initial_release_date`, doc); err != nil {
p.badFolder( p.badFolders.add(
"Extracting 'initial_release_date' from %s failed: %v", u, err) "Extracting 'initial_release_date' from %s failed: %v", u, err)
} else if text, ok := date.(string); !ok { } else if text, ok := date.(string); !ok {
p.badFolder("'initial_release_date' is not a string in %s", u) p.badFolders.add("'initial_release_date' is not a string in %s", u)
} else if d, err := time.Parse(time.RFC3339, text); err != nil { } else if d, err := time.Parse(time.RFC3339, text); err != nil {
p.badFolder( p.badFolders.add(
"Parsing 'initial_release_date' as RFC3339 failed in %s: %v", u, err) "Parsing 'initial_release_date' as RFC3339 failed in %s: %v", u, err)
} else if m := yearFromURL.FindStringSubmatch(u); m == nil { } else if m := yearFromURL.FindStringSubmatch(u); m == nil {
p.badFolder("No year folder found in %s", u) p.badFolders.add("No year folder found in %s", u)
} else if year, _ := strconv.Atoi(m[1]); d.UTC().Year() != year { } else if year, _ := strconv.Atoi(m[1]); d.UTC().Year() != year {
p.badFolder("%s should be in folder %d", u, d.UTC().Year()) p.badFolders.add("%s should be in folder %d", u, d.UTC().Year())
} }
// Check hashes // Check hashes
use(&p.badIntegrities) p.badIntegrities.use()
for _, x := range []struct { for _, x := range []struct {
ext string ext string
@ -400,11 +362,11 @@ func (p *processor) integrity(
hashFile := u + "." + x.ext hashFile := u + "." + x.ext
p.checkTLS(hashFile) p.checkTLS(hashFile)
if res, err = client.Get(hashFile); err != nil { if res, err = client.Get(hashFile); err != nil {
p.badIntegrity("Fetching %s failed: %v.", hashFile, err) p.badIntegrities.add("Fetching %s failed: %v.", hashFile, err)
continue continue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
p.badIntegrity("Fetching %s failed: Status code %d (%s)", p.badIntegrities.add("Fetching %s failed: Status code %d (%s)",
hashFile, res.StatusCode, res.Status) hashFile, res.StatusCode, res.Status)
continue continue
} }
@ -413,15 +375,15 @@ func (p *processor) integrity(
return hashFromReader(res.Body) return hashFromReader(res.Body)
}() }()
if err != nil { if err != nil {
p.badIntegrity("Reading %s failed: %v.", hashFile, err) p.badIntegrities.add("Reading %s failed: %v.", hashFile, err)
continue continue
} }
if len(h) == 0 { if len(h) == 0 {
p.badIntegrity("No hash found in %s.", hashFile) p.badIntegrities.add("No hash found in %s.", hashFile)
continue continue
} }
if !bytes.Equal(h, x.hash) { if !bytes.Equal(h, x.hash) {
p.badIntegrity("%s hash of %s does not match %s.", p.badIntegrities.add("%s hash of %s does not match %s.",
strings.ToUpper(x.ext), u, hashFile) strings.ToUpper(x.ext), u, hashFile)
} }
} }
@ -430,14 +392,14 @@ func (p *processor) integrity(
sigFile := u + ".asc" sigFile := u + ".asc"
p.checkTLS(sigFile) p.checkTLS(sigFile)
use(&p.badSignatures) p.badSignatures.use()
if res, err = client.Get(sigFile); err != nil { if res, err = client.Get(sigFile); err != nil {
p.badSignature("Fetching %s failed: %v.", sigFile, err) p.badSignatures.add("Fetching %s failed: %v.", sigFile, err)
continue continue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
p.badSignature("Fetching %s failed: status code %d (%s)", p.badSignatures.add("Fetching %s failed: status code %d (%s)",
sigFile, res.StatusCode, res.Status) sigFile, res.StatusCode, res.Status)
continue continue
} }
@ -451,7 +413,7 @@ func (p *processor) integrity(
return crypto.NewPGPSignatureFromArmored(string(all)) return crypto.NewPGPSignatureFromArmored(string(all))
}() }()
if err != nil { if err != nil {
p.badSignature("Loading signature from %s failed: %v.", p.badSignatures.add("Loading signature from %s failed: %v.",
sigFile, err) sigFile, err)
continue continue
} }
@ -467,7 +429,7 @@ func (p *processor) integrity(
} }
} }
if !verified { if !verified {
p.badSignature("Signature of %s could not be verified.", u) p.badSignatures.add("Signature of %s could not be verified.", u)
} }
} }
} }
@ -479,11 +441,11 @@ func (p *processor) processROLIEFeed(feed string) error {
client := p.httpClient() client := p.httpClient()
res, err := client.Get(feed) res, err := client.Get(feed)
if err != nil { if err != nil {
p.badProviderMetadata("Cannot fetch feed %s: %v", feed, err) p.badProviderMetadata.add("Cannot fetch feed %s: %v", feed, err)
return errContinue return errContinue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
p.badProviderMetadata("Fetching %s failed. Status code %d (%s)", p.badProviderMetadata.add("Fetching %s failed. Status code %d (%s)",
feed, res.StatusCode, res.Status) feed, res.StatusCode, res.Status)
return errContinue return errContinue
} }
@ -492,12 +454,12 @@ func (p *processor) processROLIEFeed(feed string) error {
return csaf.LoadROLIEFeed(res.Body) return csaf.LoadROLIEFeed(res.Body)
}() }()
if err != nil { if err != nil {
p.badProviderMetadata("Loading ROLIE feed failed: %v.", err) p.badProviderMetadata.add("Loading ROLIE feed failed: %v.", err)
return errContinue return errContinue
} }
base, err := basePath(feed) base, err := basePath(feed)
if err != nil { if err != nil {
p.badProviderMetadata("Bad base path: %v", err) p.badProviderMetadata.add("Bad base path: %v", err)
return errContinue return errContinue
} }
@ -509,7 +471,7 @@ func (p *processor) processROLIEFeed(feed string) error {
} }
} }
if err := p.integrity(files, base, rolieMask, p.badProviderMetadata); err != nil && if err := p.integrity(files, base, rolieMask, p.badProviderMetadata.add); err != nil &&
err != errContinue { err != errContinue {
return err return err
} }
@ -533,17 +495,17 @@ func (p *processor) checkIndex(base string, mask whereType) error {
index := base + "/index.txt" index := base + "/index.txt"
p.checkTLS(index) p.checkTLS(index)
use(&p.badIndices) p.badIndices.use()
res, err := client.Get(index) res, err := client.Get(index)
if err != nil { if err != nil {
p.badIndex("Fetching %s failed: %v", index, err) p.badIndices.add("Fetching %s failed: %v", index, err)
return errContinue return errContinue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
// It's optional // It's optional
if res.StatusCode != http.StatusNotFound { if res.StatusCode != http.StatusNotFound {
p.badIndex("Fetching %s failed. Status code %d (%s)", p.badIndices.add("Fetching %s failed. Status code %d (%s)",
index, res.StatusCode, res.Status) index, res.StatusCode, res.Status)
} }
return errContinue return errContinue
@ -559,11 +521,11 @@ func (p *processor) checkIndex(base string, mask whereType) error {
return files, scanner.Err() return files, scanner.Err()
}() }()
if err != nil { if err != nil {
p.badIndex("Reading %s failed: %v", index, err) p.badIndices.add("Reading %s failed: %v", index, err)
return errContinue return errContinue
} }
return p.integrity(files, base, mask, p.badIndex) return p.integrity(files, base, mask, p.badIndices.add)
} }
// checkChanges fetches the "changes.csv" and calls the "checkTLS" method for HTTPs checks. // checkChanges fetches the "changes.csv" and calls the "checkTLS" method for HTTPs checks.
@ -576,16 +538,16 @@ func (p *processor) checkChanges(base string, mask whereType) error {
p.checkTLS(changes) p.checkTLS(changes)
res, err := client.Get(changes) res, err := client.Get(changes)
use(&p.badChanges) p.badChanges.use()
if err != nil { if err != nil {
p.badChange("Fetching %s failed: %v", changes, err) p.badChanges.add("Fetching %s failed: %v", changes, err)
return errContinue return errContinue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
if res.StatusCode != http.StatusNotFound { if res.StatusCode != http.StatusNotFound {
// It's optional // It's optional
p.badChange("Fetching %s failed. Status code %d (%s)", p.badChanges.add("Fetching %s failed. Status code %d (%s)",
changes, res.StatusCode, res.Status) changes, res.StatusCode, res.Status)
} }
return errContinue return errContinue
@ -616,17 +578,17 @@ func (p *processor) checkChanges(base string, mask whereType) error {
return times, files, nil return times, files, nil
}() }()
if err != nil { if err != nil {
p.badChange("Reading %s failed: %v", changes, err) p.badChanges.add("Reading %s failed: %v", changes, err)
return errContinue return errContinue
} }
if !sort.SliceIsSorted(times, func(i, j int) bool { if !sort.SliceIsSorted(times, func(i, j int) bool {
return times[j].Before(times[i]) return times[j].Before(times[i])
}) { }) {
p.badChange("%s is not sorted in descending order", changes) p.badChanges.add("%s is not sorted in descending order", changes)
} }
return p.integrity(files, base, mask, p.badChange) return p.integrity(files, base, mask, p.badChanges.add)
} }
func (p *processor) processROLIEFeeds(domain string, feeds [][]csaf.Feed) error { func (p *processor) processROLIEFeeds(domain string, feeds [][]csaf.Feed) error {
@ -643,7 +605,7 @@ func (p *processor) processROLIEFeeds(domain string, feeds [][]csaf.Feed) error
} }
up, err := url.Parse(string(*feed.URL)) up, err := url.Parse(string(*feed.URL))
if err != nil { if err != nil {
p.badProviderMetadata("Invalid URL %s in feed: %v.", *feed.URL, err) p.badProviderMetadata.add("Invalid URL %s in feed: %v.", *feed.URL, err)
continue continue
} }
feedURL := base.ResolveReference(up).String() feedURL := base.ResolveReference(up).String()
@ -669,7 +631,7 @@ func (p *processor) checkCSAFs(domain string) error {
if hasRolie { if hasRolie {
var feeds [][]csaf.Feed var feeds [][]csaf.Feed
if err := util.ReMarshalJSON(&feeds, rolie); err != nil { if err := util.ReMarshalJSON(&feeds, rolie); err != nil {
p.badProviderMetadata("ROLIE feeds are not compatible: %v.", err) p.badProviderMetadata.add("ROLIE feeds are not compatible: %v.", err)
} else if err := p.processROLIEFeeds(domain, feeds); err != nil { } else if err := p.processROLIEFeeds(domain, feeds); err != nil {
if err != errContinue { if err != errContinue {
return err return err
@ -723,7 +685,7 @@ func (p *processor) checkMissing(string) error {
where = append(where, in+" "+mask.String()) where = append(where, in+" "+mask.String())
} }
} }
p.badIntegrity("%s %s", f, strings.Join(where, ", ")) p.badIntegrities.add("%s %s", f, strings.Join(where, ", "))
} }
return nil return nil
} }
@ -828,12 +790,12 @@ func extractProviderURL(r io.Reader) (string, error) {
// checkProviderMetadata checks provider-metadata.json. If it exists, // checkProviderMetadata checks provider-metadata.json. If it exists,
// decodes, and validates against the JSON schema. // decodes, and validates against the JSON schema.
// According to the result, the respective error messages are passed // According to the result, the respective error messages added to
// to the badProviderMetadatas method. // badProviderMetadata.
// It returns nil if all checks are passed. // It returns nil if all checks are passed.
func (p *processor) checkProviderMetadata(domain string) error { func (p *processor) checkProviderMetadata(domain string) error {
use(&p.badProviderMetadatas) p.badProviderMetadata.use()
found := func(url string, content io.Reader) error { found := func(url string, content io.Reader) error {
@ -842,7 +804,7 @@ func (p *processor) checkProviderMetadata(domain string) error {
tee := io.TeeReader(content, hash) tee := io.TeeReader(content, hash)
if err := json.NewDecoder(tee).Decode(&p.pmd); err != nil { if err := json.NewDecoder(tee).Decode(&p.pmd); err != nil {
p.badProviderMetadata("%s: Decoding JSON failed: %v", url, err) p.badProviderMetadata.add("%s: Decoding JSON failed: %v", url, err)
return errContinue return errContinue
} }
@ -853,11 +815,11 @@ func (p *processor) checkProviderMetadata(domain string) error {
return err return err
} }
if len(errors) > 0 { if len(errors) > 0 {
p.badProviderMetadata("%s: Validating against JSON schema failed:", url) p.badProviderMetadata.add("%s: Validating against JSON schema failed:", url)
for _, msg := range errors { for _, msg := range errors {
p.badProviderMetadata(strings.ReplaceAll(msg, `%`, `%%`)) p.badProviderMetadata.add(strings.ReplaceAll(msg, `%`, `%%`))
} }
p.badProviderMetadata("STOPPING here - cannot perform other checks.") p.badProviderMetadata.add("STOPPING here - cannot perform other checks.")
return errStop return errStop
} }
p.pmdURL = url p.pmdURL = url
@ -869,8 +831,8 @@ func (p *processor) checkProviderMetadata(domain string) error {
} }
if p.pmdURL == "" { if p.pmdURL == "" {
p.badProviderMetadata("No provider-metadata.json found.") p.badProviderMetadata.add("No provider-metadata.json found.")
p.badProviderMetadata("STOPPING here - cannot perform other checks.") p.badProviderMetadata.add("STOPPING here - cannot perform other checks.")
return errStop return errStop
} }
return nil return nil
@ -885,17 +847,17 @@ func (p *processor) checkSecurity(domain string) error {
client := p.httpClient() client := p.httpClient()
use(&p.badSecurities) p.badSecurity.use()
path := "https://" + domain + "/.well-known/security.txt" path := "https://" + domain + "/.well-known/security.txt"
res, err := client.Get(path) res, err := client.Get(path)
if err != nil { if err != nil {
p.badSecurity("Fetching %s failed: %v", path, err) p.badSecurity.add("Fetching %s failed: %v", path, err)
return errContinue return errContinue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
p.badSecurity("Fetching %s failed. Status code %d (%s)", p.badSecurity.add("Fetching %s failed. Status code %d (%s)",
path, res.StatusCode, res.Status) path, res.StatusCode, res.Status)
return errContinue return errContinue
} }
@ -912,18 +874,18 @@ func (p *processor) checkSecurity(domain string) error {
return "", lines.Err() return "", lines.Err()
}() }()
if err != nil { if err != nil {
p.badSecurity("Error while reading security.txt: %v", err) p.badSecurity.add("Error while reading security.txt: %v", err)
return errContinue return errContinue
} }
if u == "" { if u == "" {
p.badSecurity("No CSAF line found in security.txt.") p.badSecurity.add("No CSAF line found in security.txt.")
return errContinue return errContinue
} }
// Try to load // Try to load
up, err := url.Parse(u) up, err := url.Parse(u)
if err != nil { if err != nil {
p.badSecurity("CSAF URL '%s' invalid: %v", u, err) p.badSecurity.add("CSAF URL '%s' invalid: %v", u, err)
return errContinue return errContinue
} }
@ -935,11 +897,11 @@ func (p *processor) checkSecurity(domain string) error {
u = base.ResolveReference(up).String() u = base.ResolveReference(up).String()
p.checkTLS(u) p.checkTLS(u)
if res, err = client.Get(u); err != nil { if res, err = client.Get(u); err != nil {
p.badSecurity("Cannot fetch %s from security.txt: %v", u, err) p.badSecurity.add("Cannot fetch %s from security.txt: %v", u, err)
return errContinue return errContinue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
p.badSecurity("Fetching %s failed. Status code %d (%s)", p.badSecurity.add("Fetching %s failed. Status code %d (%s)",
u, res.StatusCode, res.Status) u, res.StatusCode, res.Status)
return errContinue return errContinue
} }
@ -947,12 +909,12 @@ func (p *processor) checkSecurity(domain string) error {
// Compare checksums to already read provider-metadata.json. // Compare checksums to already read provider-metadata.json.
h := sha256.New() h := sha256.New()
if _, err := io.Copy(h, res.Body); err != nil { if _, err := io.Copy(h, res.Body); err != nil {
p.badSecurity("Reading %s failed: %v", u, err) p.badSecurity.add("Reading %s failed: %v", u, err)
return errContinue return errContinue
} }
if !bytes.Equal(h.Sum(nil), p.pmd256) { if !bytes.Equal(h.Sum(nil), p.pmd256) {
p.badSecurity("Content of %s from security.txt is not "+ p.badSecurity.add("Content of %s from security.txt is not "+
"identical to .well-known/csaf/provider-metadata.json", u) "identical to .well-known/csaf/provider-metadata.json", u)
} }
@ -965,22 +927,22 @@ func (p *processor) checkSecurity(domain string) error {
// in case of errors. It returns nil if all checks are passed. // in case of errors. It returns nil if all checks are passed.
func (p *processor) checkPGPKeys(domain string) error { func (p *processor) checkPGPKeys(domain string) error {
use(&p.badPGPs) p.badPGPs.use()
src, err := p.expr.Eval("$.pgp_keys", p.pmd) src, err := p.expr.Eval("$.pgp_keys", p.pmd)
if err != nil { if err != nil {
p.badPGP("No public OpenPGP keys found: %v.", err) p.badPGPs.add("No public OpenPGP keys found: %v.", err)
return errContinue return errContinue
} }
var keys []csaf.PGPKey var keys []csaf.PGPKey
if err := util.ReMarshalJSON(&keys, src); err != nil { if err := util.ReMarshalJSON(&keys, src); err != nil {
p.badPGP("Invalid public OpenPGP keys: %v.", err) p.badPGPs.add("Invalid public OpenPGP keys: %v.", err)
return errContinue return errContinue
} }
if len(keys) == 0 { if len(keys) == 0 {
p.badPGP("No public OpenPGP keys found.") p.badPGPs.add("No public OpenPGP keys found.")
return errContinue return errContinue
} }
@ -996,12 +958,12 @@ func (p *processor) checkPGPKeys(domain string) error {
for i := range keys { for i := range keys {
key := &keys[i] key := &keys[i]
if key.URL == nil { if key.URL == nil {
p.badPGP("Missing URL for fingerprint %x.", key.Fingerprint) p.badPGPs.add("Missing URL for fingerprint %x.", key.Fingerprint)
continue continue
} }
up, err := url.Parse(*key.URL) up, err := url.Parse(*key.URL)
if err != nil { if err != nil {
p.badPGP("Invalid URL '%s': %v", *key.URL, err) p.badPGPs.add("Invalid URL '%s': %v", *key.URL, err)
continue continue
} }
@ -1010,11 +972,11 @@ func (p *processor) checkPGPKeys(domain string) error {
res, err := client.Get(u) res, err := client.Get(u)
if err != nil { if err != nil {
p.badPGP("Fetching public OpenPGP key %s failed: %v.", u, err) p.badPGPs.add("Fetching public OpenPGP key %s failed: %v.", u, err)
continue continue
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
p.badPGP("Fetching public OpenPGP key %s status code: %d (%s)", p.badPGPs.add("Fetching public OpenPGP key %s status code: %d (%s)",
u, res.StatusCode, res.Status) u, res.StatusCode, res.Status)
continue continue
} }
@ -1025,24 +987,24 @@ func (p *processor) checkPGPKeys(domain string) error {
}() }()
if err != nil { if err != nil {
p.badPGP("Reading public OpenPGP key %s failed: %v", u, err) p.badPGPs.add("Reading public OpenPGP key %s failed: %v", u, err)
continue continue
} }
if ckey.GetFingerprint() != string(key.Fingerprint) { if ckey.GetFingerprint() != string(key.Fingerprint) {
p.badPGP("Fingerprint of public OpenPGP key %s does not match remotely loaded.", u) p.badPGPs.add("Fingerprint of public OpenPGP key %s does not match remotely loaded.", u)
continue continue
} }
keyring, err := crypto.NewKeyRing(ckey) keyring, err := crypto.NewKeyRing(ckey)
if err != nil { if err != nil {
p.badPGP("Creating store for public OpenPGP key %s failed: %v.", u, err) p.badPGPs.add("Creating store for public OpenPGP key %s failed: %v.", u, err)
continue continue
} }
p.keys = append(p.keys, keyring) p.keys = append(p.keys, keyring)
} }
if len(p.keys) == 0 { if len(p.keys) == 0 {
p.badPGP("No OpenPGP keys loaded.") p.badPGPs.add("No OpenPGP keys loaded.")
} }
return nil return nil
} }

View file

@ -93,30 +93,30 @@ func (r *redirectsReporter) report(p *processor, domain *Domain) {
// "message" field value of the "Requirement" struct as a result of that. // "message" field value of the "Requirement" struct as a result of that.
func (r *providerMetadataReport) report(p *processor, domain *Domain) { func (r *providerMetadataReport) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badProviderMetadatas) { if !p.badProviderMetadata.used() {
req.message("No provider-metadata.json checked.") req.message("No provider-metadata.json checked.")
return return
} }
if len(p.badProviderMetadatas) == 0 { if len(p.badProviderMetadata) == 0 {
req.message("Found good provider metadata.") req.message("Found good provider metadata.")
return return
} }
req.Messages = p.badProviderMetadatas req.Messages = p.badProviderMetadata
} }
// report tests the "security.txt" file and sets the "message" field value // report tests the "security.txt" file and sets the "message" field value
// of the "Requirement" struct as a result of that. // of the "Requirement" struct as a result of that.
func (r *securityReporter) report(p *processor, domain *Domain) { func (r *securityReporter) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badSecurities) { if !p.badSecurity.used() {
req.message("No security.txt checked.") req.message("No security.txt checked.")
return return
} }
if len(p.badSecurities) == 0 { if len(p.badSecurity) == 0 {
req.message("Found good security.txt.") req.message("Found good security.txt.")
return return
} }
req.Messages = p.badSecurities req.Messages = p.badSecurity
} }
func (r *wellknownMetadataReporter) report(_ *processor, domain *Domain) { func (r *wellknownMetadataReporter) report(_ *processor, domain *Domain) {
@ -133,7 +133,7 @@ func (r *dnsPathReporter) report(_ *processor, domain *Domain) {
func (r *oneFolderPerYearReport) report(p *processor, domain *Domain) { func (r *oneFolderPerYearReport) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badFolders) { if !p.badFolders.used() {
req.message("No checks if files are in right folders were performed.") req.message("No checks if files are in right folders were performed.")
return return
} }
@ -146,7 +146,7 @@ func (r *oneFolderPerYearReport) report(p *processor, domain *Domain) {
func (r *indexReporter) report(p *processor, domain *Domain) { func (r *indexReporter) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badIndices) { if !p.badIndices.used() {
req.message("No index.txt checked.") req.message("No index.txt checked.")
return return
} }
@ -159,7 +159,7 @@ func (r *indexReporter) report(p *processor, domain *Domain) {
func (r *changesReporter) report(p *processor, domain *Domain) { func (r *changesReporter) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badChanges) { if !p.badChanges.used() {
req.message("No changes.csv checked.") req.message("No changes.csv checked.")
return return
} }
@ -178,7 +178,7 @@ func (r *directoryListingsReporter) report(_ *processor, domain *Domain) {
func (r *integrityReporter) report(p *processor, domain *Domain) { func (r *integrityReporter) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badIntegrities) { if !p.badIntegrities.used() {
req.message("No checksums checked.") req.message("No checksums checked.")
return return
} }
@ -191,7 +191,7 @@ func (r *integrityReporter) report(p *processor, domain *Domain) {
func (r *signaturesReporter) report(p *processor, domain *Domain) { func (r *signaturesReporter) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badSignatures) { if !p.badSignatures.used() {
req.message("No signatures checked.") req.message("No signatures checked.")
return return
} }
@ -203,7 +203,7 @@ func (r *signaturesReporter) report(p *processor, domain *Domain) {
func (r *publicPGPKeyReporter) report(p *processor, domain *Domain) { func (r *publicPGPKeyReporter) report(p *processor, domain *Domain) {
req := r.requirement(domain) req := r.requirement(domain)
if !used(p.badPGPs) { if !p.badPGPs.used() {
req.message("No public OpenPGP keys loaded.") req.message("No public OpenPGP keys loaded.")
return return
} }