Merge branch 'nm/simplified-association-state' into 04-03-association…

…_log_verification

xmtp_id/Cargo.toml

@@ -1,24 +1,25 @@
 [package]
+edition = "2021"
 name = "xmtp_id"
 version = "0.1.0"
-edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+async-trait.workspace = true
+chrono.workspace = true
+futures.workspace = true
 log.workspace = true
-tracing.workspace = true
-thiserror.workspace = true
-xmtp_cryptography.workspace = true 
-xmtp_mls.workspace = true
-xmtp_proto.workspace = true
-openmls_traits.workspace = true
 openmls.workspace = true
 openmls_basic_credential.workspace = true
 openmls_rust_crypto.workspace = true
+openmls_traits.workspace = true
 prost.workspace = true
-chrono.workspace = true
+rand.workspace = true
 serde.workspace = true
-async-trait.workspace = true
-futures.workspace = true
-
+sha2 = "0.10.8"
+thiserror.workspace = true
+tracing.workspace = true
+xmtp_cryptography.workspace = true
+xmtp_mls.workspace = true
+xmtp_proto.workspace = true

xmtp_id/src/associations/association_log.rs

@@ -0,0 +1,290 @@
+use super::entity::{Entity, EntityRole};
+use super::hashes::{generate_xid, sha256_string};
+use super::signature::{Signature, SignatureError, SignatureKind};
+use super::state::{AssociationState, StateError};
+
+use thiserror::Error;
+
+// const ALLOWED_CREATE_ENTITY_ROLES: [EntityRole; 2] = [EntityRole::LegacyKey, EntityRole::Address];
+
+#[derive(Debug, Error, PartialEq)]
+pub enum AssociationError {
+    #[error("Error creating association {0}")]
+    Generic(String),
+    #[error("Multiple create operations detected")]
+    MultipleCreate,
+    #[error("XID not yet created")]
+    NotCreated,
+    #[error("Signature validation failed {0}")]
+    Signature(#[from] SignatureError),
+    #[error("State update failed")]
+    StateError(#[from] StateError),
+    #[error("Missing existing member")]
+    MissingExistingMember,
+    #[error("Legacy key is only allowed to be associated using a legacy signature with nonce 0")]
+    LegacySignatureReuse,
+    #[error("The new member identifier does not match the signer")]
+    NewMemberIdSignatureMismatch,
+    #[error("Signature not allowed for role {0:?} {1:?}")]
+    SignatureNotAllowed(EntityRole, SignatureKind),
+    #[error("Replay detected")]
+    Replay,
+}
+
+pub trait LogEntry {
+    fn update_state(
+        &self,
+        existing_state: Option<AssociationState>,
+    ) -> Result<AssociationState, AssociationError>;
+    fn hash(&self) -> String;
+}
+
+pub struct CreateXid {
+    pub nonce: u32,
+    pub account_address: String,
+    pub initial_association: AddAssociation,
+}
+
+impl LogEntry for CreateXid {
+    fn update_state(
+        &self,
+        existing_state: Option<AssociationState>,
+    ) -> Result<AssociationState, AssociationError> {
+        if existing_state.is_some() {
+            return Err(AssociationError::MultipleCreate);
+        }
+
+        let account_address = self.account_address.clone();
+
+        let initial_state = AssociationState::new(account_address, self.nonce);
+        let new_state = self.initial_association.update_state(Some(initial_state))?;
+
+        Ok(new_state.mark_event_seen(self.hash()))
+    }
+
+    fn hash(&self) -> String {
+        // Once we have real signatures the nonce and the recovery address should become part of the text
+        let inputs = format!(
+            "{}{}{}",
+            self.nonce,
+            self.account_address,
+            self.initial_association.hash()
+        );
+
+        sha256_string(inputs)
+    }
+}
+
+pub struct AddAssociation {
+    pub client_timestamp_ns: u32,
+    pub new_member_role: EntityRole,
+    pub new_member_signature: Box<dyn Signature>,
+    pub new_member_identifier: String,
+    pub existing_member_signature: Box<dyn Signature>,
+}
+
+impl AddAssociation {
+    pub fn new_member_address(&self) -> String {
+        self.new_member_signature.recover_signer().unwrap()
+    }
+}
+
+impl LogEntry for AddAssociation {
+    fn update_state(
+        &self,
+        maybe_existing_state: Option<AssociationState>,
+    ) -> Result<AssociationState, AssociationError> {
+        let existing_state = maybe_existing_state.ok_or(AssociationError::NotCreated)?;
+
+        // Catch replays per-association
+        // The real hash function should probably just be the signature text, but since that's stubbed out I have some more inputs
+        let association_hash = self.hash();
+        if existing_state.has_seen(&association_hash) {
+            return Err(AssociationError::Replay);
+        }
+
+        let new_member_address = self.new_member_signature.recover_signer()?;
+        if new_member_address.ne(&self.new_member_identifier) {
+            return Err(AssociationError::NewMemberIdSignatureMismatch);
+        }
+        let existing_member_address = self.existing_member_signature.recover_signer()?;
+        let recovery_address = &existing_state.recovery_address;
+
+        if new_member_address.ne(&self.new_member_identifier) {
+            return Err(AssociationError::Generic(
+                "new member identifier does not match signature".to_string(),
+            ));
+        }
+
+        // You cannot add yourself
+        if new_member_address == existing_member_address {
+            return Err(AssociationError::Generic("tried to add self".to_string()));
+        }
+
+        // Only allow LegacyDelegated signatures on XIDs with a nonce of 0
+        // Otherwise the client should use the regular wallet signature to create
+        if self.new_member_signature.signature_kind() == SignatureKind::LegacyDelegated {
+            if existing_state.xid != generate_xid(&existing_member_address, &0) {
+                return Err(AssociationError::LegacySignatureReuse);
+            }
+        }
+
+        // Make sure that the signature type lines up with the role
+        if !allowed_signature_for_role(
+            &self.new_member_role,
+            &self.new_member_signature.signature_kind(),
+        ) {
+            return Err(AssociationError::SignatureNotAllowed(
+                self.new_member_role.clone(),
+                self.new_member_signature.signature_kind(),
+            ));
+        }
+
+        let existing_member = existing_state.get(&existing_member_address);
+
+        let existing_entity_id = match existing_member {
+            // If there is an existing member of the XID, use that member's ID
+            Some(member) => member.id.clone(),
+            None => {
+                // Check if it is a signature from the recovery address, which is allowed to add members
+                if existing_member_address.ne(recovery_address) {
+                    return Err(AssociationError::MissingExistingMember);
+                }
+                // BUT, the recovery address has to be used with a real wallet signature, can't be delegated
+                if self.existing_member_signature.signature_kind() == SignatureKind::LegacyDelegated
+                {
+                    return Err(AssociationError::LegacySignatureReuse);
+                }
+                // If it is a real wallet signature, then it is allowed to add members
+                recovery_address.clone()
+            }
+        };
+
+        let new_member = Entity::new(
+            self.new_member_role.clone(),
+            new_member_address,
+            Some(existing_entity_id),
+        );
+
+        println!(
+            "Adding new entity to state {:?} with hash {}",
+            &new_member, &association_hash
+        );
+
+        Ok(existing_state.add(new_member).mark_event_seen(self.hash()))
+    }
+
+    fn hash(&self) -> String {
+        let inputs = format!(
+            "{}{:?}{}{}",
+            self.client_timestamp_ns,
+            self.new_member_role,
+            self.existing_member_signature.text(),
+            self.new_member_signature.text()
+        );
+        sha256_string(inputs)
+    }
+}
+
+pub struct RevokeAssociation {
+    pub client_timestamp_ns: u32,
+    pub recovery_address_signature: Box<dyn Signature>,
+    pub revoked_member: String,
+}
+
+impl LogEntry for RevokeAssociation {
+    fn update_state(
+        &self,
+        maybe_existing_state: Option<AssociationState>,
+    ) -> Result<AssociationState, AssociationError> {
+        let existing_state = maybe_existing_state.ok_or(AssociationError::NotCreated)?;
+
+        if self.recovery_address_signature.signature_kind() == SignatureKind::LegacyDelegated {
+            return Err(AssociationError::SignatureNotAllowed(
+                EntityRole::Address,
+                SignatureKind::LegacyDelegated,
+            ));
+        }
+        // Don't need to check for replay here since revocation is idempotent
+        let recovery_signer = self.recovery_address_signature.recover_signer()?;
+        // Make sure there is a recovery address set on the state
+        let state_recovery_address = existing_state.recovery_address.clone();
+
+        // Ensure this message is signed by the recovery address
+        if recovery_signer != state_recovery_address {
+            return Err(AssociationError::MissingExistingMember);
+        }
+
+        let installations_to_remove: Vec<Entity> = existing_state
+            .entities_by_parent(&self.revoked_member)
+            .into_iter()
+            // Only remove children if they are installations
+            .filter(|child| child.role == EntityRole::Installation)
+            .collect();
+
+        // Actually apply the revocation to the parent
+        let new_state = existing_state.remove(self.revoked_member.clone());
+
+        Ok(installations_to_remove
+            .iter()
+            .fold(new_state, |state, installation| {
+                state.remove(installation.id.clone())
+            })
+            .mark_event_seen(self.hash()))
+    }
+
+    fn hash(&self) -> String {
+        let inputs = format!(
+            "{}{}{}",
+            self.client_timestamp_ns,
+            self.recovery_address_signature.text(),
+            self.revoked_member,
+        );
+        sha256_string(inputs)
+    }
+}
+
+pub enum AssociationEvent {
+    CreateXid(CreateXid),
+    AddAssociation(AddAssociation),
+    RevokeAssociation(RevokeAssociation),
+}
+
+impl LogEntry for AssociationEvent {
+    fn update_state(
+        &self,
+        existing_state: Option<AssociationState>,
+    ) -> Result<AssociationState, AssociationError> {
+        match self {
+            AssociationEvent::CreateXid(event) => event.update_state(existing_state),
+            AssociationEvent::AddAssociation(event) => event.update_state(existing_state),
+            AssociationEvent::RevokeAssociation(event) => event.update_state(existing_state),
+        }
+    }
+
+    fn hash(&self) -> String {
+        match self {
+            AssociationEvent::CreateXid(event) => event.hash(),
+            AssociationEvent::AddAssociation(event) => event.hash(),
+            AssociationEvent::RevokeAssociation(event) => event.hash(),
+        }
+    }
+}
+
+// Ensure that the type of signature matches the new entity's role.
+pub fn allowed_signature_for_role(role: &EntityRole, signature_kind: &SignatureKind) -> bool {
+    match role {
+        EntityRole::Address => match signature_kind {
+            SignatureKind::Erc191 => true,
+            SignatureKind::Erc1271 => true,
+            SignatureKind::InstallationKey => false,
+            SignatureKind::LegacyDelegated => true,
+        },
+        EntityRole::Installation => match signature_kind {
+            SignatureKind::Erc191 => false,
+            SignatureKind::Erc1271 => false,
+            SignatureKind::InstallationKey => true,
+            SignatureKind::LegacyDelegated => false,
+        },
+    }
+}

xmtp_id/src/associations/entity.rs

@@ -0,0 +1,41 @@
+#[derive(Clone, Debug, PartialEq)]
+pub enum EntityRole {
+    Installation,
+    Address,
+}
+
+#[derive(Clone, Debug)]
+pub struct Entity {
+    pub role: EntityRole,
+    pub id: String,
+    pub added_by_entity: Option<String>,
+}
+
+impl Entity {
+    pub fn new(role: EntityRole, id: String, added_by_entity: Option<String>) -> Self {
+        Self {
+            role,
+            id,
+            added_by_entity,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::associations::test_utils;
+
+    use super::*;
+
+    use test_utils::rand_string;
+
+    impl Default for Entity {
+        fn default() -> Self {
+            Self {
+                role: EntityRole::Address,
+                id: rand_string(),
+                added_by_entity: None,
+            }
+        }
+    }
+}

xmtp_id/src/associations/hashes.rs

@@ -0,0 +1,12 @@
+use sha2::{Digest, Sha256};
+
+pub fn sha256_string(input: String) -> String {
+    let mut hasher = Sha256::new();
+    hasher.update(input.as_bytes());
+    let result = hasher.finalize();
+    format!("{:x}", result)
+}
+
+pub fn generate_xid(account_address: &String, nonce: &u32) -> String {
+    sha256_string(format!("{}{}", account_address, nonce))
+}