Hand references to Database::merge*.
- These functions clone what they need anyway.
This commit is contained in:
Justus Winter
parent
896494974b
commit
e908df4b9f
|
|
@ -697,12 +697,12 @@ mod tests {
|
|||
let k3 = TPKBuilder::default().add_userid("c@invalid.example.org")
|
||||
.generate().unwrap().0;
|
||||
|
||||
assert!(db.merge_or_publish(k1).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(k2.clone()).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(k2).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(k3.clone()).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(k3.clone()).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(k3).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(&k1).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(&k2).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(&k2).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(&k3).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(&k3).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(&k3).unwrap().len() > 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ pub trait Database: Sync + Send {
|
|||
///
|
||||
/// UserIDs that are already present in the database will receive
|
||||
/// new certificates.
|
||||
fn merge(&self, new_tpk: TPK) -> Result<()> {
|
||||
fn merge(&self, new_tpk: &TPK) -> Result<()> {
|
||||
let fpr = Fingerprint::try_from(new_tpk.primary().fingerprint())?;
|
||||
let _ = self.lock();
|
||||
|
||||
|
|
@ -324,7 +324,7 @@ pub trait Database: Sync + Send {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
fn merge_or_publish(&self, mut tpk: TPK) -> Result<Vec<(Email, String)>> {
|
||||
fn merge_or_publish(&self, tpk: &TPK) -> Result<Vec<(Email, String)>> {
|
||||
use std::collections::HashMap;
|
||||
use openpgp::RevocationStatus;
|
||||
|
||||
|
|
@ -400,7 +400,7 @@ pub trait Database: Sync + Send {
|
|||
let subkeys =
|
||||
tpk.subkeys().map(|s| s.subkey().fingerprint()).collect::<Vec<_>>();
|
||||
|
||||
tpk = filter_userids(&tpk, |_| false)?;
|
||||
let tpk = filter_userids(&tpk, |_| false)?;
|
||||
|
||||
for (email, fpr) in all_uids {
|
||||
self.unlink_email(&email, &Fingerprint::try_from(fpr).unwrap())?;
|
||||
|
|
|
|||
|
|
@ -173,12 +173,12 @@ mod tests {
|
|||
let k3 = TPKBuilder::default().add_userid("c@invalid.example.org")
|
||||
.generate().unwrap().0;
|
||||
|
||||
assert!(db.merge_or_publish(k1).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(k2.clone()).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(k2).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(k3.clone()).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(k3.clone()).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(k3).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(&k1).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(&k2).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(&k2).unwrap().len() > 0);
|
||||
assert!(db.merge_or_publish(&k3).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(&k3).unwrap().len() > 0);
|
||||
assert!(!db.merge_or_publish(&k3).unwrap().len() > 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ pub fn test_uid_verification<D: Database>(db: &mut D) {
|
|||
let email2 = Email::from_str(str_uid2).unwrap();
|
||||
|
||||
// upload key
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
let fpr = Fingerprint::try_from(tpk.fingerprint()).unwrap();
|
||||
|
||||
assert_eq!(tokens.len(), 2);
|
||||
|
|
@ -147,7 +147,7 @@ pub fn test_uid_verification<D: Database>(db: &mut D) {
|
|||
|
||||
// upload again
|
||||
assert_eq!(
|
||||
db.merge_or_publish(tpk.clone()).unwrap(),
|
||||
db.merge_or_publish(&tpk).unwrap(),
|
||||
Vec::<(Email, String)>::default()
|
||||
);
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ pub fn test_uid_verification<D: Database>(db: &mut D) {
|
|||
let short_tpk = TPK::from_packet_pile(pile).unwrap();
|
||||
|
||||
assert_eq!(
|
||||
db.merge_or_publish(short_tpk.clone()).unwrap(),
|
||||
db.merge_or_publish(&short_tpk).unwrap(),
|
||||
Vec::<(Email, String)>::default()
|
||||
);
|
||||
|
||||
|
|
@ -215,7 +215,7 @@ pub fn test_uid_verification<D: Database>(db: &mut D) {
|
|||
|
||||
let pile : PacketPile = packets.into();
|
||||
let ext_tpk = TPK::from_packet_pile(pile).unwrap();
|
||||
let tokens = db.merge_or_publish(ext_tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&ext_tpk).unwrap();
|
||||
|
||||
assert_eq!(tokens.len(), 1);
|
||||
|
||||
|
|
@ -259,14 +259,14 @@ pub fn test_reupload<D: Database>(db: &mut D) {
|
|||
let email2 = Email::from_str(str_uid2).unwrap();
|
||||
|
||||
// upload key
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
|
||||
// verify 1st uid
|
||||
assert!(db.verify_token(&tokens[0].1).unwrap().is_some());
|
||||
assert!(db.by_email(&email2).is_none() ^ db.by_email(&email1).is_none());
|
||||
|
||||
// reupload
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
|
||||
assert_eq!(tokens.len(), 1);
|
||||
assert!(db.by_email(&email2).is_none() ^ db.by_email(&email1).is_none());
|
||||
|
|
@ -282,7 +282,7 @@ pub fn test_uid_replacement<D: Database>(db: &mut D) {
|
|||
let fpr2 = tpk2.fingerprint();
|
||||
|
||||
// upload key
|
||||
let tokens = db.merge_or_publish(tpk1.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk1).unwrap();
|
||||
|
||||
// verify 1st uid
|
||||
assert!(db.verify_token(&tokens[0].1).unwrap().is_some());
|
||||
|
|
@ -292,7 +292,7 @@ pub fn test_uid_replacement<D: Database>(db: &mut D) {
|
|||
);
|
||||
|
||||
// replace
|
||||
let tokens = db.merge_or_publish(tpk2.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk2).unwrap();
|
||||
|
||||
assert!(db.by_email(&email).is_none());
|
||||
assert!(db.verify_token(&tokens[0].1).unwrap().is_some());
|
||||
|
|
@ -324,7 +324,7 @@ pub fn test_uid_deletion<D: Database>(db: &mut D) {
|
|||
let email2 = Email::from_str(str_uid2).unwrap();
|
||||
|
||||
// upload key and verify uids
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
|
||||
assert_eq!(tokens.len(), 2);
|
||||
assert!(db.verify_token(&tokens[0].1).unwrap().is_some());
|
||||
|
|
@ -382,7 +382,7 @@ pub fn test_uid_deletion_request<D: Database>(db: &mut D) {
|
|||
let email2 = Email::from_str(str_uid2).unwrap();
|
||||
|
||||
// upload key and verify uids
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
|
||||
assert_eq!(tokens.len(), 2);
|
||||
assert!(db.verify_token(&tokens[0].1).unwrap().is_some());
|
||||
|
|
@ -439,7 +439,7 @@ pub fn test_subkey_lookup<D: Database>(db: &mut D) {
|
|||
.0;
|
||||
|
||||
// upload key
|
||||
let _ = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let _ = db.merge_or_publish(&tpk).unwrap();
|
||||
let primary_fpr = Fingerprint::try_from(tpk.fingerprint()).unwrap();
|
||||
let sub1_fpr = Fingerprint::try_from(
|
||||
tpk.subkeys().next().map(|x| x.subkey().fingerprint()).unwrap(),
|
||||
|
|
@ -468,7 +468,7 @@ pub fn test_kid_lookup<D: Database>(db: &mut D) {
|
|||
.0;
|
||||
|
||||
// upload key
|
||||
let _ = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let _ = db.merge_or_publish(&tpk).unwrap();
|
||||
let primary_kid = KeyID::try_from(tpk.fingerprint()).unwrap();
|
||||
let sub1_kid = KeyID::try_from(
|
||||
tpk.subkeys().next().map(|x| x.subkey().fingerprint()).unwrap(),
|
||||
|
|
@ -502,7 +502,7 @@ pub fn test_upload_revoked_tpk<D: Database>(db: &mut D) {
|
|||
}
|
||||
|
||||
// upload key
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
assert!(tokens.is_empty());
|
||||
}
|
||||
|
||||
|
|
@ -527,7 +527,7 @@ pub fn test_uid_revocation<D: Database>(db: &mut D) {
|
|||
let email2 = Email::from_str(str_uid2).unwrap();
|
||||
|
||||
// upload key
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
|
||||
// verify uid
|
||||
assert_eq!(tokens.len(), 2);
|
||||
|
|
@ -555,7 +555,7 @@ pub fn test_uid_revocation<D: Database>(db: &mut D) {
|
|||
};
|
||||
assert_eq!(sig.sigtype(), SignatureType::CertificateRevocation);
|
||||
let tpk = tpk.merge_packets(vec![sig.into()]).unwrap();
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
assert_eq!(tokens.len(), 0);
|
||||
|
||||
// fail to fetch by one uid, fail by another
|
||||
|
|
@ -574,14 +574,14 @@ pub fn test_steal_uid<D: Database>(db: &mut D) {
|
|||
let email1 = Email::from_str(str_uid1).unwrap();
|
||||
|
||||
// upload key
|
||||
let tokens = db.merge_or_publish(tpk1.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk1).unwrap();
|
||||
|
||||
// verify uid
|
||||
assert!(db.verify_token(&tokens[0].1).unwrap().is_some());
|
||||
assert!(db.by_email(&email1).is_some());
|
||||
|
||||
// upload 2nd key with same uid
|
||||
let tokens = db.merge_or_publish(tpk2.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk2).unwrap();
|
||||
|
||||
assert_eq!(tokens.len(), 1);
|
||||
assert!(db.by_email(&email1).is_none());
|
||||
|
|
@ -622,9 +622,9 @@ pub fn test_same_email_1<D: Database>(db: &mut D) {
|
|||
let email2 = Email::from_str(str_uid2).unwrap();
|
||||
|
||||
// upload keys.
|
||||
let tokens1 = db.merge_or_publish(tpk1.clone()).unwrap();
|
||||
let tokens1 = db.merge_or_publish(&tpk1).unwrap();
|
||||
assert_eq!(tokens1.len(), 1);
|
||||
let tokens2 = db.merge_or_publish(tpk2.clone()).unwrap();
|
||||
let tokens2 = db.merge_or_publish(&tpk2).unwrap();
|
||||
assert_eq!(tokens2.len(), 1);
|
||||
|
||||
// verify tpk1
|
||||
|
|
@ -661,7 +661,7 @@ pub fn test_same_email_1<D: Database>(db: &mut D) {
|
|||
};
|
||||
assert_eq!(sig.sigtype(), SignatureType::CertificateRevocation);
|
||||
let tpk2 = tpk2.merge_packets(vec![sig.into()]).unwrap();
|
||||
let tokens2 = db.merge_or_publish(tpk2.clone()).unwrap();
|
||||
let tokens2 = db.merge_or_publish(&tpk2).unwrap();
|
||||
assert_eq!(tokens2.len(), 0);
|
||||
|
||||
// fetch by both user ids. We should get nothing.
|
||||
|
|
@ -692,7 +692,7 @@ pub fn test_same_email_2<D: Database>(db: &mut D) {
|
|||
let email2 = Email::from_str(str_uid2).unwrap();
|
||||
|
||||
// upload key
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
|
||||
// verify uid1
|
||||
assert_eq!(tokens.len(), 1);
|
||||
|
|
@ -721,7 +721,7 @@ pub fn test_same_email_2<D: Database>(db: &mut D) {
|
|||
};
|
||||
assert_eq!(sig.sigtype(), SignatureType::CertificateRevocation);
|
||||
let tpk = tpk.merge_packets(vec![sig.into()]).unwrap();
|
||||
let tokens = db.merge_or_publish(tpk.clone()).unwrap();
|
||||
let tokens = db.merge_or_publish(&tpk).unwrap();
|
||||
assert_eq!(tokens.len(), 0);
|
||||
|
||||
// fetch by both user ids. We should still get both user ids.
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ fn do_import(base: PathBuf, keyrings: Vec<PathBuf>) -> Result<()> {
|
|||
openpgp::PacketPile::from(
|
||||
::std::mem::replace(&mut acc, Vec::new())))
|
||||
{
|
||||
db.merge(tpk)?;
|
||||
db.merge(&tpk)?;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ fn do_import(base: PathBuf, keyrings: Vec<PathBuf>) -> Result<()> {
|
|||
openpgp::PacketPile::from(
|
||||
::std::mem::replace(&mut acc, Vec::new())))
|
||||
{
|
||||
db.merge(tpk)?;
|
||||
db.merge(&tpk)?;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ where
|
|||
|
||||
let mut results: Vec<String> = vec!();
|
||||
for tpk in tpks {
|
||||
let tokens = db.merge_or_publish(tpk)?;
|
||||
let tokens = db.merge_or_publish(&tpk)?;
|
||||
|
||||
if let Some(ref mail_service) = mail_service {
|
||||
for (email, token) in tokens {
|
||||
|
|
|
|||
Loading…
Reference in New Issue