core_crypto/mls/conversation/renew.rs
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 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982
use core_crypto_keystore::entities::MlsEncryptionKeyPair;
use openmls::prelude::{LeafNode, LeafNodeIndex, Proposal, QueuedProposal, Sender, StagedCommit};
use openmls_traits::OpenMlsCryptoProvider;
use mls_crypto_provider::MlsCryptoProvider;
use super::{Error, Result};
use crate::{
KeystoreError, RecursiveError,
prelude::{Client, MlsConversation, MlsProposalBundle},
};
/// Marker struct holding methods responsible for restoring (renewing) proposals (or pending commit)
/// in case another commit has been accepted by the backend instead of ours
pub(crate) struct Renew;
impl Renew {
/// Renews proposals:
/// * in pending_proposals but not in valid commit
/// * in pending_commit but not in valid commit
///
/// NB: we do not deal with partial commit (commit which do not contain all pending proposals)
/// because they cannot be created at the moment by core-crypto
///
/// * `self_index` - own client [KeyPackageRef] in current MLS group
/// * `pending_proposals` - local pending proposals in group's proposal store
/// * `pending_commit` - local pending commit which is now invalid
/// * `valid_commit` - commit accepted by the backend which will now supersede our local pending commit
pub(crate) fn renew<'a>(
self_index: &LeafNodeIndex,
pending_proposals: impl Iterator<Item = QueuedProposal> + 'a,
pending_commit: Option<&'a StagedCommit>,
valid_commit: &'a StagedCommit,
) -> (Vec<QueuedProposal>, bool) {
// indicates if we need to renew an update proposal.
// true only if we have an empty pending commit or the valid commit does not contain one of our update proposal
// otherwise, local orphan update proposal will be renewed regularly, without this flag
let mut needs_update = false;
let renewed_pending_proposals = if let Some(pending_commit) = pending_commit {
// present in pending commit but not in valid commit
let commit_proposals = pending_commit.queued_proposals().cloned().collect::<Vec<_>>();
// if our own pending commit is empty it means we were attempting to update
let empty_commit = commit_proposals.is_empty();
// does the valid commit contains one of our update proposal ?
let valid_commit_has_own_update_proposal = valid_commit.update_proposals().any(|p| match p.sender() {
Sender::Member(sender_index) => self_index == sender_index,
_ => false,
});
// do we need to renew the update or has it already been committed
needs_update = !valid_commit_has_own_update_proposal && empty_commit;
// local proposals present in local pending commit but not in valid commit
commit_proposals
.into_iter()
.filter_map(|p| Self::is_proposal_renewable(p, Some(valid_commit)))
.collect::<Vec<_>>()
} else {
// local pending proposals present locally but not in valid commit
pending_proposals
.filter_map(|p| Self::is_proposal_renewable(p, Some(valid_commit)))
.collect::<Vec<_>>()
};
(renewed_pending_proposals, needs_update)
}
/// A proposal has to be renewed if it is absent from supplied commit
fn is_proposal_renewable(proposal: QueuedProposal, commit: Option<&StagedCommit>) -> Option<QueuedProposal> {
if let Some(commit) = commit {
let in_commit = match proposal.proposal() {
Proposal::Add(add) => commit.add_proposals().any(|p| {
let commits_identity = p.add_proposal().key_package().leaf_node().credential().identity();
let proposal_identity = add.key_package().leaf_node().credential().identity();
commits_identity == proposal_identity
}),
Proposal::Remove(remove) => commit
.remove_proposals()
.any(|p| p.remove_proposal().removed() == remove.removed()),
Proposal::Update(update) => commit
.update_proposals()
.any(|p| p.update_proposal().leaf_node() == update.leaf_node()),
_ => true,
};
if in_commit { None } else { Some(proposal) }
} else {
// if proposal is orphan (not present in commit)
Some(proposal)
}
}
}
impl MlsConversation {
/// Given the proposals to renew, actually restore them by using associated methods in [MlsGroup].
/// This will also add them to the local proposal store
pub(crate) async fn renew_proposals_for_current_epoch(
&mut self,
client: &Client,
backend: &MlsCryptoProvider,
proposals: impl Iterator<Item = QueuedProposal>,
needs_update: bool,
) -> Result<Vec<MlsProposalBundle>> {
let mut bundle = vec![];
let is_external = |p: &QueuedProposal| matches!(p.sender(), Sender::External(_) | Sender::NewMemberProposal);
let proposals = proposals.filter(|p| !is_external(p));
for proposal in proposals {
let msg = match proposal.proposal {
Proposal::Add(add) => self.propose_add_member(client, backend, add.key_package.into()).await?,
Proposal::Remove(remove) => self.propose_remove_member(client, backend, remove.removed()).await?,
Proposal::Update(update) => self.renew_update(client, backend, Some(update.leaf_node())).await?,
_ => return Err(Error::ProposalVariantCannotBeRenewed),
};
bundle.push(msg);
}
if needs_update {
let proposal = self.renew_update(client, backend, None).await?;
bundle.push(proposal);
}
Ok(bundle)
}
/// Renews an update proposal by considering the explicit LeafNode supplied in the proposal
/// by applying it to the current own LeafNode.
/// At this point, we have already verified we are only operating on proposals created by self.
async fn renew_update(
&mut self,
client: &Client,
backend: &MlsCryptoProvider,
leaf_node: Option<&LeafNode>,
) -> Result<MlsProposalBundle> {
if let Some(leaf_node) = leaf_node {
// Creating an update rekeys the LeafNode everytime. Hence we need to clear the previous
// encryption key from the keystore otherwise we would have a leak
backend
.key_store()
.remove::<MlsEncryptionKeyPair, _>(leaf_node.encryption_key().as_slice())
.await
.map_err(KeystoreError::wrap("removing mls encryption keypair"))?;
}
let mut leaf_node = leaf_node
.or_else(|| self.group.own_leaf())
.cloned()
.ok_or(Error::MlsGroupInvalidState("own_leaf is None"))?;
let sc = self.signature_scheme();
let ct = self.own_credential_type()?;
let cb = client
.find_most_recent_credential_bundle(sc, ct)
.await
.map_err(RecursiveError::mls_client("finding most recent credential bundle"))?;
leaf_node.set_credential_with_key(cb.to_mls_credential_with_key());
self.propose_explicit_self_update(client, backend, Some(leaf_node))
.await
}
pub(crate) fn self_pending_proposals(&self) -> impl Iterator<Item = &QueuedProposal> {
self.group
.pending_proposals()
.filter(|&p| matches!(p.sender(), Sender::Member(i) if i == &self.group.own_leaf_index()))
}
}
#[cfg(test)]
mod tests {
use wasm_bindgen_test::*;
use crate::test_utils::*;
mod update {
use super::*;
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn renewable_when_created_by_self(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
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central.invite_all(&case, &id, [&bob_central]).await.unwrap();
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central.context.new_update_proposal(&id).await.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
// Bob hasn't Alice's proposal but creates a commit
bob_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Alice should renew the proposal because its hers
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
// It should also renew the proposal when in pending_commit
bob_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Alice should renew the proposal because its hers
// It should also replace existing one
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn not_renewable_when_in_valid_commit(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
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central.invite_all(&case, &id, [&bob_central]).await.unwrap();
assert!(alice_central.pending_proposals(&id).await.is_empty());
let proposal = alice_central.context.new_update_proposal(&id).await.unwrap().proposal;
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
// Bob has Alice's update proposal
bob_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(proposal.to_bytes().unwrap())
.await
.unwrap();
bob_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
// Bob's commit has Alice's proposal
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Alice proposal should not be renew as it was in valid commit
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
let proposal = alice_central.context.new_update_proposal(&id).await.unwrap().proposal;
bob_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(proposal.to_bytes().unwrap())
.await
.unwrap();
bob_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Alice should not be renew as it was in valid commit
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn not_renewable_by_ref(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie"],
move |[mut alice_central, bob_central, charlie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.invite_all(&case, &id, [&bob_central, &charlie_central])
.await
.unwrap();
let proposal = bob_central.context.new_update_proposal(&id).await.unwrap().proposal;
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(proposal.to_bytes().unwrap())
.await
.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
// Charlie does not have other proposals, it creates a commit
charlie_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = charlie_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Alice should not renew Bob's update proposal
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
}
mod add {
use super::*;
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn not_renewable_when_valid_commit_adds_same(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie"],
move |[mut alice_central, bob_central, charlie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central.invite_all(&case, &id, [&bob_central]).await.unwrap();
let charlie_kp = charlie_central.get_one_key_package(&case).await;
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central.context.new_add_proposal(&id, charlie_kp).await.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
let charlie = charlie_central.rand_key_package(&case).await;
bob_central
.context
.conversation(&id)
.await
.unwrap()
.add_members(vec![charlie])
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Alice proposal is not renewed since she also wanted to add Charlie
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn not_renewable_in_pending_commit_when_valid_commit_adds_same(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie"],
move |[mut alice_central, bob_central, charlie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central.invite_all(&case, &id, [&bob_central]).await.unwrap();
let charlie_kp = charlie_central.get_one_key_package(&case).await;
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central.context.new_add_proposal(&id, charlie_kp).await.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
// Here Alice also creates a commit
alice_central.commit_pending_proposals_unmerged(&id).await;
assert!(alice_central.pending_commit(&id).await.is_some());
let charlie = charlie_central.rand_key_package(&case).await;
bob_central
.context
.conversation(&id)
.await
.unwrap()
.add_members(vec![charlie])
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Alice proposal is not renewed since she also wanted to add Charlie
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn not_renewable_by_ref(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie", "debbie"],
move |[mut alice_central, bob_central, charlie_central, debbie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.invite_all(&case, &id, [&bob_central, &charlie_central])
.await
.unwrap();
// Bob will propose adding Debbie
let debbie_kp = debbie_central.get_one_key_package(&case).await;
let proposal = bob_central
.context
.new_add_proposal(&id, debbie_kp)
.await
.unwrap()
.proposal;
alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(proposal.to_bytes().unwrap())
.await
.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
// But Charlie will commit meanwhile
charlie_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = charlie_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// which Alice should not renew since it's not hers
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn renewable_when_valid_commit_doesnt_adds_same(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie"],
move |[mut alice_central, bob_central, charlie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central.invite_all(&case, &id, [&bob_central]).await.unwrap();
// Alice proposes adding Charlie
let charlie_kp = charlie_central.get_one_key_package(&case).await;
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central.context.new_add_proposal(&id, charlie_kp).await.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
// But meanwhile Bob will create a commit without Alice's proposal
bob_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// So Alice proposal should be renewed
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
// And same should happen when proposal is in pending commit
alice_central.commit_pending_proposals_unmerged(&id).await;
assert!(alice_central.pending_commit(&id).await.is_some());
bob_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// So Alice proposal should also be renewed
// It should also replace existing one
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn renews_pending_commit_when_valid_commit_doesnt_add_same(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
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central.invite_all(&case, &id, [&bob_central]).await.unwrap();
// Alice commits adding Charlie
alice_central.create_unmerged_commit(&id).await;
assert!(alice_central.pending_commit(&id).await.is_some());
// But meanwhile Bob will create a commit
bob_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// So Alice proposal should be renewed
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
}
mod remove {
use super::*;
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn not_renewable_when_valid_commit_removes_same(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie"],
move |[mut alice_central, bob_central, charlie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.invite_all(&case, &id, [&bob_central, &charlie_central])
.await
.unwrap();
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central
.context
.new_remove_proposal(&id, charlie_central.get_client_id().await)
.await
.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
bob_central
.context
.conversation(&id)
.await
.unwrap()
.remove_members(&[charlie_central.get_client_id().await])
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Remove proposal is not renewed since commit does same
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn not_renewable_by_ref(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie"],
move |[mut alice_central, bob_central, charlie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.invite_all(&case, &id, [&bob_central, &charlie_central])
.await
.unwrap();
let proposal = bob_central
.context
.new_remove_proposal(&id, charlie_central.get_client_id().await)
.await
.unwrap()
.proposal;
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(proposal.to_bytes().unwrap())
.await
.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
charlie_central
.context
.conversation(&id)
.await
.unwrap()
.update_key_material()
.await
.unwrap();
let commit = charlie_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Remove proposal is not renewed since by ref
assert!(alice_central.pending_proposals(&id).await.is_empty());
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn renewable_when_valid_commit_doesnt_remove_same(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie", "debbie"],
move |[mut alice_central, bob_central, charlie_central, debbie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.invite_all(&case, &id, [&bob_central, &charlie_central, &debbie_central])
.await
.unwrap();
// Alice wants to remove Charlie
assert!(alice_central.pending_proposals(&id).await.is_empty());
alice_central
.context
.new_remove_proposal(&id, charlie_central.get_client_id().await)
.await
.unwrap();
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
// Whereas Bob wants to remove Debbie
bob_central
.context
.conversation(&id)
.await
.unwrap()
.remove_members(&[debbie_central.get_client_id().await])
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Remove is renewed since valid commit removes another
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn renews_pending_commit_when_commit_doesnt_remove_same(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie", "debbie"],
move |[mut alice_central, bob_central, charlie_central, debbie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.invite_all(&case, &id, [&bob_central, &charlie_central, &debbie_central])
.await
.unwrap();
// Alice wants to remove Charlie
alice_central
.context
.new_remove_proposal(&id, charlie_central.get_client_id().await)
.await
.unwrap();
alice_central.commit_pending_proposals_unmerged(&id).await;
assert!(alice_central.pending_commit(&id).await.is_some());
// Whereas Bob wants to remove Debbie
bob_central
.context
.conversation(&id)
.await
.unwrap()
.remove_members(&[debbie_central.get_client_id().await])
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Remove is renewed since valid commit removes another
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
#[apply(all_cred_cipher)]
#[wasm_bindgen_test]
pub async fn renews_pending_commit_from_proposal_when_commit_doesnt_remove_same(case: TestCase) {
run_test_with_client_ids(
case.clone(),
["alice", "bob", "charlie", "debbie"],
move |[mut alice_central, bob_central, charlie_central, debbie_central]| {
Box::pin(async move {
let id = conversation_id();
alice_central
.context
.new_conversation(&id, case.credential_type, case.cfg.clone())
.await
.unwrap();
alice_central
.invite_all(&case, &id, [&bob_central, &charlie_central, &debbie_central])
.await
.unwrap();
// Alice wants to remove Charlie
alice_central
.context
.new_remove_proposal(&id, charlie_central.get_client_id().await)
.await
.unwrap();
alice_central.commit_pending_proposals_unmerged(&id).await;
// Whereas Bob wants to remove Debbie
bob_central
.context
.conversation(&id)
.await
.unwrap()
.remove_members(&[debbie_central.get_client_id().await])
.await
.unwrap();
let commit = bob_central.mls_transport.latest_commit().await;
let proposals = alice_central
.context
.conversation(&id)
.await
.unwrap()
.decrypt_message(commit.to_bytes().unwrap())
.await
.unwrap()
.proposals;
// Remove is renewed since valid commit removes another
assert_eq!(alice_central.pending_proposals(&id).await.len(), 1);
assert_eq!(proposals.len(), alice_central.pending_proposals(&id).await.len());
})
},
)
.await
}
}
}