slipenkomk/sequoia-sq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disregard bad information in the signers user ID subpacket.

Browse Source 
- Fixes #148.
This commit is contained in:
Justus Winter 2024-09-26 16:18:02 +02:00
parent fad2d75de2
commit 8468817010
No known key found for this signature in database
GPG Key ID: 686F55B4AB2B3386
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/commands.rs
View File

@ -384,15 +384,8 @@ impl<'c, 'store, 'rstore> VHelper<'c, 'store, 'rstore> {
let cert_store = sequoia_wot::store::CertStore::from_store(
cert_store, self.sq.policy, reference_time);
let userids = if let Some(userid) = sig.signers_user_id() {
let userid = UserID::from(userid);
wprintln!(indent=prefix,
"Signature was made by {}",
String::from_utf8_lossy(userid.value()));
vec![ userid ]
} else {
cert_store.certified_userids_of(&cert_fpr)
};
let userids =
cert_store.certified_userids_of(&cert_fpr);
if userids.is_empty() {
wprintln!(indent=prefix,
@ -467,8 +460,24 @@ impl<'c, 'store, 'rstore> VHelper<'c, 'store, 'rstore> {
trusted = false;
} else {
trusted = true;
signer_userid = String::from_utf8_lossy(
authenticated_userids[0].value()).to_string();
// If we managed to authenticate the
// signers user ID, prefer that one.
if let Some(u) = sig.signers_user_id()
.and_then(|u| {
authenticated_userids.contains(
&UserID::from(u))
.then_some(u)
})
{
signer_userid = String::from_utf8_lossy(u)
.to_string();
} else {
// Else just pick the first one.
signer_userid = String::from_utf8_lossy(
authenticated_userids[0].value())
.to_string();
}
}
}
} else {