From 4606da09135e19d2d428a197db4b6cd7f247cd46 Mon Sep 17 00:00:00 2001
From: mulmarta <103590845+mulmarta@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:20:18 -0500
Subject: [PATCH] [Bugfix] Derive external pub extension from the new and not
 old key schedule (#108)

* [Bugfix] Derive external pub extension from the new and not old key schedule

* Make clippy stable

* Change test cipher suite to one supported by WASM

---------

Co-authored-by: Marta Mularczyk <mulmarta@amazon.com>
---
 .github/workflows/no_std_build.yml |  7 ++++---
 mls-rs/src/group/commit.rs         |  3 ++-
 mls-rs/tests/client_tests.rs       | 29 +++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/no_std_build.yml b/.github/workflows/no_std_build.yml
index 83ef2c43..fbcc2ff5 100644
--- a/.github/workflows/no_std_build.yml
+++ b/.github/workflows/no_std_build.yml
@@ -7,16 +7,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+    - uses: dtolnay/rust-toolchain@stable
     - uses: dtolnay/rust-toolchain@nightly
       with:
         targets: thumbv6m-none-eabi
         components: clippy
     - name: Clippy
-      run: cargo +nightly clippy --no-default-features -p mls-rs -- -D warnings
+      run: cargo +stable clippy --no-default-features -p mls-rs -- -D warnings
     - name: Test
-      run: cargo +nightly test --no-default-features --features test_util --verbose -p mls-rs --lib --test '*'
+      run: cargo +stable test --no-default-features --features test_util --verbose -p mls-rs --lib --test '*'
     - name: Test Full RFC Compliance
-      run: cargo +nightly test --no-default-features --features rfc_compliant,test_util --verbose -p mls-rs
+      run: cargo +stable test --no-default-features --features rfc_compliant,test_util --verbose -p mls-rs
     - name: Build MLS Embedded
       run: cargo +nightly build --package mls-rs --lib --no-default-features --target thumbv6m-none-eabi
     - name: Build MLS Embedded Full RFC Compliance
diff --git a/mls-rs/src/group/commit.rs b/mls-rs/src/group/commit.rs
index 3f3dbbf1..a1d51dd1 100644
--- a/mls-rs/src/group/commit.rs
+++ b/mls-rs/src/group/commit.rs
@@ -644,7 +644,8 @@ where
                 let mut extensions = ExtensionList::new();
 
                 extensions.set_from({
-                    self.key_schedule
+                    key_schedule_result
+                        .key_schedule
                         .get_external_key_pair_ext(&self.cipher_suite_provider)
                         .await?
                 })?;
diff --git a/mls-rs/tests/client_tests.rs b/mls-rs/tests/client_tests.rs
index 1f4b28a1..b89e745a 100644
--- a/mls-rs/tests/client_tests.rs
+++ b/mls-rs/tests/client_tests.rs
@@ -9,6 +9,7 @@ use mls_rs::error::MlsError;
 use mls_rs::group::proposal::Proposal;
 use mls_rs::group::ReceivedMessage;
 use mls_rs::identity::SigningIdentity;
+use mls_rs::mls_rules::CommitOptions;
 use mls_rs::ExtensionList;
 use mls_rs::MlsMessage;
 use mls_rs::ProtocolVersion;
@@ -815,3 +816,31 @@ async fn fake_key_package(id: usize) -> MlsMessage {
         .await
         .unwrap()
 }
+
+#[maybe_async::test(not(mls_build_async), async(mls_build_async, futures_test))]
+async fn external_info_from_commit_allows_to_join() {
+    let cs = CipherSuite::P256_AES128;
+    let version = ProtocolVersion::MLS_10;
+
+    let mut alice = mls_rs::test_utils::get_test_groups(
+        version,
+        cs,
+        1,
+        Some(CommitOptions::new().with_allow_external_commit(true)),
+        false,
+        &TestCryptoProvider::default(),
+    )
+    .await
+    .remove(0);
+
+    let commit = alice.commit(vec![]).await.unwrap();
+    alice.apply_pending_commit().await.unwrap();
+    let bob = generate_client(cs, version, 0xdead, false).await;
+
+    let (_bob, commit) = bob
+        .commit_external(commit.external_commit_group_info.unwrap())
+        .await
+        .unwrap();
+
+    alice.process_incoming_message(commit).await.unwrap();
+}