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

Merge pull request #571 from csaf-poc/fingerprint-no-breaking

Browse source 
Improve PGP fingerprint handling
This commit is contained in:
JanHoefelmeyer 2024-09-09 11:51:09 +02:00 • committed by GitHub
commit 464e88b530
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/csaf_checker/processor.go
View file

@ -1447,9 +1447,9 @@ func (p *processor) checkWellknownSecurityDNS(domain string) error {
} }
// checkPGPKeys checks if the OpenPGP keys are available and valid, fetches // checkPGPKeys checks if the OpenPGP keys are available and valid, fetches
// the the remotely keys and compares the fingerprints. // the remote pubkeys and compares the fingerprints.
// As a result of these a respective error messages are passed to badPGP method // As a result of these checks respective error messages are passed
// in case of errors. It returns nil if all checks are passed. // to badPGP methods. It returns nil if all checks are passed.
func (p *processor) checkPGPKeys(_ string) error { func (p *processor) checkPGPKeys(_ string) error {
p.badPGPs.use() p.badPGPs.use()
@ -1517,7 +1517,7 @@ func (p *processor) checkPGPKeys(_ string) error {
} }
if !strings.EqualFold(ckey.GetFingerprint(), string(key.Fingerprint)) { if !strings.EqualFold(ckey.GetFingerprint(), string(key.Fingerprint)) {
p.badPGPs.error("Fingerprint of public OpenPGP key %s does not match remotely loaded.", u) p.badPGPs.error("Given Fingerprint (%q) of public OpenPGP key %q does not match remotely loaded (%q).", string(key.Fingerprint), u, ckey.GetFingerprint())
continue continue
} }
if p.keys == nil { if p.keys == nil {

2
cmd/csaf_downloader/downloader.go
View file

@ -367,7 +367,7 @@ func (d *downloader) loadOpenPGPKeys(
if !strings.EqualFold(ckey.GetFingerprint(), string(key.Fingerprint)) { if !strings.EqualFold(ckey.GetFingerprint(), string(key.Fingerprint)) {
slog.Warn( slog.Warn(
"Fingerprint of public OpenPGP key does not match remotely loaded", "Fingerprint of public OpenPGP key does not match remotely loaded",
"url", u) "url", u, "fingerprint", key.Fingerprint, "remote-fingerprint", ckey.GetFingerprint())
continue continue
} }
if d.keys == nil { if d.keys == nil {