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

db: prioritize fingerprint collision errors over key id ones

This commit is contained in:
Vincent Breitmoser 2019-05-28 11:11:37 +02:00
parent dc3454facb
commit cae1d16b77
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
database/src/fs.rs
View File

@ -391,14 +391,6 @@ impl Database for Filesystem {
let path_published = self.fingerprint_to_path_published(fpr_target);
if let Ok(link_keyid_target) = link_keyid.canonicalize() {
if !link_keyid_target.ends_with(&path_published) {
info!("KeyID points to different key for {} (expected {:?} to be suffix of {:?})",
fpr, &path_published, &link_keyid_target);
Err(failure::err_msg(format!("KeyID collision for key {}", fpr)))?;
}
}
if let Ok(link_fpr_target) = link_keyid.canonicalize() {
if !link_fpr_target.ends_with(&path_published) {
info!("Fingerprint points to different key for {} (expected {:?} to be suffix of {:?})",
@ -407,6 +399,14 @@ impl Database for Filesystem {
}
}
if let Ok(link_keyid_target) = link_keyid.canonicalize() {
if !link_keyid_target.ends_with(&path_published) {
info!("KeyID points to different key for {} (expected {:?} to be suffix of {:?})",
fpr, &path_published, &link_keyid_target);
Err(failure::err_msg(format!("KeyID collision for key {}", fpr)))?;
}
}
if !link_fpr.exists() || link_keyid.exists() {
Ok(Some(fpr.clone()))
} else {