hagrid-keyserver--hagrid/hagridctl/src/import.rs

244 lines
7.6 KiB
Rust
Raw Normal View History

2019-05-20 21:19:37 +00:00
use std::path::{Path,PathBuf};
use std::fs::File;
use std::io::Read;
2019-06-04 18:04:15 +00:00
use std::thread;
use std::cmp::min;
2019-05-20 21:19:37 +00:00
extern crate failure;
use failure::Fallible as Result;
extern crate tempfile;
extern crate sequoia_openpgp as openpgp;
use openpgp::Packet;
use openpgp::parse::{PacketParser, PacketParserResult, Parse};
extern crate hagrid_database as database;
use database::{Database, KeyDatabase, ImportResult};
2019-06-04 18:04:15 +00:00
use indicatif::{MultiProgress,ProgressBar,ProgressStyle};
2019-05-20 21:19:37 +00:00
use HagridConfig;
2019-06-04 18:04:15 +00:00
// parsing TPKs takes time, so we benefit from some parallelism. however, the
// database is locked during the entire merge operation, so we get diminishing
// returns after the first few threads.
const NUM_THREADS_MAX: usize = 3;
pub fn do_import(config: &HagridConfig, input_files: Vec<PathBuf>) -> Result<()> {
let num_threads = min(NUM_THREADS_MAX, input_files.len());
let input_file_chunks = setup_chunks_with_progress(input_files, num_threads);
let threads: Vec<_> = input_file_chunks
.into_iter()
.map(move |(input_file_chunk, progress_bar)| {
let config = config.clone();
thread::spawn(move || {
let errors = import_from_files(&config, input_file_chunk, progress_bar).unwrap();
for error in errors {
println!("{}", error);
}
})
})
.collect();
threads.into_iter().for_each(|t| t.join().unwrap());
2019-05-20 21:19:37 +00:00
Ok(())
}
2019-06-04 18:04:15 +00:00
fn setup_chunks_with_progress(
mut input_files: Vec<PathBuf>,
num_threads: usize,
) -> Vec<(Vec<PathBuf>,ProgressBar)> {
let multiprogress = MultiProgress::new();
let chunk_size = (input_files.len() + (num_threads - 1)) / num_threads;
let input_file_chunks: Vec<(Vec<PathBuf>,ProgressBar)> = (0..num_threads)
.map(|_| {
let len = input_files.len();
input_files.drain(0..min(chunk_size,len)).collect()
})
.map(|chunk| (chunk, multiprogress.add(ProgressBar::new(0))))
.collect();
eprintln!("Importing in {:?} threads", num_threads);
thread::spawn(move || multiprogress.join().unwrap());
input_file_chunks
}
struct ImportStats<'a> {
progress: &'a ProgressBar,
filename: String,
2019-05-20 21:19:37 +00:00
count_total: u64,
count_err: u64,
count_new: u64,
count_updated: u64,
count_unchanged: u64,
errors: Vec<failure::Error>,
}
2019-06-04 18:04:15 +00:00
impl <'a> ImportStats<'a> {
fn new(progress: &'a ProgressBar, filename: String) -> Self {
2019-05-20 21:19:37 +00:00
ImportStats {
progress,
2019-06-04 18:04:15 +00:00
filename,
2019-05-20 21:19:37 +00:00
count_total: 0,
count_err: 0,
count_new: 0,
count_updated: 0,
count_unchanged: 0,
errors: vec!(),
}
}
fn update(&mut self, result: Result<ImportResult>) {
// If a new TPK starts, parse and import.
self.count_total += 1;
match result {
Err(x) => {
self.count_err += 1;
self.errors.push(x);
},
Ok(ImportResult::New(_)) => self.count_new += 1,
Ok(ImportResult::Updated(_)) => self.count_updated += 1,
Ok(ImportResult::Unchanged(_)) => self.count_unchanged += 1,
}
self.progress_update();
}
fn progress_update(&self) {
if (self.count_total % 10) != 0 {
return;
}
self.progress.set_message(&format!(
2019-06-04 18:04:15 +00:00
"{}, imported {:5} keys, {:4} New {:4} Updated {:4} Unchanged {:4} Errors",
&self.filename, self.count_total, self.count_new, self.count_updated, self.count_unchanged, self.count_err));
2019-05-20 21:19:37 +00:00
}
fn progress_finish(&self) {
2019-06-04 18:04:15 +00:00
self.progress.set_message(&format!(
"{}, imported {:5} keys, {:4} New {:4} Updated {:4} Unchanged {:4} Errors",
&self.filename, self.count_total, self.count_new, self.count_updated, self.count_unchanged, self.count_err));
2019-05-20 21:19:37 +00:00
}
}
2019-06-04 18:04:15 +00:00
fn import_from_files(config: &HagridConfig, input_files: Vec<PathBuf>, progress_bar: ProgressBar) -> Result<Vec<failure::Error>> {
let db = KeyDatabase::new(
config.keys_internal_dir.as_ref().unwrap(),
config.keys_external_dir.as_ref().unwrap(),
config.tmp_dir.as_ref().unwrap()
)?;
progress_bar
.set_style(ProgressStyle::default_bar()
.template("[{elapsed_precise}] {bar:40.cyan/blue} {msg}")
.progress_chars("##-"));
progress_bar.set_message("Starting…");
let result = input_files
.into_iter()
.map(|input_file| import_from_file(&db, &input_file, &progress_bar))
.collect::<Result<Vec<_>>>()
.map(|results| results.into_iter().flatten().collect());
progress_bar.finish();
result
}
fn import_from_file(db: &KeyDatabase, input: &Path, progress_bar: &ProgressBar) -> Result<Vec<failure::Error>> {
2019-05-20 21:19:37 +00:00
let input_file = File::open(input)?;
2019-06-04 18:04:15 +00:00
progress_bar.set_length(input_file.metadata()?.len());
let input_reader = &mut progress_bar.wrap_read(input_file);
let filename = input.file_name().unwrap().to_string_lossy().to_string();
let mut stats = ImportStats::new(progress_bar, filename);
2019-05-20 21:19:37 +00:00
read_file_to_tpks(input_reader, &mut |acc| {
let result = import_key(&db, acc);
stats.update(result);
})?;
stats.progress_finish();
Ok(stats.errors)
}
fn read_file_to_tpks(
reader: impl Read,
callback: &mut impl FnMut(Vec<Packet>) -> ()
) -> Result<()> {
let mut ppr = PacketParser::from_reader(reader)?;
let mut acc = Vec::new();
// Iterate over all packets.
while let PacketParserResult::Some(pp) = ppr {
// Get the packet and advance the parser.
let (packet, tmp) = pp.next()?;
ppr = tmp;
if !acc.is_empty() {
if let Packet::PublicKey(_) | Packet::SecretKey(_) = packet {
callback(acc);
acc = vec!();
}
}
acc.push(packet);
}
Ok(())
}
fn import_key(db: &KeyDatabase, packets: Vec<Packet>) -> Result<ImportResult> {
let packet_pile = openpgp::PacketPile::from(packets);
openpgp::TPK::from_packet_pile(packet_pile)
.and_then(|tpk| {
db.merge(tpk)
})
}
/*
#[cfg(test)]
mod import_tests {
use std::fs::File;
use tempfile::tempdir;
use openpgp::serialize::Serialize;
use super::*;
#[test]
fn import() {
let root = tempdir().unwrap();
let db = KeyDatabase::new_from_base(root.path().to_path_buf()).unwrap();
// Generate a key and import it.
let (tpk, _) = openpgp::tpk::TPKBuilder::autocrypt(
None, Some("foo@invalid.example.com".into()))
.generate().unwrap();
let import_me = root.path().join("import-me");
tpk.serialize(&mut File::create(&import_me).unwrap()).unwrap();
do_import(root.path().to_path_buf(), vec![import_me]).unwrap();
let check = |query: &str| {
let tpk_ = db.lookup(&query.parse().unwrap()).unwrap().unwrap();
assert_eq!(tpk.fingerprint(), tpk_.fingerprint());
assert_eq!(tpk.subkeys().map(|skb| skb.subkey().fingerprint())
.collect::<Vec<_>>(),
tpk_.subkeys().map(|skb| skb.subkey().fingerprint())
.collect::<Vec<_>>());
assert_eq!(tpk_.userids().count(), 0);
};
check(&format!("{}", tpk.primary().fingerprint()));
check(&format!("{}", tpk.primary().fingerprint().to_keyid()));
check(&format!("{}", tpk.subkeys().nth(0).unwrap().subkey()
.fingerprint()));
check(&format!("{}", tpk.subkeys().nth(0).unwrap().subkey()
.fingerprint().to_keyid()));
}
}
*/