kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

hagridctl: adapt regenerate script to only regenerate verified keys

This commit is contained in:
Vincent Breitmoser 2020-01-31 23:48:47 +01:00
parent a2f36a5e55
commit 85ca188ffb
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/src/fs.rs
View File

@ -236,7 +236,7 @@ impl Filesystem {
}
/// Returns the backing primary key fingerprint for any key path.
fn path_to_primary(path: &Path) -> Option<Fingerprint> {
pub fn path_to_primary(path: &Path) -> Option<Fingerprint> {
use std::fs;
let typ = fs::symlink_metadata(&path).ok()?.file_type();
if typ.is_symlink() {

7
hagridctl/src/regenerate.rs
View File

@ -1,5 +1,4 @@
use failure::Fallible as Result;
use failure;
use std::path::Path;
use std::time::Instant;
@ -80,7 +79,7 @@ pub fn do_regenerate(config: &HagridConfig) -> Result<()> {
false,
)?;
let published_dir = config.keys_external_dir.as_ref().unwrap().join("pub");
let published_dir = config.keys_external_dir.as_ref().unwrap().join("links").join("by-email");
let dirs: Vec<_> = WalkDir::new(published_dir)
.min_depth(1)
.max_depth(1)
@ -109,13 +108,13 @@ pub fn do_regenerate(config: &HagridConfig) -> Result<()> {
fn regenerate_dir_recursively(db: &KeyDatabase, stats: &mut RegenerateStats, dir: &Path) -> Result<()> {
for path in WalkDir::new(dir)
.follow_links(true)
.into_iter()
.flatten()
.filter(|e| e.file_type().is_file())
.map(|entry| entry.into_path()) {
let fpr = KeyDatabase::path_to_fingerprint(&path)
.ok_or_else(|| failure::err_msg("Key not in database!"))?;
let fpr = KeyDatabase::path_to_primary(&path).unwrap();
let result = db.regenerate_links(&fpr);
stats.update(result, fpr);
}