From 8bf48a2de26b14802938f40de18713b2525d0c3c Mon Sep 17 00:00:00 2001 From: Fadi Abbud <39081670+Fadiabb@users.noreply.github.com> Date: Thu, 28 Apr 2022 20:46:37 +0200 Subject: [PATCH] Adjust provider for new CSAF CSD02 schema * Replace "pgp_keys" with "public_openpgp_key" in the provider-metadata.json. resolve #112 --- cmd/csaf_checker/processor.go | 2 +- csaf/models.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/csaf_checker/processor.go b/cmd/csaf_checker/processor.go index 47065c3..71f1ca3 100644 --- a/cmd/csaf_checker/processor.go +++ b/cmd/csaf_checker/processor.go @@ -924,7 +924,7 @@ func (p *processor) checkPGPKeys(domain string) error { p.badPGPs.use() - src, err := p.expr.Eval("$.pgp_keys", p.pmd) + src, err := p.expr.Eval("$.public_openpgp_keys", p.pmd) if err != nil { p.badPGPs.add("No public OpenPGP keys found: %v.", err) return errContinue diff --git a/csaf/models.go b/csaf/models.go index 4faea86..506c52d 100644 --- a/csaf/models.go +++ b/csaf/models.go @@ -157,7 +157,7 @@ type ProviderMetadata struct { ListOnCSAFAggregators *bool `json:"list_on_CSAF_aggregators"` MetadataVersion *MetadataVersion `json:"metadata_version"` // required MirrorOnCSAFAggregators *bool `json:"mirror_on_CSAF_aggregators"` // required - PGPKeys []PGPKey `json:"pgp_keys,omitempty"` + PGPKeys []PGPKey `json:"public_openpgp_keys,omitempty"` Publisher *Publisher `json:"publisher,omitempty"` // required Role *MetadataRole `json:"role"` // required }