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

Rework gossip.

Browse Source 
- Currently, when the user requests gossip, we show all the found
    paths as being untrusted, even though some can be authenticated.
    This is confusing.

  - When getting gossip paths, specify the trust roots.  As of
    `sequoia-wot` 0.13.0, this will also authenticate any returned
    paths.

  - Fixes #338.
This commit is contained in:
Neal H. Walfield 2024-10-26 09:23:44 +02:00
parent 5e5be69dab
commit 7401c26ff5
No known key found for this signature in database
GPG Key ID: 6863C9AD5B4D22D3
2 changed files with 26 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/commands/pki.rs
View File

@ -72,6 +72,9 @@ fn have_self_signed_userid(cert: &wot::CertSynopsis,
}
/// Authenticate bindings defined by a Query on a Network
///
/// If `gossip` is specified, paths that are not rooted are still
/// shown (with a trust amount of 0, of course).
pub fn authenticate<'store, 'rstore>(
sq: Sq<'store, 'rstore>,
precompute: bool,
@ -101,12 +104,7 @@ pub fn authenticate<'store, 'rstore>(
cert_store.precompute();
}
let mut n = if gossip {
wot::NetworkBuilder::rootless(cert_store)
} else {
wot::NetworkBuilder::rooted(cert_store,
&*sq.trust_roots())
};
let mut n = wot::NetworkBuilder::rooted(cert_store, &*sq.trust_roots());
if certification_network {
n = n.certification_network();
}
@ -289,46 +287,26 @@ pub fn authenticate<'store, 'rstore>(
&sq, required_amount, show_paths, gossip);
for (fingerprint, userid) in bindings.iter() {
let mut aggregated_amount = 0;
let paths = if gossip {
// Gossip.
let paths = n.gossip(
fingerprint.clone(), userid.clone());
// Sort so the shortest paths come first.
let mut paths: Vec<_> = paths
.iter()
.map(|(path, _amount)| path)
.collect();
paths.sort_by_key(|path| path.len());
// This means: exit code is 0, which is what we want when
// we've found at least one path.
if paths.len() > 0 {
authenticated += 1;
lint_input = false;
}
paths.into_iter()
.map(|p| (p.clone(), 0))
.collect::<Vec<(wot::Path, usize)>>()
n.gossip(fingerprint.clone(), userid.clone())
} else {
let paths = n.authenticate(
userid.clone(), fingerprint.clone(), required_amount);
aggregated_amount = paths.amount();
if aggregated_amount == 0 {
continue;
}
lint_input = false;
if aggregated_amount >= required_amount {
authenticated += 1;
}
paths.into_iter().collect::<Vec<(wot::Path, usize)>>()
n.authenticate(
userid.clone(), fingerprint.clone(), required_amount)
};
let aggregated_amount = paths.amount();
if aggregated_amount == 0 && ! gossip {
continue;
}
lint_input = false;
if gossip {
authenticated += 1;
} else if aggregated_amount >= required_amount {
authenticated += 1;
}
let paths = paths.into_iter().collect::<Vec<(wot::Path, usize)>>();
output.add_paths(paths, fingerprint, userid, aggregated_amount)?;
}

11
tests/integration/sq_pki.rs
View File

@ -3156,8 +3156,9 @@ fn gossip_certification_network() -> Result<()> {
let human_output =
[(1, format!("- {} {}", HR_NOT_OK, &bob_uid))];
// Alice certified Bob. We should print the path, but it
// should be unauthenticated (this is gossip).
// Alice certified Bob. Although the path is unauthenticated (the
// path is not from a trust root), we should print it: the user
// asked for gossip.
test(
keyring,
trust_root,
@ -3172,10 +3173,10 @@ fn gossip_certification_network() -> Result<()> {
);
let trust_root = &alice_fpr;
// Even when we specify --gossip, paths are authenticated as much
// as possible.
let human_output =
[(1, format!("- {} {}", HR_NOT_OK, &bob_uid))];
// Make sure we don't authenticate when we specify a root
// (which is ignored when --gossip is provided).
[(1, format!("- {} {}", HR_OK, &bob_uid))];
test(
keyring,
trust_root,