-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Implement publish flow of state machine * Add a few tests * Refactor rand_string and rand_vec * Remove unused imports * Run clippy fix * Fix issues with updating existing entries * Clippy fix * Remove dependency on tempfile * Remove all usage of local tmp paths * Require explicit EncryptedMessageStore path * Run clippy --fix * Format * Fmt * Use generic error * Add one more small test * Merge changes * Fix import * Un-prefix import * Remove unused import * Add missing parameter error * Remove unused field * Remove test field * Add tests for intent data * Address review comments * Use ok_or * Clean up error handling * Format using nightly toolchain
- Loading branch information
Showing
28 changed files
with
1,869 additions
and
273 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,239 @@ | ||
| use openmls::prelude::MlsMessageOut; | ||
| use prost::{DecodeError, Message}; | ||
| use thiserror::Error; | ||
| use tls_codec::Serialize; | ||
| use xmtp_proto::xmtp::mls::database::{ | ||
| add_members_publish_data::{Version as AddMembersVersion, V1 as AddMembersV1}, | ||
| post_commit_action::{Kind as PostCommitActionKind, SendWelcomes as SendWelcomesProto}, | ||
| send_message_publish_data::{Version as SendMessageVersion, V1 as SendMessageV1}, | ||
| AddMembersPublishData, PostCommitAction as PostCommitActionProto, SendMessagePublishData, | ||
| }; | ||
|
|
||
| use crate::{ | ||
| verified_key_package::{KeyPackageVerificationError, VerifiedKeyPackage}, | ||
| xmtp_openmls_provider::XmtpOpenMlsProvider, | ||
| }; | ||
|
|
||
| #[derive(Debug, Error)] | ||
| pub enum IntentError { | ||
| #[error("decode error: {0}")] | ||
| Decode(#[from] DecodeError), | ||
| #[error("key package verification: {0}")] | ||
| KeyPackageVerification(#[from] KeyPackageVerificationError), | ||
| #[error("tls codec: {0}")] | ||
| TlsCodec(#[from] tls_codec::Error), | ||
| #[error("generic: {0}")] | ||
| Generic(String), | ||
| } | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub struct SendMessageIntentData { | ||
| pub message: Vec<u8>, | ||
| } | ||
|
|
||
| impl SendMessageIntentData { | ||
| pub fn new(message: Vec<u8>) -> Self { | ||
| Self { message } | ||
| } | ||
|
|
||
| pub(crate) fn to_bytes(&self) -> Vec<u8> { | ||
| let mut buf = Vec::new(); | ||
| SendMessagePublishData { | ||
| version: Some(SendMessageVersion::V1(SendMessageV1 { | ||
| payload_bytes: self.message.clone(), | ||
| })), | ||
| } | ||
| .encode(&mut buf) | ||
| .unwrap(); | ||
|
|
||
| buf | ||
| } | ||
|
|
||
| pub(crate) fn from_bytes(data: &[u8]) -> Result<Self, IntentError> { | ||
| let msg = SendMessagePublishData::decode(data)?; | ||
| let payload_bytes = match msg.version { | ||
| Some(SendMessageVersion::V1(v1)) => v1.payload_bytes, | ||
| None => return Err(IntentError::Generic("missing payload".to_string())), | ||
| }; | ||
|
|
||
| Ok(Self::new(payload_bytes)) | ||
| } | ||
| } | ||
|
|
||
| impl From<SendMessageIntentData> for Vec<u8> { | ||
| fn from(intent: SendMessageIntentData) -> Self { | ||
| intent.to_bytes() | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub struct AddMembersIntentData { | ||
| pub key_packages: Vec<VerifiedKeyPackage>, | ||
| } | ||
|
|
||
| impl AddMembersIntentData { | ||
| pub fn new(key_packages: Vec<VerifiedKeyPackage>) -> Self { | ||
| Self { key_packages } | ||
| } | ||
|
|
||
| pub(crate) fn to_bytes(&self) -> Result<Vec<u8>, IntentError> { | ||
| let mut buf = Vec::new(); | ||
| let key_package_bytes_result: Result<Vec<Vec<u8>>, tls_codec::Error> = self | ||
| .key_packages | ||
| .iter() | ||
| .map(|kp| kp.inner.tls_serialize_detached()) | ||
| .collect(); | ||
|
|
||
| AddMembersPublishData { | ||
| version: Some(AddMembersVersion::V1(AddMembersV1 { | ||
| key_packages_bytes_tls_serialized: key_package_bytes_result?, | ||
| })), | ||
| } | ||
| .encode(&mut buf) | ||
| .unwrap(); | ||
|
|
||
| Ok(buf) | ||
| } | ||
|
|
||
| pub(crate) fn from_bytes( | ||
| data: &[u8], | ||
| provider: &XmtpOpenMlsProvider, | ||
| ) -> Result<Self, IntentError> { | ||
| let msg = AddMembersPublishData::decode(data)?; | ||
| let key_package_bytes = match msg.version { | ||
| Some(AddMembersVersion::V1(v1)) => v1.key_packages_bytes_tls_serialized, | ||
| None => return Err(IntentError::Generic("missing payload".to_string())), | ||
| }; | ||
| let key_packages: Result<Vec<VerifiedKeyPackage>, KeyPackageVerificationError> = | ||
| key_package_bytes | ||
| .iter() | ||
| // TODO: Serialize VerifiedKeyPackages directly, so that we don't have to re-verify | ||
| .map(|kp| VerifiedKeyPackage::from_bytes(provider, kp)) | ||
| .collect(); | ||
|
|
||
| Ok(Self::new(key_packages?)) | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<AddMembersIntentData> for Vec<u8> { | ||
| type Error = IntentError; | ||
|
|
||
| fn try_from(intent: AddMembersIntentData) -> Result<Self, Self::Error> { | ||
| intent.to_bytes() | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub enum PostCommitAction { | ||
| SendWelcomes(SendWelcomesAction), | ||
| } | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub struct SendWelcomesAction { | ||
| pub installation_ids: Vec<Vec<u8>>, | ||
| pub welcome_message: Vec<u8>, | ||
| } | ||
|
|
||
| impl SendWelcomesAction { | ||
| pub fn new(installation_ids: Vec<Vec<u8>>, welcome_message: Vec<u8>) -> Self { | ||
| Self { | ||
| installation_ids, | ||
| welcome_message, | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn to_bytes(&self) -> Vec<u8> { | ||
| let mut buf = Vec::new(); | ||
| PostCommitActionProto { | ||
| kind: Some(PostCommitActionKind::SendWelcomes(SendWelcomesProto { | ||
| installation_ids: self.installation_ids.clone(), | ||
| welcome_message: self.welcome_message.clone(), | ||
| })), | ||
| } | ||
| .encode(&mut buf) | ||
| .unwrap(); | ||
|
|
||
| buf | ||
| } | ||
| } | ||
|
|
||
| impl PostCommitAction { | ||
| pub(crate) fn to_bytes(&self) -> Vec<u8> { | ||
| match self { | ||
| PostCommitAction::SendWelcomes(action) => action.to_bytes(), | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn from_bytes(data: &[u8]) -> Result<Self, IntentError> { | ||
| let decoded = PostCommitActionProto::decode(data)?; | ||
| match decoded.kind { | ||
| Some(PostCommitActionKind::SendWelcomes(proto)) => Ok(Self::SendWelcomes( | ||
| SendWelcomesAction::new(proto.installation_ids, proto.welcome_message), | ||
| )), | ||
| None => Err(IntentError::Generic( | ||
| "missing post commit action".to_string(), | ||
| )), | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn from_welcome( | ||
| welcome: MlsMessageOut, | ||
| installation_ids: Vec<Vec<u8>>, | ||
| ) -> Result<Self, IntentError> { | ||
| let welcome_bytes = welcome.tls_serialize_detached()?; | ||
|
|
||
| Ok(Self::SendWelcomes(SendWelcomesAction::new( | ||
| installation_ids, | ||
| welcome_bytes, | ||
| ))) | ||
| } | ||
| } | ||
|
|
||
| impl From<Vec<u8>> for PostCommitAction { | ||
| fn from(data: Vec<u8>) -> Self { | ||
| PostCommitAction::from_bytes(data.as_slice()).unwrap() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use xmtp_cryptography::utils::generate_local_wallet; | ||
|
|
||
| use super::*; | ||
| use crate::{builder::ClientBuilder, InboxOwner}; | ||
|
|
||
| #[test] | ||
| fn test_serialize_send_message() { | ||
| let message = vec![1, 2, 3]; | ||
| let intent = SendMessageIntentData::new(message.clone()); | ||
| let as_bytes: Vec<u8> = intent.into(); | ||
| let restored_intent = SendMessageIntentData::from_bytes(as_bytes.as_slice()).unwrap(); | ||
|
|
||
| assert_eq!(restored_intent.message, message); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_serialize_add_members() { | ||
| let wallet = generate_local_wallet(); | ||
| let wallet_address = wallet.get_address(); | ||
| let client = ClientBuilder::new_test_client(wallet.into()).await; | ||
| let key_package = client | ||
| .identity | ||
| .new_key_package(&client.mls_provider()) | ||
| .unwrap(); | ||
| let verified_key_package = VerifiedKeyPackage::new(key_package, wallet_address.clone()); | ||
|
|
||
| let intent = AddMembersIntentData::new(vec![verified_key_package.clone()]); | ||
| let as_bytes: Vec<u8> = intent.clone().try_into().unwrap(); | ||
| let restored_intent = | ||
| AddMembersIntentData::from_bytes(as_bytes.as_slice(), &client.mls_provider()).unwrap(); | ||
|
|
||
| assert!(intent.key_packages[0] | ||
| .inner | ||
| .eq(&restored_intent.key_packages[0].inner)); | ||
| assert_eq!( | ||
| intent.key_packages[0].wallet_address, | ||
| restored_intent.key_packages[0].wallet_address | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.