d7170ff radicle: ensure unique signatures when parsing trailers — heartwood

Radicle Heartwood Protocol & Stack

radicle: ensure unique signatures when parsing trailers

Fintan Halpenny committed 3 years ago

commit d7170ff9e7b2865cfdfc4b09b80b2ed252e1781e
parent adaed6a3ac4232b96e7ec93882821f75a9118adb

3 files changed +6 -6

modified radicle/src/identity.rs

@@ -121,7 +121,7 @@ impl Identity<Untrusted> {

             let quorum = untrusted
                 .sigs
                 .iter()
                 .filter(|(key, _)| trusted.delegates.iter().any(|d| &**d == key))
                 .filter(|(key, _)| trusted.delegates.iter().any(|d| **d == **key))
                 .count();
             if quorum < trusted.threshold {
                 return Err(IdentityError::ThresholdNotReached(

modified radicle/src/identity/doc.rs

@@ -1,6 +1,6 @@

 mod id;
 use std::collections::BTreeMap;
 use std::collections::{BTreeMap, HashMap};
 use std::fmt;
 use std::fmt::Write as _;
 use std::marker::PhantomData;

@@ -122,7 +122,7 @@ pub struct DocAt {

     /// The parsed document.
     pub doc: Doc<Verified>,
     /// The validated commit signatures.
     pub sigs: Vec<(PublicKey, Signature)>,
     pub sigs: HashMap<PublicKey, Signature>,
 }
 /// An identity document.

modified radicle/src/storage/git.rs

@@ -840,10 +840,10 @@ pub mod trailers {

         Signature(#[from] SignatureError),
     }
     pub fn parse_signatures(msg: &str) -> Result<Vec<(PublicKey, Signature)>, Error> {
     pub fn parse_signatures(msg: &str) -> Result<HashMap<PublicKey, Signature>, Error> {
         let trailers =
             git2::message_trailers_strs(msg).map_err(|_| Error::SignatureTrailerFormat)?;
         let mut signatures = Vec::with_capacity(trailers.len());
         let mut signatures = HashMap::with_capacity(trailers.len());
         for (key, val) in trailers.iter() {
             if key == SIGNATURE_TRAILER {

@@ -851,7 +851,7 @@ pub mod trailers {

                     let pk = PublicKey::from_str(pk)?;
                     let sig = Signature::from_str(sig)?;
                     signatures.push((pk, sig));
                     signatures.insert(pk, sig);
                 } else {
                     return Err(Error::SignatureTrailerFormat);
                 }