Merge pull request '验证 OpenMLS 群组完整设备名单与新世代隔离' (#23) from xhgit/group-mls-client into main
Reviewed-on: http://git.xhmcl.com/xhgit/XHChat/pulls/23
This commit was merged in pull request #23.
This commit is contained in:
commit
709e6aa6a6
5 files changed
+223
-6
No files matched your search
@@ -8,6 +8,8 @@
|
|||||||
|
|
||||||
WASM 导出 `DeviceMls`,负责生成密钥包、创建和加入两设备会话、绑定应用关联数据,以及处理消息。调用方需先独立验证设备公钥。MLS 快照包含私钥和会话秘密,调用方须在本机加密保存。每次操作从已保存快照恢复,成功后原子提交新快照和待发封包或接收游标。失败时丢弃该实例。
|
WASM 导出 `DeviceMls`,负责生成密钥包、创建和加入两设备会话、绑定应用关联数据,以及处理消息。调用方需先独立验证设备公钥。MLS 快照包含私钥和会话秘密,调用方须在本机加密保存。每次操作从已保存快照恢复,成功后原子提交新快照和待发封包或接收游标。失败时丢弃该实例。
|
||||||
|
|
||||||
|
群组使用 `start_group` 与 `join_group`,接受已核验的设备名单。群组加入时核对世代对应的 32 字节 MLS 群标识、创建者公钥和全部叶节点。当前变更成员时使用独立的新 MLS 会话,避免将旧密钥分发给新加入的设备。
|
||||||
|
|
||||||
使用下列命令生成浏览器绑定。构建输出存放于 `target`。
|
使用下列命令生成浏览器绑定。构建输出存放于 `target`。
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
|||||||
+116
-5
@@ -10,6 +10,21 @@ const MAX_SNAPSHOT: usize = 16 * 1024 * 1024;
|
|||||||
|
|
||||||
type EngineResult<T> = Result<T, &'static str>;
|
type EngineResult<T> = Result<T, &'static str>;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Enrollment {
|
||||||
|
pub device: String,
|
||||||
|
pub key: Vec<u8>,
|
||||||
|
pub package: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct GroupMember {
|
||||||
|
pub device: String,
|
||||||
|
pub key: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
struct Snapshot {
|
struct Snapshot {
|
||||||
version: u8,
|
version: u8,
|
||||||
@@ -120,9 +135,33 @@ impl Engine {
|
|||||||
expected_key: &[u8],
|
expected_key: &[u8],
|
||||||
wire: &[u8],
|
wire: &[u8],
|
||||||
) -> EngineResult<Vec<u8>> {
|
) -> EngineResult<Vec<u8>> {
|
||||||
let id = group_id_from(group_id)?;
|
let package = self.validate_package(peer, expected_key, wire)?;
|
||||||
if self.load_group(&id)?.is_some() {
|
self.create_group(group_id, &[package])
|
||||||
return Err("conversation already exists");
|
}
|
||||||
|
|
||||||
|
pub fn start_group(&self, group_id: &[u8], members: &[Enrollment]) -> EngineResult<Vec<u8>> {
|
||||||
|
if members.len() > 31 {
|
||||||
|
return Err("group device limit exceeded");
|
||||||
|
}
|
||||||
|
let mut seen = std::collections::HashSet::new();
|
||||||
|
let mut packages = Vec::with_capacity(members.len());
|
||||||
|
for member in members {
|
||||||
|
if !seen.insert(&member.device) {
|
||||||
|
return Err("duplicate group device");
|
||||||
|
}
|
||||||
|
packages.push(self.validate_package(&member.device, &member.key, &member.package)?);
|
||||||
|
}
|
||||||
|
self.create_group(group_id, &packages)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate_package(
|
||||||
|
&self,
|
||||||
|
peer: &str,
|
||||||
|
expected_key: &[u8],
|
||||||
|
wire: &[u8],
|
||||||
|
) -> EngineResult<KeyPackage> {
|
||||||
|
if wire.len() > 8192 || !valid_device(peer) {
|
||||||
|
return Err("invalid key package");
|
||||||
}
|
}
|
||||||
let message =
|
let message =
|
||||||
MlsMessageIn::tls_deserialize_exact(wire).map_err(|_| "invalid key package")?;
|
MlsMessageIn::tls_deserialize_exact(wire).map_err(|_| "invalid key package")?;
|
||||||
@@ -141,6 +180,14 @@ impl Engine {
|
|||||||
{
|
{
|
||||||
return Err("unexpected peer identity");
|
return Err("unexpected peer identity");
|
||||||
}
|
}
|
||||||
|
Ok(package)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn create_group(&self, group_id: &[u8], packages: &[KeyPackage]) -> EngineResult<Vec<u8>> {
|
||||||
|
let id = group_id_from(group_id)?;
|
||||||
|
if self.load_group(&id)?.is_some() {
|
||||||
|
return Err("conversation already exists");
|
||||||
|
}
|
||||||
let config = MlsGroupCreateConfig::builder()
|
let config = MlsGroupCreateConfig::builder()
|
||||||
.ciphersuite(SUITE)
|
.ciphersuite(SUITE)
|
||||||
.use_ratchet_tree_extension(true)
|
.use_ratchet_tree_extension(true)
|
||||||
@@ -149,8 +196,11 @@ impl Engine {
|
|||||||
let mut group =
|
let mut group =
|
||||||
MlsGroup::new_with_group_id(&self.provider, &signer, &config, id, self.credential())
|
MlsGroup::new_with_group_id(&self.provider, &signer, &config, id, self.credential())
|
||||||
.map_err(|_| "conversation creation failed")?;
|
.map_err(|_| "conversation creation failed")?;
|
||||||
|
if packages.is_empty() {
|
||||||
|
return Ok(Vec::new());
|
||||||
|
}
|
||||||
let (_, welcome, _) = group
|
let (_, welcome, _) = group
|
||||||
.add_members(&self.provider, &signer, &[package])
|
.add_members(&self.provider, &signer, packages)
|
||||||
.map_err(|_| "peer enrollment failed")?;
|
.map_err(|_| "peer enrollment failed")?;
|
||||||
group
|
group
|
||||||
.merge_pending_commit(&self.provider)
|
.merge_pending_commit(&self.provider)
|
||||||
@@ -161,6 +211,64 @@ impl Engine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn join(&self, peer: &str, expected_key: &[u8], wire: &[u8]) -> EngineResult<Vec<u8>> {
|
pub fn join(&self, peer: &str, expected_key: &[u8], wire: &[u8]) -> EngineResult<Vec<u8>> {
|
||||||
|
let staged = self.stage_welcome(peer, expected_key, wire)?;
|
||||||
|
if staged.members().count() != 2 {
|
||||||
|
return Err("unexpected conversation membership");
|
||||||
|
}
|
||||||
|
self.accept_welcome(staged)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn join_group(
|
||||||
|
&self,
|
||||||
|
id: &[u8],
|
||||||
|
owner: &str,
|
||||||
|
members: &[GroupMember],
|
||||||
|
wire: &[u8],
|
||||||
|
) -> EngineResult<Vec<u8>> {
|
||||||
|
let expected = group_id_from(id)?;
|
||||||
|
if !(2..=32).contains(&members.len()) {
|
||||||
|
return Err("invalid group device count");
|
||||||
|
}
|
||||||
|
let roster: HashMap<_, _> = members
|
||||||
|
.iter()
|
||||||
|
.map(|member| (member.device.as_bytes(), member.key.as_slice()))
|
||||||
|
.collect();
|
||||||
|
if roster.len() != members.len()
|
||||||
|
|| members
|
||||||
|
.iter()
|
||||||
|
.any(|member| !valid_device(&member.device) || member.key.len() != 32)
|
||||||
|
{
|
||||||
|
return Err("invalid group roster");
|
||||||
|
}
|
||||||
|
let key = roster.get(owner.as_bytes()).ok_or("unknown group owner")?;
|
||||||
|
let staged = self.stage_welcome(owner, key, wire)?;
|
||||||
|
if staged.group_context().group_id() != &expected
|
||||||
|
|| staged.members().count() != roster.len()
|
||||||
|
{
|
||||||
|
return Err("unexpected group context");
|
||||||
|
}
|
||||||
|
let mut seen = std::collections::HashSet::new();
|
||||||
|
for member in staged.members() {
|
||||||
|
let device = member.credential.serialized_content();
|
||||||
|
if member.credential.credential_type() != CredentialType::Basic
|
||||||
|
|| roster.get(device).copied() != Some(member.signature_key.as_slice())
|
||||||
|
|| !seen.insert(device.to_vec())
|
||||||
|
{
|
||||||
|
return Err("unexpected group participant");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.accept_welcome(staged)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stage_welcome(
|
||||||
|
&self,
|
||||||
|
peer: &str,
|
||||||
|
expected_key: &[u8],
|
||||||
|
wire: &[u8],
|
||||||
|
) -> EngineResult<StagedWelcome> {
|
||||||
|
if wire.len() > 65536 {
|
||||||
|
return Err("invalid welcome");
|
||||||
|
}
|
||||||
let message = MlsMessageIn::tls_deserialize_exact(wire).map_err(|_| "invalid welcome")?;
|
let message = MlsMessageIn::tls_deserialize_exact(wire).map_err(|_| "invalid welcome")?;
|
||||||
let MlsMessageBodyIn::Welcome(welcome) = message.extract() else {
|
let MlsMessageBodyIn::Welcome(welcome) = message.extract() else {
|
||||||
return Err("invalid welcome");
|
return Err("invalid welcome");
|
||||||
@@ -186,10 +294,13 @@ impl Engine {
|
|||||||
let own = staged.own_leaf_node().ok_or("missing local device")?;
|
let own = staged.own_leaf_node().ok_or("missing local device")?;
|
||||||
if !matches_device(own.credential(), &self.device)
|
if !matches_device(own.credential(), &self.device)
|
||||||
|| own.signature_key().as_slice() != self.public_key
|
|| own.signature_key().as_slice() != self.public_key
|
||||||
|| staged.members().count() != 2
|
|
||||||
{
|
{
|
||||||
return Err("unexpected conversation membership");
|
return Err("unexpected conversation membership");
|
||||||
}
|
}
|
||||||
|
Ok(staged)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn accept_welcome(&self, staged: StagedWelcome) -> EngineResult<Vec<u8>> {
|
||||||
let id = staged.group_context().group_id();
|
let id = staged.group_context().group_id();
|
||||||
group_id_from(id.as_slice())?;
|
group_id_from(id.as_slice())?;
|
||||||
if self.load_group(id)?.is_some() {
|
if self.load_group(id)?.is_some() {
|
||||||
|
|||||||
@@ -18,6 +18,80 @@ mod tests {
|
|||||||
|
|
||||||
const SUITE: Ciphersuite = Ciphersuite::MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
|
const SUITE: Ciphersuite = Ciphersuite::MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
|
||||||
|
|
||||||
|
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
|
||||||
|
#[cfg_attr(not(target_arch = "wasm32"), test)]
|
||||||
|
fn group_roster_is_authenticated_and_can_be_replaced() {
|
||||||
|
use crate::engine::{Engine, Enrollment, GroupMember};
|
||||||
|
|
||||||
|
let owner = Engine::new("00000000-0000-4000-8000-000000000001").unwrap();
|
||||||
|
let member = Engine::new("00000000-0000-4000-8000-000000000002").unwrap();
|
||||||
|
let removed = Engine::new("00000000-0000-4000-8000-000000000003").unwrap();
|
||||||
|
let enroll = |device: &Engine| Enrollment {
|
||||||
|
device: device.device().into(),
|
||||||
|
key: device.public_key().into(),
|
||||||
|
package: device.key_package().unwrap(),
|
||||||
|
};
|
||||||
|
let verify = |device: &Engine| GroupMember {
|
||||||
|
device: device.device().into(),
|
||||||
|
key: device.public_key().into(),
|
||||||
|
};
|
||||||
|
let group = [7; 32];
|
||||||
|
let welcome = owner
|
||||||
|
.start_group(&group, &[enroll(&member), enroll(&removed)])
|
||||||
|
.unwrap();
|
||||||
|
let roster = [verify(&owner), verify(&member), verify(&removed)];
|
||||||
|
let member_copy = Engine::restore(&member.snapshot().unwrap()).unwrap();
|
||||||
|
let mut wrong = [verify(&owner), verify(&member), verify(&removed)];
|
||||||
|
wrong[2].key.fill(0);
|
||||||
|
assert!(
|
||||||
|
member_copy
|
||||||
|
.join_group(&group, owner.device(), &wrong, &welcome)
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
member
|
||||||
|
.join_group(&group, owner.device(), &roster, &welcome)
|
||||||
|
.unwrap(),
|
||||||
|
group
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
removed
|
||||||
|
.join_group(&group, owner.device(), &roster, &welcome)
|
||||||
|
.unwrap(),
|
||||||
|
group
|
||||||
|
);
|
||||||
|
|
||||||
|
let old = member.encrypt(&group, b"group-v1", b"first epoch").unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
removed
|
||||||
|
.decrypt(member.device(), member.public_key(), b"group-v1", &old)
|
||||||
|
.unwrap(),
|
||||||
|
b"first epoch"
|
||||||
|
);
|
||||||
|
|
||||||
|
let next = [8; 32];
|
||||||
|
let welcome = owner.start_group(&next, &[enroll(&member)]).unwrap();
|
||||||
|
let roster = [verify(&owner), verify(&member)];
|
||||||
|
assert_eq!(
|
||||||
|
member
|
||||||
|
.join_group(&next, owner.device(), &roster, &welcome)
|
||||||
|
.unwrap(),
|
||||||
|
next
|
||||||
|
);
|
||||||
|
let fresh = owner.encrypt(&next, b"group-v2", b"after removal").unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
member
|
||||||
|
.decrypt(owner.device(), owner.public_key(), b"group-v2", &fresh)
|
||||||
|
.unwrap(),
|
||||||
|
b"after removal"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
removed
|
||||||
|
.decrypt(owner.device(), owner.public_key(), b"group-v2", &fresh)
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
|
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
|
||||||
#[cfg_attr(not(target_arch = "wasm32"), test)]
|
#[cfg_attr(not(target_arch = "wasm32"), test)]
|
||||||
fn device_conversation_survives_restore() {
|
fn device_conversation_survives_restore() {
|
||||||
|
|||||||
+27
-1
@@ -1,4 +1,4 @@
|
|||||||
use crate::engine::Engine;
|
use crate::engine::{Engine, Enrollment, GroupMember};
|
||||||
use wasm_bindgen::prelude::*;
|
use wasm_bindgen::prelude::*;
|
||||||
|
|
||||||
#[wasm_bindgen]
|
#[wasm_bindgen]
|
||||||
@@ -45,6 +45,32 @@ impl DeviceMls {
|
|||||||
self.0.join(peer, key, wire).map_err(JsError::new)
|
self.0.join(peer, key, wire).map_err(JsError::new)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn start_group(&self, id: &[u8], roster: &str) -> Result<Vec<u8>, JsError> {
|
||||||
|
if roster.len() > 1_100_000 {
|
||||||
|
return Err(JsError::new("group roster too large"));
|
||||||
|
}
|
||||||
|
let members: Vec<Enrollment> =
|
||||||
|
serde_json::from_str(roster).map_err(|_| JsError::new("invalid group roster"))?;
|
||||||
|
self.0.start_group(id, &members).map_err(JsError::new)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn join_group(
|
||||||
|
&self,
|
||||||
|
id: &[u8],
|
||||||
|
owner: &str,
|
||||||
|
roster: &str,
|
||||||
|
wire: &[u8],
|
||||||
|
) -> Result<Vec<u8>, JsError> {
|
||||||
|
if roster.len() > 10_000 {
|
||||||
|
return Err(JsError::new("group roster too large"));
|
||||||
|
}
|
||||||
|
let members: Vec<GroupMember> =
|
||||||
|
serde_json::from_str(roster).map_err(|_| JsError::new("invalid group roster"))?;
|
||||||
|
self.0
|
||||||
|
.join_group(id, owner, &members, wire)
|
||||||
|
.map_err(JsError::new)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn encrypt(&self, id: &[u8], aad: &[u8], plaintext: &[u8]) -> Result<Vec<u8>, JsError> {
|
pub fn encrypt(&self, id: &[u8], aad: &[u8], plaintext: &[u8]) -> Result<Vec<u8>, JsError> {
|
||||||
self.0.encrypt(id, aad, plaintext).map_err(JsError::new)
|
self.0.encrypt(id, aad, plaintext).map_err(JsError::new)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,3 +100,7 @@ Web 和 Windows 可创建群组、邀请已接受的联系人、接受或拒绝
|
|||||||
## 群组密文投递
|
## 群组密文投递
|
||||||
|
|
||||||
服务端已接入群世代登记、设备定向 Welcome、群密文写入、游标补拉与保留期。集成测试覆盖名单外设备拒绝、成员移除后拒绝旧世代、重新加入后的历史隔离和绑定设备撤销。当前群世代限每账户一台设备,客户端 MLS 群会话仍待接入。
|
服务端已接入群世代登记、设备定向 Welcome、群密文写入、游标补拉与保留期。集成测试覆盖名单外设备拒绝、成员移除后拒绝旧世代、重新加入后的历史隔离和绑定设备撤销。当前群世代限每账户一台设备,客户端 MLS 群会话仍待接入。
|
||||||
|
|
||||||
|
## MLS 群会话引擎
|
||||||
|
|
||||||
|
OpenMLS WASM 新增批量设备入组。创建端校验每个 KeyPackage 和预期设备签名公钥,接收端校验 Welcome 发送者、MLS 群标识与完整设备名单。三设备测试验证替换名单公钥会被拒绝,创建排除已移除设备的新会话后,该设备无法解密新密文。设备信任界面和群消息界面仍待接入。
|
||||||
Reference in new issue
Block a user