Remove now unused non-concise human readable output format.
This commit is contained in:
Justus Winter
parent
17deb24057
commit
1300f3dd59
@ -6,7 +6,6 @@ use sequoia_openpgp as openpgp;
|
||||
use sequoia_wot as wot;
|
||||
use wot::Path;
|
||||
|
||||
mod human_readable;
|
||||
pub use concise_human_readable::print_path;
|
||||
pub use concise_human_readable::print_path_error;
|
||||
pub use concise_human_readable::print_path_header;
|
||||
|
||||
@ -1,267 +0,0 @@
|
||||
use std::fmt::Write;
|
||||
|
||||
use anyhow::Error;
|
||||
|
||||
use openpgp::packet::UserID;
|
||||
use openpgp::Fingerprint;
|
||||
use openpgp::KeyHandle;
|
||||
use openpgp::Result;
|
||||
use sequoia_openpgp as openpgp;
|
||||
|
||||
use sequoia_wot as wot;
|
||||
use wot::Path;
|
||||
use wot::PathLints;
|
||||
use wot::FULLY_TRUSTED;
|
||||
use wot::PARTIALLY_TRUSTED;
|
||||
|
||||
use crate::error_chain;
|
||||
use crate::commands::pki::output::OutputType;
|
||||
use crate::output::wrapping::NBSP;
|
||||
|
||||
/// Prints a Path Error
|
||||
pub fn print_path_error(err: Error) {
|
||||
wprintln!(initial_indent = "└ ", "Checking path: {}", err);
|
||||
}
|
||||
|
||||
/// Prints information of a Path for a target UserID associated with a KeyHandle
|
||||
pub fn print_path_header(
|
||||
target_kh: &KeyHandle,
|
||||
target_userid: &UserID,
|
||||
amount: usize,
|
||||
required_amount: usize,
|
||||
) {
|
||||
wprintln!(
|
||||
initial_indent="",
|
||||
subsequent_indent=" ",
|
||||
"[{}] {} {}: {} authenticated ({}%)",
|
||||
if amount >= required_amount {
|
||||
"✓"
|
||||
} else {
|
||||
" "
|
||||
},
|
||||
target_kh,
|
||||
String::from_utf8_lossy(target_userid.value()),
|
||||
if amount >= 2 * FULLY_TRUSTED {
|
||||
"doubly"
|
||||
} else if amount >= FULLY_TRUSTED {
|
||||
"fully"
|
||||
} else if amount >= PARTIALLY_TRUSTED {
|
||||
"partially"
|
||||
} else if amount > 0 {
|
||||
"marginally"
|
||||
} else {
|
||||
"not"
|
||||
},
|
||||
(amount * 100) / FULLY_TRUSTED
|
||||
);
|
||||
}
|
||||
|
||||
/// Prints information on a Path for a UserID
|
||||
pub fn print_path(path: &PathLints, target_userid: &UserID, prefix: &str)
|
||||
-> Result<()>
|
||||
{
|
||||
let certification_count = path.certifications().count();
|
||||
wprintln!(indent=prefix,
|
||||
"◯ {}{}",
|
||||
path.root().key_handle(),
|
||||
if certification_count == 0 {
|
||||
format!(" {:?}", String::from_utf8_lossy(target_userid.value()))
|
||||
} else if let Some(userid) = path.root().primary_userid() {
|
||||
format!(" ({:?})", String::from_utf8_lossy(userid.value()))
|
||||
} else {
|
||||
format!("")
|
||||
});
|
||||
|
||||
for (last, (cert, certification)) in path
|
||||
.certs()
|
||||
.zip(path.certifications())
|
||||
.enumerate()
|
||||
.map(|(j, c)| {
|
||||
if j + 1 == certification_count {
|
||||
(true, c)
|
||||
} else {
|
||||
(false, c)
|
||||
}
|
||||
})
|
||||
{
|
||||
let mut line = String::new();
|
||||
if let Some(certification) = certification.certification() {
|
||||
if certification.amount() < FULLY_TRUSTED {
|
||||
write!(&mut line,
|
||||
"partially certified (amount: {}{}of{}120)",
|
||||
certification.amount(), NBSP, NBSP,
|
||||
)?;
|
||||
} else {
|
||||
write!(&mut line, "certified")?;
|
||||
}
|
||||
|
||||
if last {
|
||||
write!(&mut line, " the following binding")?;
|
||||
} else {
|
||||
write!(&mut line, " the following certificate")?;
|
||||
}
|
||||
|
||||
write!(&mut line,
|
||||
" on {}",
|
||||
chrono::DateTime::<chrono::Utc>::from(
|
||||
certification.creation_time()
|
||||
)
|
||||
.format("%Y-%m-%d")
|
||||
)?;
|
||||
if let Some(e) = certification.expiration_time() {
|
||||
write!(&mut line,
|
||||
" (expiry: {})",
|
||||
chrono::DateTime::<chrono::Utc>::from(e).format("%Y-%m-%d")
|
||||
)?;
|
||||
}
|
||||
if certification.depth() > 0.into() {
|
||||
write!(&mut line, " as a")?;
|
||||
if certification.amount() != FULLY_TRUSTED {
|
||||
write!(&mut line,
|
||||
" partially trusted ({}{}of{}120)",
|
||||
certification.amount(), NBSP, NBSP,
|
||||
)?;
|
||||
} else {
|
||||
write!(&mut line, " fully trusted")?;
|
||||
}
|
||||
if certification.depth() == 1.into() {
|
||||
write!(&mut line, " introducer (depth: {})",
|
||||
certification.depth())?;
|
||||
} else {
|
||||
write!(&mut line,
|
||||
" meta-introducer (depth: {})",
|
||||
certification.depth()
|
||||
)?;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
write!(&mut line, " No adequate certification found.")?;
|
||||
}
|
||||
wprintln!(indent=format!("{}│ ", prefix), "{}", line);
|
||||
|
||||
for err in cert.errors().iter().chain(cert.lints()) {
|
||||
for (i, msg) in error_chain(err).into_iter().enumerate() {
|
||||
wprintln!(
|
||||
indent=format!(
|
||||
"{}│ {}", prefix, if i == 0 { "" } else { " " }),
|
||||
"{}", msg);
|
||||
}
|
||||
}
|
||||
for err in certification.errors().iter().chain(certification.lints()) {
|
||||
for (i, msg) in error_chain(err).into_iter().enumerate() {
|
||||
wprintln!(
|
||||
indent=format!(
|
||||
"{}│ {}", prefix, if i == 0 { "" } else { " " }),
|
||||
"{}", msg);
|
||||
}
|
||||
}
|
||||
|
||||
wprintln!(
|
||||
initial_indent=format!("{}{} ", prefix,
|
||||
if last { "└" } else { "├" }),
|
||||
subsequent_indent=format!("{}{} ", prefix,
|
||||
if last { " " } else { "│" }),
|
||||
"{}{}",
|
||||
certification.target(),
|
||||
if last {
|
||||
format!(" {:?}", String::from_utf8_lossy(target_userid.value()))
|
||||
} else if let Some(userid) =
|
||||
certification.target_cert().and_then(|c| c.primary_userid())
|
||||
{
|
||||
format!(" ({:?})", String::from_utf8_lossy(userid.value()))
|
||||
} else {
|
||||
"".into()
|
||||
}
|
||||
);
|
||||
|
||||
if last {
|
||||
let target = path.certs().last().expect("have one");
|
||||
for err in target.errors().iter().chain(target.lints()) {
|
||||
for (i, msg) in error_chain(err).into_iter().enumerate() {
|
||||
wprintln!(
|
||||
indent=format!(
|
||||
"{}│ {}", prefix, if i == 0 { "" } else { " " }),
|
||||
"{}", msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
wprintln!("");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// The human-readable specific implementation of an OutputNetwork
|
||||
///
|
||||
/// HumanReadableOutputNetwork tracks the target trust amount for the network
|
||||
/// and whether it displays "gossip".
|
||||
pub struct HumanReadableOutputNetwork {
|
||||
gossip: bool,
|
||||
required_amount: usize,
|
||||
}
|
||||
|
||||
impl HumanReadableOutputNetwork {
|
||||
/// Create a new HumanReadableOutputNetwork
|
||||
pub fn new(required_amount: usize, gossip: bool) -> Self {
|
||||
Self {
|
||||
required_amount,
|
||||
gossip,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl OutputType for HumanReadableOutputNetwork {
|
||||
/// Add paths to the OutputNetwork and display them directly
|
||||
fn add_paths(
|
||||
&mut self,
|
||||
paths: Vec<(Path, usize)>,
|
||||
fingerprint: &Fingerprint,
|
||||
userid: &UserID,
|
||||
aggregated_amount: usize,
|
||||
) -> Result<()> {
|
||||
let kh = KeyHandle::from(fingerprint);
|
||||
if !self.gossip {
|
||||
print_path_header(
|
||||
&kh,
|
||||
userid,
|
||||
aggregated_amount,
|
||||
self.required_amount,
|
||||
);
|
||||
}
|
||||
for (i, (path, amount)) in paths.iter().enumerate() {
|
||||
let prefix = if self.gossip {
|
||||
print_path_header(
|
||||
&kh,
|
||||
userid,
|
||||
aggregated_amount,
|
||||
self.required_amount,
|
||||
);
|
||||
" "
|
||||
} else {
|
||||
if !self.gossip && paths.len() > 1 {
|
||||
wprintln!(
|
||||
initial_indent=" ",
|
||||
"Path #{}{}of{}{}, trust amount {}:",
|
||||
i + 1, NBSP, NBSP,
|
||||
paths.len(),
|
||||
amount
|
||||
);
|
||||
" "
|
||||
} else {
|
||||
" "
|
||||
}
|
||||
};
|
||||
|
||||
print_path(&path.into(), userid, prefix)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Write the HumanReadableOutputNetwork to output
|
||||
///
|
||||
/// This function does in fact nothing as we are printing directly in
|
||||
/// add_paths().
|
||||
fn finalize(&mut self) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user