1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538
//! A MLS group can be merged (aka committed) when it has a pending commit. The latter is a commit
//! we created which is still waiting to be "committed". By doing so, we will apply all the
//! modifications present in the commit to the ratchet tree and also persist the new group in the
//! keystore. Like this, even if the application crashes we will be able to restore.
//!
//! This table summarizes when a MLS group can be merged:
//!
//! | can be merged ? | 0 pend. Commit | 1 pend. Commit |
//! |-------------------|----------------|----------------|
//! | 0 pend. Proposal | ❌ | ✅ |
//! | 1+ pend. Proposal | ❌ | ✅ |
//!
use core_crypto_keystore::entities::{MlsEncryptionKeyPair, MlsPendingMessage};
use openmls::prelude::MlsGroupStateError;
use openmls_traits::OpenMlsCryptoProvider;
use mls_crypto_provider::MlsCryptoProvider;
use crate::{
mls::{ConversationId, MlsCentral, MlsConversation},
prelude::{decrypt::MlsBufferedConversationDecryptMessage, MlsProposalRef},
CryptoError, CryptoResult, MlsError,
};
/// Abstraction over a MLS group capable of merging a commit
impl MlsConversation {
/// see [MlsCentral::commit_accepted]
#[cfg_attr(test, crate::durable)]
pub async fn commit_accepted(&mut self, backend: &MlsCryptoProvider) -> CryptoResult<()> {
// openmls stores here all the encryption keypairs used for update proposals..
let previous_own_leaf_nodes = self.group.own_leaf_nodes.clone();
self.group.merge_pending_commit(backend).await.map_err(MlsError::from)?;
self.persist_group_when_changed(backend, false).await?;
// ..so if there's any, we clear them after the commit is merged
for oln in &previous_own_leaf_nodes {
let ek = oln.encryption_key().as_slice();
let _ = backend.key_store().remove::<MlsEncryptionKeyPair, _>(ek).await;
}
Ok(())
}
/// see [MlsCentral::clear_pending_proposal]
#[cfg_attr(test, crate::durable)]
pub async fn clear_pending_proposal(
&mut self,
proposal_ref: MlsProposalRef,
backend: &MlsCryptoProvider,
) -> CryptoResult<()> {
self.group
.remove_pending_proposal(backend.key_store(), &proposal_ref)
.await
.map_err(|e| match e {
MlsGroupStateError::PendingProposalNotFound => CryptoError::PendingProposalNotFound(proposal_ref),
_ => CryptoError::from(MlsError::from(e)),
})?;
self.persist_group_when_changed(backend, true).await?;
Ok(())
}
/// see [MlsCentral::clear_pending_commit]
#[cfg_attr(test, crate::durable)]
pub async fn clear_pending_commit(&mut self, backend: &MlsCryptoProvider) -> CryptoResult<()> {
if self.group.pending_commit().is_some() {
self.group.clear_pending_commit();
self.persist_group_when_changed(backend, true).await?;
Ok(())
} else {
Err(CryptoError::PendingCommitNotFound)
}
}
}
/// A MLS group is a distributed object scattered across many parties. We use a Delivery Service
/// to orchestrate those parties. So when we create a commit, a mutable operation, it has to be
/// validated by the Delivery Service. But it might occur that another group member did the
/// exact same thing at the same time. So if we arrive second in this race, we must "rollback" the commit
/// we created and accept ("merge") the other one.
/// A client would
/// * Create a commit
/// * Send the commit to the Delivery Service
/// * When Delivery Service responds
/// * 200 OK --> use [MlsCentral::commit_accepted] to merge the commit
/// * 409 CONFLICT --> do nothing. [MlsCentral::decrypt_message] will restore the proposals not committed
/// * 5xx --> retry
impl MlsCentral {
/// The commit we created has been accepted by the Delivery Service. Hence it is guaranteed
/// to be used for the new epoch.
/// We can now safely "merge" it (effectively apply the commit to the group) and update it
/// in the keystore. The previous can be discarded to respect Forward Secrecy.
pub async fn commit_accepted(
&mut self,
id: &ConversationId,
) -> CryptoResult<Option<Vec<MlsBufferedConversationDecryptMessage>>> {
let conv = self.get_conversation(id).await?;
let mut conv = conv.write().await;
conv.commit_accepted(&self.mls_backend).await?;
let pending_messages = self.restore_pending_messages(&mut conv, false).await?;
if pending_messages.is_some() {
self.mls_backend.key_store().remove::<MlsPendingMessage, _>(id).await?;
}
Ok(pending_messages)
}
/// Allows to remove a pending (uncommitted) proposal. Use this when backend rejects the proposal
/// you just sent e.g. if permissions have changed meanwhile.
///
/// **CAUTION**: only use this when you had an explicit response from the Delivery Service
/// e.g. 403 or 409. Do not use otherwise e.g. 5xx responses, timeout etc..
///
/// # Arguments
/// * `conversation_id` - the group/conversation id
/// * `proposal_ref` - unique proposal identifier which is present in [crate::prelude::MlsProposalBundle]
/// and returned from all operation creating a proposal
///
/// # Errors
/// When the conversation is not found or the proposal reference does not identify a proposal
/// in the local pending proposal store
pub async fn clear_pending_proposal(
&mut self,
conversation_id: &ConversationId,
proposal_ref: MlsProposalRef,
) -> CryptoResult<()> {
self.get_conversation(conversation_id)
.await?
.write()
.await
.clear_pending_proposal(proposal_ref, &self.mls_backend)
.await
}
/// Allows to remove a pending commit. Use this when backend rejects the commit
/// you just sent e.g. if permissions have changed meanwhile.
///
/// **CAUTION**: only use this when you had an explicit response from the Delivery Service
/// e.g. 403. Do not use otherwise e.g. 5xx responses, timeout etc..
/// **DO NOT** use when Delivery Service responds 409, pending state will be renewed
/// in [MlsCentral::decrypt_message]
///
/// # Arguments
/// * `conversation_id` - the group/conversation id
///
/// # Errors
/// When the conversation is not found or there is no pending commit
#[cfg_attr(test, crate::idempotent)]
pub async fn clear_pending_commit(&mut self, conversation_id: &ConversationId) -> CryptoResult<()> {
self.get_conversation(conversation_id)
.await?
.write()
.await
.clear_pending_commit(&self.mls_backend)
.await
}
}
#[cfg(test)]
mod tests {
use openmls::prelude::Proposal;
use wasm_bindgen_test::*;
use crate::test_utils::*;
use super::*;
wasm_bindgen_test_configure!(run_in_browser);
mod commit_accepted {
use super::*;
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
async fn should_apply_pending_commit(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob"],
move |[mut alice_central, mut bob_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.mls_central
.invite_all(&case, &id, [&mut bob_central.mls_central])
.await
.unwrap();
assert_eq!(
alice_central
.mls_central
.get_conversation_unchecked(&id)
.await
.members()
.len(),
2
);
alice_central
.mls_central
.remove_members_from_conversation(&id, &[bob_central.mls_central.get_client_id()])
.await
.unwrap();
assert_eq!(
alice_central
.mls_central
.get_conversation_unchecked(&id)
.await
.members()
.len(),
2
);
alice_central.mls_central.commit_accepted(&id).await.unwrap();
assert_eq!(
alice_central
.mls_central
.get_conversation_unchecked(&id)
.await
.members()
.len(),
1
);
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
async fn should_clear_pending_commit_and_proposals(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob"],
move |[mut alice_central, bob_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central.mls_central.new_update_proposal(&id).await.unwrap();
let bob = bob_central.mls_central.rand_key_package(&case).await;
alice_central
.mls_central
.add_members_to_conversation(&id, vec![bob])
.await
.unwrap();
assert!(!alice_central.mls_central.pending_proposals(&id).await.is_empty());
assert!(alice_central.mls_central.pending_commit(&id).await.is_some());
alice_central.mls_central.commit_accepted(&id).await.unwrap();
assert!(alice_central.mls_central.pending_commit(&id).await.is_none());
assert!(alice_central.mls_central.pending_proposals(&id).await.is_empty());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
async fn should_clean_associated_key_material(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut alice_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
let initial_count = alice_central.mls_central.count_entities().await;
alice_central.mls_central.new_update_proposal(&id).await.unwrap();
let post_proposal_count = alice_central.mls_central.count_entities().await;
assert_eq!(
post_proposal_count.encryption_keypair,
initial_count.encryption_keypair + 1
);
alice_central.mls_central.commit_pending_proposals(&id).await.unwrap();
alice_central.mls_central.commit_accepted(&id).await.unwrap();
let final_count = alice_central.mls_central.count_entities().await;
assert_eq!(initial_count, final_count);
})
})
.await
}
}
mod clear_pending_proposal {
use super::*;
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_remove_proposal(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie"],
move |[mut alice_central, mut bob_central, charlie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.mls_central
.invite_all(&case, &id, [&mut bob_central.mls_central])
.await
.unwrap();
assert!(alice_central.mls_central.pending_proposals(&id).await.is_empty());
let charlie_kp = charlie_central.mls_central.get_one_key_package(&case).await;
let add_ref = alice_central
.mls_central
.new_add_proposal(&id, charlie_kp)
.await
.unwrap()
.proposal_ref;
let remove_ref = alice_central
.mls_central
.new_remove_proposal(&id, bob_central.mls_central.get_client_id())
.await
.unwrap()
.proposal_ref;
let update_ref = alice_central
.mls_central
.new_update_proposal(&id)
.await
.unwrap()
.proposal_ref;
assert_eq!(alice_central.mls_central.pending_proposals(&id).await.len(), 3);
alice_central
.mls_central
.clear_pending_proposal(&id, add_ref)
.await
.unwrap();
assert_eq!(alice_central.mls_central.pending_proposals(&id).await.len(), 2);
assert!(!alice_central
.mls_central
.pending_proposals(&id)
.await
.into_iter()
.any(|p| matches!(p.proposal(), Proposal::Add(_))));
alice_central
.mls_central
.clear_pending_proposal(&id, remove_ref)
.await
.unwrap();
assert_eq!(alice_central.mls_central.pending_proposals(&id).await.len(), 1);
assert!(!alice_central
.mls_central
.pending_proposals(&id)
.await
.into_iter()
.any(|p| matches!(p.proposal(), Proposal::Remove(_))));
alice_central
.mls_central
.clear_pending_proposal(&id, update_ref)
.await
.unwrap();
assert!(alice_central.mls_central.pending_proposals(&id).await.is_empty());
assert!(!alice_central
.mls_central
.pending_proposals(&id)
.await
.into_iter()
.any(|p| matches!(p.proposal(), Proposal::Update(_))));
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_fail_when_conversation_not_found(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut alice_central]| {
Box::pin(async move {
let id = conversation_id();
let simple_ref = MlsProposalRef::from(vec![0; case.ciphersuite().hash_length()]);
let clear = alice_central.mls_central.clear_pending_proposal(&id, simple_ref).await;
assert!(matches!(clear.unwrap_err(), CryptoError::ConversationNotFound(conv_id) if conv_id == id))
})
})
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_fail_when_proposal_ref_not_found(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut alice_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.mls_central.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
assert!(alice_central.mls_central.pending_proposals(&id).await.is_empty());
let any_ref = MlsProposalRef::from(vec![0; case.ciphersuite().hash_length()]);
let clear = alice_central.mls_central.clear_pending_proposal(&id, any_ref.clone()).await;
assert!(matches!(clear.unwrap_err(), CryptoError::PendingProposalNotFound(prop_ref) if prop_ref == any_ref))
})
})
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_clean_associated_key_material(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut cc]| {
Box::pin(async move {
let id = conversation_id();
cc.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
assert!(cc.mls_central.pending_proposals(&id).await.is_empty());
let init = cc.mls_central.count_entities().await;
let proposal_ref = cc.mls_central.new_update_proposal(&id).await.unwrap().proposal_ref;
assert_eq!(cc.mls_central.pending_proposals(&id).await.len(), 1);
cc.mls_central.clear_pending_proposal(&id, proposal_ref).await.unwrap();
assert!(cc.mls_central.pending_proposals(&id).await.is_empty());
// This whole flow should be idempotent.
// Here we verify that we are indeed deleting the `EncryptionKeyPair` created
// for the Update proposal
let after_clear_proposal = cc.mls_central.count_entities().await;
assert_eq!(init, after_clear_proposal);
})
})
.await
}
}
mod clear_pending_commit {
use super::*;
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_remove_commit(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut alice_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
assert!(alice_central.mls_central.pending_commit(&id).await.is_none());
alice_central.mls_central.update_keying_material(&id).await.unwrap();
assert!(alice_central.mls_central.pending_commit(&id).await.is_some());
alice_central.mls_central.clear_pending_commit(&id).await.unwrap();
assert!(alice_central.mls_central.pending_commit(&id).await.is_none());
})
})
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_fail_when_conversation_not_found(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut alice_central]| {
Box::pin(async move {
let id = conversation_id();
let clear = alice_central.mls_central.clear_pending_commit(&id).await;
assert!(matches!(clear.unwrap_err(), CryptoError::ConversationNotFound(conv_id) if conv_id == id))
})
})
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_fail_when_pending_commit_absent(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut alice_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
assert!(alice_central.mls_central.pending_commit(&id).await.is_none());
let clear = alice_central.mls_central.clear_pending_commit(&id).await;
assert!(matches!(clear.unwrap_err(), CryptoError::PendingCommitNotFound))
})
})
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn should_clean_associated_key_material(case: TestCase) {
run_test_with_client_ids(case.clone(), ["alice"], move |[mut cc]| {
Box::pin(async move {
let id = conversation_id();
cc.mls_central
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
assert!(cc.mls_central.pending_commit(&id).await.is_none());
let init = cc.mls_central.count_entities().await;
cc.mls_central.update_keying_material(&id).await.unwrap();
assert!(cc.mls_central.pending_commit(&id).await.is_some());
cc.mls_central.clear_pending_commit(&id).await.unwrap();
assert!(cc.mls_central.pending_commit(&id).await.is_none());
// This whole flow should be idempotent.
// Here we verify that we are indeed deleting the `EncryptionKeyPair` created
// for the Update commit
let after_clear_commit = cc.mls_central.count_entities().await;
assert_eq!(init, after_clear_commit);
})
})
.await
}
}
}