openmls 0.8.1

A Rust implementation of the Messaging Layer Security (MLS) protocol, as defined in RFC 9420.
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
use crate::{
    binary_tree::LeafNodeIndex,
    ciphersuite::hash_ref::ProposalRef,
    credentials::{test_utils, CredentialType},
    extensions::{Extension, ExtensionType, Extensions, RequiredCapabilitiesExtension},
    framing::{
        mls_auth_content::AuthenticatedContent, sender::Sender, FramingParameters, WireFormat,
    },
    group::{
        errors::*,
        mls_group::{
            proposal_store::{ProposalQueue, ProposalStore, QueuedProposal},
            tests_and_kats::utils::{setup_alice_bob_group, setup_client},
            ProcessedMessageContent,
        },
        GroupContext, GroupId, MlsGroup, MlsGroupJoinConfig, StagedWelcome,
        PURE_CIPHERTEXT_WIRE_FORMAT_POLICY, PURE_PLAINTEXT_WIRE_FORMAT_POLICY,
    },
    key_packages::{KeyPackage, KeyPackageBundle, KeyPackageIn},
    messages::proposals::{AddProposal, Proposal, ProposalOrRef, ProposalType},
    prelude::LeafNodeParameters,
    treesync::node::leaf_node::Capabilities,
    versions::ProtocolVersion,
};

#[cfg(feature = "extensions-draft-08")]
use crate::{
    component::ComponentId,
    group::MlsGroupCreateConfig,
    messages::proposals::AppEphemeralProposal,
    prelude::{MlsMessageIn, StagedCommit},
    test_utils::single_group_test_framework::*,
};

/// This test makes sure ProposalQueue works as intended. This functionality is
/// used in `create_commit` to filter the epoch proposals. Expected result:
/// `filtered_queued_proposals` returns only proposals of a certain type
#[openmls_test::openmls_test]
fn proposal_queue_functions() {
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();
    let crypto = alice_provider.crypto();
    // Framing parameters
    let framing_parameters = FramingParameters::new(&[], WireFormat::PublicMessage);
    // Define identities
    let (alice_credential, alice_key_package_bundle, alice_signer, _alice_pk) =
        setup_client("Alice", ciphersuite, alice_provider);
    let (_bob_credential_with_key, bob_key_package_bundle, _bob_signer, _bob_pk) =
        setup_client("Bob", ciphersuite, bob_provider);

    let bob_key_package = bob_key_package_bundle.key_package();
    let alice_update_key_package_bundle =
        KeyPackageBundle::generate(alice_provider, &alice_signer, ciphersuite, alice_credential);
    let alice_update_key_package = alice_update_key_package_bundle.key_package();
    let kpi = KeyPackageIn::from(alice_update_key_package.clone());
    assert!(kpi.validate(crypto, ProtocolVersion::Mls10).is_ok());

    let group_context = GroupContext::new(
        ciphersuite,
        GroupId::random(alice_provider.rand()),
        0,
        vec![],
        vec![],
        Extensions::empty(),
    );

    // Let's create some proposals
    let add_proposal_alice1 = AddProposal {
        key_package: alice_key_package_bundle.key_package().clone(),
    };
    let add_proposal_alice2 = AddProposal {
        key_package: alice_key_package_bundle.key_package().clone(),
    };
    let add_proposal_bob = AddProposal {
        key_package: bob_key_package.clone(),
    };

    let proposal_add_alice1 = Proposal::add(add_proposal_alice1);
    let proposal_add_alice2 = Proposal::add(add_proposal_alice2);
    let proposal_add_bob = Proposal::add(add_proposal_bob);

    // Test proposal types
    assert!(proposal_add_alice1.is_type(ProposalType::Add));
    assert!(!proposal_add_alice1.is_type(ProposalType::Update));
    assert!(!proposal_add_alice1.is_type(ProposalType::Remove));

    // Frame proposals in PublicMessage
    let mls_plaintext_add_alice1 = AuthenticatedContent::member_proposal(
        framing_parameters,
        LeafNodeIndex::new(0),
        proposal_add_alice1,
        &group_context,
        &alice_signer,
    )
    .unwrap();
    let mls_plaintext_add_alice2 = AuthenticatedContent::member_proposal(
        framing_parameters,
        LeafNodeIndex::new(1),
        proposal_add_alice2,
        &group_context,
        &alice_signer,
    )
    .unwrap();
    let mls_plaintext_add_bob = AuthenticatedContent::member_proposal(
        framing_parameters,
        LeafNodeIndex::new(1),
        proposal_add_bob,
        &group_context,
        &alice_signer,
    )
    .unwrap();

    let proposal_reference_add_alice1 = ProposalRef::from_authenticated_content_by_ref(
        crypto,
        ciphersuite,
        &mls_plaintext_add_alice1,
    )
    .unwrap();
    let proposal_reference_add_alice2 = ProposalRef::from_authenticated_content_by_ref(
        crypto,
        ciphersuite,
        &mls_plaintext_add_alice2,
    )
    .unwrap();
    let proposal_reference_add_bob =
        ProposalRef::from_authenticated_content_by_ref(crypto, ciphersuite, &mls_plaintext_add_bob)
            .unwrap();

    let mut proposal_store = ProposalStore::from_queued_proposal(
        QueuedProposal::from_authenticated_content_by_ref(
            ciphersuite,
            crypto,
            mls_plaintext_add_alice1,
        )
        .expect("Could not create QueuedProposal."),
    );
    proposal_store.add(
        QueuedProposal::from_authenticated_content_by_ref(
            ciphersuite,
            crypto,
            mls_plaintext_add_alice2,
        )
        .expect("Could not create QueuedProposal."),
    );

    let (proposal_queue, own_update) = ProposalQueue::filter_proposals(
        proposal_store.proposals().map(Clone::clone),
        LeafNodeIndex::new(0),
    )
    .expect("Could not create ProposalQueue.");

    // Own update should not be required in this case (only add proposals)
    assert!(!own_update);

    // Test if proposals are all covered
    let valid_proposal_reference_list = &[
        proposal_reference_add_alice1.clone(),
        proposal_reference_add_alice2.clone(),
    ];
    assert!(proposal_queue.contains(valid_proposal_reference_list));

    let invalid_proposal_reference_list = &[
        proposal_reference_add_alice1,
        proposal_reference_add_alice2,
        proposal_reference_add_bob,
    ];
    assert!(!proposal_queue.contains(invalid_proposal_reference_list));

    // Get filtered proposals
    for filtered_proposal in proposal_queue.filtered_by_type(ProposalType::Add) {
        assert!(filtered_proposal.proposal().is_type(ProposalType::Add));
    }
}

/// Test, that we QueuedProposalQueue is iterated in the right order.
#[openmls_test::openmls_test]
fn proposal_queue_order() {
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();

    // Framing parameters
    let framing_parameters = FramingParameters::new(&[], WireFormat::PublicMessage);
    // Define identities
    let (alice_credential, alice_key_package_bundle, alice_signer, _alice_pk) =
        setup_client("Alice", ciphersuite, alice_provider);
    let (_bob_credential_with_key, bob_key_package_bundle, _bob_signer, _bob_pk) =
        setup_client("Bob", ciphersuite, bob_provider);

    let bob_key_package = bob_key_package_bundle.key_package();
    let alice_update_key_package_bundle =
        KeyPackageBundle::generate(alice_provider, &alice_signer, ciphersuite, alice_credential);
    let alice_update_key_package = alice_update_key_package_bundle.key_package();
    let kpi = KeyPackageIn::from(alice_update_key_package.clone());
    assert!(kpi
        .validate(alice_provider.crypto(), ProtocolVersion::Mls10)
        .is_ok());

    let group_context = GroupContext::new(
        ciphersuite,
        GroupId::random(alice_provider.rand()),
        0,
        vec![],
        vec![],
        Extensions::empty(),
    );

    // Let's create some proposals
    let add_proposal_alice1 = AddProposal {
        key_package: alice_key_package_bundle.key_package().clone(),
    };
    let add_proposal_bob1 = AddProposal {
        key_package: bob_key_package.clone(),
    };

    let proposal_add_alice1 = Proposal::add(add_proposal_alice1);
    let proposal_add_bob1 = Proposal::add(add_proposal_bob1);

    // Frame proposals in PublicMessage
    let mls_plaintext_add_alice1 = AuthenticatedContent::member_proposal(
        framing_parameters,
        LeafNodeIndex::new(0),
        proposal_add_alice1.clone(),
        &group_context,
        &alice_signer,
    )
    .unwrap();
    let proposal_reference_add_alice1 = ProposalRef::from_authenticated_content_by_ref(
        alice_provider.crypto(),
        ciphersuite,
        &mls_plaintext_add_alice1,
    )
    .unwrap();

    let mls_plaintext_add_bob1 = AuthenticatedContent::member_proposal(
        framing_parameters,
        LeafNodeIndex::new(1),
        proposal_add_bob1.clone(),
        &group_context,
        &alice_signer,
    )
    .unwrap();

    // This should set the order of the proposals.
    let mut proposal_store = ProposalStore::from_queued_proposal(
        QueuedProposal::from_authenticated_content_by_ref(
            ciphersuite,
            alice_provider.crypto(),
            mls_plaintext_add_alice1,
        )
        .unwrap(),
    );
    proposal_store.add(
        QueuedProposal::from_authenticated_content_by_ref(
            ciphersuite,
            bob_provider.crypto(),
            mls_plaintext_add_bob1,
        )
        .unwrap(),
    );

    let proposal_or_refs = vec![
        ProposalOrRef::proposal(proposal_add_bob1.clone()),
        ProposalOrRef::reference(proposal_reference_add_alice1),
    ];

    let sender = Sender::build_member(LeafNodeIndex::new(0));

    // And the same should go for proposal queues built from committed
    // proposals. The order here should be dictated by the proposals passed
    // as ProposalOrRefs.
    let proposal_queue = ProposalQueue::from_committed_proposals(
        ciphersuite,
        alice_provider.crypto(),
        proposal_or_refs,
        &proposal_store,
        &sender,
    )
    .unwrap();

    let proposal_collection: Vec<&QueuedProposal> =
        proposal_queue.filtered_by_type(ProposalType::Add).collect();

    assert_eq!(proposal_collection[0].proposal(), &proposal_add_bob1);
    assert_eq!(proposal_collection[1].proposal(), &proposal_add_alice1);
}

#[openmls_test::openmls_test]
fn required_extension_key_package_mismatch() {
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();

    // Basic group setup.
    let (alice_credential, _, alice_signer, _alice_pk) =
        setup_client("Alice", ciphersuite, alice_provider);
    let (_bob_credential_with_key, bob_key_package_bundle, _, _) =
        setup_client("Bob", ciphersuite, bob_provider);
    let bob_key_package = bob_key_package_bundle.key_package();

    // Set required capabilities
    let extensions = &[ExtensionType::Unknown(0xff00)];
    // We don't support unknown proposals (yet)
    let proposals = &[];
    let credentials = &[CredentialType::Basic];
    let required_capabilities =
        RequiredCapabilitiesExtension::new(extensions, proposals, credentials);

    let mut alice_group = MlsGroup::builder()
        .ciphersuite(ciphersuite)
        .with_group_context_extensions(
            Extensions::single(Extension::RequiredCapabilities(required_capabilities))
                .expect("failed to create single-element extensions list"),
        )
        .build(alice_provider, &alice_signer, alice_credential)
        .expect("Error creating MlsGroup.");

    let e = alice_group.propose_add_member(alice_provider, &alice_signer, bob_key_package)
        .expect_err("Proposal was created even though the key package didn't support the required extensions.");

    assert_eq!(
        e,
        ProposeAddMemberError::LeafNodeValidation(
            crate::treesync::errors::LeafNodeValidationError::UnsupportedExtensions
        )
    );
}

#[openmls_test::openmls_test]
fn group_context_extensions() {
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();

    // Basic group setup.
    let (alice_credential, _, alice_signer, _alice_pk) =
        setup_client("Alice", ciphersuite, alice_provider);
    let (_bob_credential_with_key, bob_key_package_bundle, _, _) =
        setup_client("Bob", ciphersuite, bob_provider);

    let bob_key_package = bob_key_package_bundle.key_package();

    // Set required capabilities
    let extensions = &[ExtensionType::ApplicationId];
    let proposals = &[
        ProposalType::GroupContextExtensions,
        ProposalType::Add,
        ProposalType::Remove,
        ProposalType::Update,
    ];
    let credentials = &[CredentialType::Basic];
    let required_capabilities =
        RequiredCapabilitiesExtension::new(extensions, proposals, credentials);

    let mut alice_group = MlsGroup::builder()
        .ciphersuite(ciphersuite)
        .with_group_context_extensions(
            Extensions::single(Extension::RequiredCapabilities(required_capabilities))
                .expect("failed to create single-element extensions list"),
        )
        .build(alice_provider, &alice_signer, alice_credential)
        .expect("Error creating MlsGroup.");

    let (_commit, welcome, _group_info_option) = alice_group
        .add_members(
            alice_provider,
            &alice_signer,
            core::slice::from_ref(bob_key_package),
        )
        .expect("Error adding members.");

    alice_group.merge_pending_commit(alice_provider).unwrap();

    let ratchet_tree = alice_group.export_ratchet_tree();

    // Make sure that Bob can join the group with the required extension in place
    // and Bob's key package supporting them.
    let _bob_group = StagedWelcome::new_from_welcome(
        bob_provider,
        &MlsGroupJoinConfig::default(),
        welcome.into_welcome().unwrap(),
        Some(ratchet_tree.into()),
    )
    .expect("Error joining group.");
}

#[openmls_test::openmls_test]
fn group_context_extension_proposal_fails() {
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();
    // Basic group setup.
    let (alice_credential, _, alice_signer, _alice_pk) =
        setup_client("Alice", ciphersuite, alice_provider);
    let (_bob_credential_with_key, bob_key_package_bundle, _bob_signer, _) =
        setup_client("Bob", ciphersuite, bob_provider);

    let bob_key_package = bob_key_package_bundle.key_package();

    // Set required capabilities
    let proposals = &[
        ProposalType::GroupContextExtensions,
        ProposalType::Add,
        ProposalType::Remove,
        ProposalType::Update,
    ];
    let credentials = &[CredentialType::Basic];
    let required_capabilities = RequiredCapabilitiesExtension::new(&[], proposals, credentials);

    let mut alice_group = MlsGroup::builder()
        .ciphersuite(ciphersuite)
        .with_group_context_extensions(
            Extensions::single(Extension::RequiredCapabilities(required_capabilities))
                .expect("failed to create single-element extensions list"),
        )
        .build(alice_provider, &alice_signer, alice_credential)
        .expect("Error creating MlsGroup.");

    // Adding Bob
    let (_commit, welcome, _group_info_option) = alice_group
        .add_members(
            alice_provider,
            &alice_signer,
            core::slice::from_ref(bob_key_package),
        )
        .expect("Error adding members.");

    alice_group.merge_pending_commit(alice_provider).unwrap();

    let ratchet_tree = alice_group.export_ratchet_tree();

    let _bob_group = StagedWelcome::new_from_welcome(
        bob_provider,
        &MlsGroupJoinConfig::default(),
        welcome.into_welcome().unwrap(),
        Some(ratchet_tree.into()),
    )
    .and_then(|staged_join| staged_join.into_group(bob_provider))
    .expect("Error joining group.");

    // TODO: openmls/openmls#1130 re-enable
    // // Now Bob wants the ApplicationId extension to be required.
    // // This should fail because Alice doesn't support it.
    //let unsupported_extensions = Extensions::single(Extension::Unknown(
    //    0xff00,
    //    UnknownExtension(vec![0, 1, 2, 3]),
    //));
    //let e = bob_group
    //    .propose_group_context_extensions(provider, unsupported_extensions, &bob_signer)
    //    .expect_err("Bob was able to propose an extension not supported by all other parties.");
    //
    //assert_eq!(
    //    e,
    //    ProposalError::CreateGroupContextExtProposalError(
    //        CreateGroupContextExtProposalError::KeyPackageExtensionSupport(
    //            KeyPackageExtensionSupportError::UnsupportedExtension
    //        )
    //    )
    //);
}

#[openmls_test::openmls_test]
fn group_context_extension_proposal() {
    // Basic group setup.
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();
    let (mut alice_group, alice_signer, mut bob_group, bob_signer, _alice_credential, _bob_credential) =
        // TODO: don't let alice and bob share the provider
        setup_alice_bob_group(ciphersuite, alice_provider, bob_provider);

    // Alice adds a required capability.
    let required_application_id =
        Extension::RequiredCapabilities(RequiredCapabilitiesExtension::new(
            &[ExtensionType::ApplicationId],
            &[],
            &[CredentialType::Basic],
        ));
    let (gce_proposal, _) = alice_group
        .propose_group_context_extensions(
            alice_provider,
            Extensions::single(required_application_id)
                .expect("failed to create single-element extensions list"),
            &alice_signer,
        )
        .expect("Error proposing gce.");

    let processed_message = bob_group
        .process_message(bob_provider, gce_proposal.into_protocol_message().unwrap())
        .expect("Error processing gce proposal.");

    match processed_message.into_content() {
        ProcessedMessageContent::ProposalMessage(queued_proposal) => {
            bob_group
                .store_pending_proposal(bob_provider.storage(), *queued_proposal)
                .unwrap();
        }
        _ => panic!("Expected a StagedCommitMessage."),
    };

    // Bob commits the proposal.
    let (commit, _, _) = bob_group
        .commit_to_pending_proposals(bob_provider, &bob_signer)
        .unwrap();

    bob_group.merge_pending_commit(bob_provider).unwrap();

    let processed_message = alice_group
        .process_message(alice_provider, commit.into_protocol_message().unwrap())
        .expect("Error processing commit.");

    match processed_message.into_content() {
        ProcessedMessageContent::StagedCommitMessage(commit) => {
            alice_group
                .merge_staged_commit(alice_provider, *commit)
                .unwrap();
        }
        _ => panic!("Expected a StagedCommitMessage."),
    };

    assert_eq!(
        alice_group.epoch_authenticator(),
        bob_group.epoch_authenticator()
    )
}

// A simple test to check that a SelfRemove proposal can be created and
// processed.
#[openmls_test::openmls_test]
fn self_remove_proposals() {
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();

    // Create credentials and keys
    let (alice_credential, alice_signer) =
        test_utils::new_credential(alice_provider, b"Alice", ciphersuite.signature_algorithm());
    let (bob_credential, bob_signer) =
        test_utils::new_credential(bob_provider, b"Bob", ciphersuite.signature_algorithm());

    // Add SelfRemove to capabilities
    let capabilities = Capabilities::new(
        None,
        Some(&[ciphersuite]),
        None,
        Some(&[ProposalType::SelfRemove]),
        None,
    );

    // Generate KeyPackages
    let bob_key_package_bundle = KeyPackage::builder()
        .leaf_node_capabilities(capabilities.clone())
        .build(
            ciphersuite,
            bob_provider,
            &bob_signer,
            bob_credential.clone(),
        )
        .unwrap();
    let bob_key_package = bob_key_package_bundle.key_package();

    // Alice creates a group
    let mut alice_group = MlsGroup::builder()
        .ciphersuite(ciphersuite)
        // support the non-default SelfRemove proposal type
        .with_capabilities(capabilities)
        .with_wire_format_policy(PURE_PLAINTEXT_WIRE_FORMAT_POLICY)
        .build(alice_provider, &alice_signer, alice_credential.clone())
        .expect("Error creating group.");

    // Alice adds Bob
    let (_commit, welcome, _group_info_option) = alice_group
        .add_members(
            alice_provider,
            &alice_signer,
            core::slice::from_ref(bob_key_package),
        )
        .expect("Could not create proposal.");

    alice_group
        .merge_pending_commit(alice_provider)
        .expect("error merging pending commit");

    let mut bob_group = StagedWelcome::new_from_welcome(
        bob_provider,
        &MlsGroupJoinConfig::builder()
            .wire_format_policy(PURE_PLAINTEXT_WIRE_FORMAT_POLICY)
            .build(),
        welcome.into_welcome().unwrap(),
        Some(alice_group.export_ratchet_tree().into()),
    )
    .and_then(|staged_join| staged_join.into_group(bob_provider))
    .expect("error creating group from welcome");

    // Now Bob wants to remove himself via a SelfRemove proposal
    let self_remove = bob_group
        .leave_group_via_self_remove(bob_provider, &bob_signer)
        .unwrap();

    // Alice process Bob's proposal
    let processed_message = alice_group
        .process_message(alice_provider, self_remove.into_protocol_message().unwrap())
        .expect("Error processing self remove proposal.");

    match processed_message.into_content() {
        ProcessedMessageContent::ProposalMessage(queued_proposal) => {
            alice_group
                .store_pending_proposal(alice_provider.storage(), *queued_proposal)
                .unwrap();
        }
        _ => panic!("Expected a ProposalMessage."),
    };

    // Alice commits Bob's proposal
    let (commit, _, _) = alice_group
        .commit_to_pending_proposals(alice_provider, &alice_signer)
        .unwrap();

    alice_group.merge_pending_commit(alice_provider).unwrap();

    // Bob processes Alice's commit
    let processed_message = bob_group
        .process_message(bob_provider, commit.into_protocol_message().unwrap())
        .expect("Error processing commit.");

    match processed_message.into_content() {
        ProcessedMessageContent::StagedCommitMessage(commit) => {
            bob_group
                .merge_staged_commit(bob_provider, *commit)
                .unwrap();
        }
        _ => panic!("Expected a StagedCommitMessage."),
    };

    // Bob should have been removed from the group
    assert!(!bob_group.is_active());
    assert_eq!(alice_group.members().count(), 1);
}

// Test if update proposals are properly discarded if a remove proposal is
// present for a given leaf.
#[openmls_test::openmls_test]
fn remove_and_update_processing() {
    let alice_provider = &Provider::default();
    let bob_provider = &Provider::default();

    // Create a group with alice and bob.
    let (alice_credential, _, alice_signer, _alice_pk) =
        setup_client("Alice", ciphersuite, alice_provider);
    let (_bob_credential_with_key, bob_key_package_bundle, bob_signer, _) =
        setup_client("Bob", ciphersuite, bob_provider);

    let bob_key_package = bob_key_package_bundle.key_package();

    let mut alice_group = MlsGroup::builder()
        .ciphersuite(ciphersuite)
        .build(alice_provider, &alice_signer, alice_credential)
        .expect("Error creating MlsGroup.");

    let (_commit, welcome, _group_info_option) = alice_group
        .add_members(
            alice_provider,
            &alice_signer,
            core::slice::from_ref(bob_key_package),
        )
        .expect("Error adding members.");

    alice_group.merge_pending_commit(alice_provider).unwrap();

    let ratchet_tree = alice_group.export_ratchet_tree();

    let mut bob_group = StagedWelcome::new_from_welcome(
        bob_provider,
        &MlsGroupJoinConfig::default(),
        welcome.into_welcome().unwrap(),
        Some(ratchet_tree.into()),
    )
    .expect("Error joining group.")
    .into_group(bob_provider)
    .unwrap();

    // Alice proposes that Bob be removed.
    let (remove_proposal, _proposal_ref) = alice_group
        .propose_remove_member(alice_provider, &alice_signer, LeafNodeIndex::new(1))
        .expect("Error proposing remove.");

    let processed_message = bob_group
        .process_message(
            bob_provider,
            remove_proposal.into_protocol_message().unwrap(),
        )
        .unwrap();

    match processed_message.into_content() {
        ProcessedMessageContent::ProposalMessage(queued_proposal) => {
            bob_group
                .store_pending_proposal(bob_provider.storage(), *queued_proposal)
                .unwrap();
        }
        _ => panic!("Expected a ProposalMessage."),
    };

    // At the same time, bob proposes an update.
    let (update_proposal, _proposal_ref) = bob_group
        .propose_self_update(bob_provider, &bob_signer, LeafNodeParameters::default())
        .expect("Error proposing update.");

    let processed_message = alice_group
        .process_message(
            alice_provider,
            update_proposal.into_protocol_message().unwrap(),
        )
        .unwrap();

    match processed_message.into_content() {
        ProcessedMessageContent::ProposalMessage(queued_proposal) => {
            alice_group
                .store_pending_proposal(alice_provider.storage(), *queued_proposal)
                .unwrap();
        }
        _ => panic!("Expected a ProposalMessage."),
    };

    let pending_proposals: Vec<_> = alice_group.pending_proposals().collect();
    println!("Pending proposals: {:?}", pending_proposals);

    // Alice commits both proposals.
    let (commit, _, _) = alice_group
        .commit_to_pending_proposals(alice_provider, &alice_signer)
        .unwrap();

    let staged_proposals: Vec<_> = alice_group
        .pending_commit()
        .unwrap()
        .queued_proposals()
        .collect();

    println!("Staged proposals {:?}", staged_proposals);

    alice_group.merge_pending_commit(alice_provider).unwrap();

    // Bob processes the commit.
    let processed_message = bob_group
        .process_message(bob_provider, commit.into_protocol_message().unwrap())
        .unwrap();

    match processed_message.into_content() {
        ProcessedMessageContent::StagedCommitMessage(commit) => {
            bob_group
                .merge_staged_commit(bob_provider, *commit)
                .unwrap();
        }
        _ => panic!("Expected a StagedCommitMessage."),
    };
    // Bob should be removed now.
    assert_eq!(alice_group.members().count(), 1);
    assert!(!bob_group.is_active());
}

// A simple test to check that SelfRemove proposals are only ever sent as
// PublicMessages.
#[openmls_test::openmls_test]
fn self_remove_proposals_always_public() {
    let alice_provider = &Provider::default();
    let (alice_credential, alice_signer) =
        test_utils::new_credential(alice_provider, b"Alice", ciphersuite.signature_algorithm());

    // Alice creates a group
    let mut alice_group = MlsGroup::builder()
        .ciphersuite(ciphersuite)
        .with_wire_format_policy(PURE_CIPHERTEXT_WIRE_FORMAT_POLICY)
        .build(alice_provider, &alice_signer, alice_credential.clone())
        .expect("Error creating group.");

    // Now Bob wants to remove himself via a SelfRemove proposal
    let self_remove = alice_group
        .leave_group_via_self_remove(alice_provider, &alice_signer)
        .expect_err("SelfRemove proposal was created with wrong wire format policy.");

    assert_eq!(
        self_remove,
        LeaveGroupError::CannotSelfRemoveWithPureCiphertext
    );
}