diff --git a/README.md b/README.md index 78ffa00..dd4b828 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,13 @@ | 账号与设备 | Windows 和 Web 共用账号,支持用户名注册、登录、查看设备和远程撤销。 | | 联系人 | 按用户名查找、处理好友申请、管理备注与分组,以及拉黑。变更可在双端实时同步。 | | 加密文字聊天 | 在两个已核验设备之间发送 MLS 加密消息,支持离线接收。 | +| 加密群聊 | 创建群组、邀请联系人和管理成员。每个账号选一台已核验设备参与 MLS 加密文字聊天。 | | 加密附件 | 两端可发送和下载最多 8 MiB 的文件,并在本机预览图片和视频。 | | 加密语音 | 两端可录制和播放最长 60 秒的语音消息。 | | 消息管理 | 支持会话查找、可选加密已读回执、引用回复、编辑、撤回、转发、本机搜索和收藏。 | | Chromium 浏览器 | Windows 端支持独立窗口、多标签、导航、搜索、书签、历史、下载和隐私窗口,网页运行在独立会话中。 | -当前为开发预览。大文件分片、群聊、音视频和多设备历史同步仍在开发,Windows 安装包尚未发布。 [开发进度与验收记录](docs/progress.md) +当前为开发预览。大文件分片、群聊附件、音视频和多设备历史同步仍在开发,Windows 安装包尚未发布。 [开发进度与验收记录](docs/progress.md) ## 本地预览 @@ -54,6 +55,8 @@ npm.cmd run desktop 体验加密文字聊天时,注册两个账号并互加好友。在双方的联系人详情中打开「加密聊天」,启用本机加密,通过另一可信渠道交换安全码,分别核验对方设备后即可互发消息。 +体验群聊时,在「群组」中邀请联系人。成员接受邀请后启用本机群聊,通过可信渠道核验群内设备。群主选好设备后点击「建立群加密会话」。成员加入、离开或已选设备被撤销时,群主需要重新建立加密会话。 + ## 开发文档 | 主题 | 文档 | diff --git a/crypto/src/engine.rs b/crypto/src/engine.rs index 6198de3..6e8843a 100644 --- a/crypto/src/engine.rs +++ b/crypto/src/engine.rs @@ -335,11 +335,42 @@ impl Engine { expected_key: &[u8], associated_data: &[u8], wire: &[u8], + ) -> EngineResult> { + self.decrypt_message(None, peer, expected_key, associated_data, wire) + } + + pub fn decrypt_group( + &self, + id: &[u8], + peer: &str, + expected_key: &[u8], + associated_data: &[u8], + wire: &[u8], + ) -> EngineResult> { + self.decrypt_message( + Some(&group_id_from(id)?), + peer, + expected_key, + associated_data, + wire, + ) + } + + fn decrypt_message( + &self, + expected_group: Option<&GroupId>, + peer: &str, + expected_key: &[u8], + associated_data: &[u8], + wire: &[u8], ) -> EngineResult> { let protocol = MlsMessageIn::tls_deserialize_exact(wire) .map_err(|_| "invalid ciphertext")? .try_into_protocol_message() .map_err(|_| "invalid ciphertext")?; + if expected_group.is_some_and(|id| id != protocol.group_id()) { + return Err("unexpected MLS group"); + } let mut group = self .load_group(protocol.group_id())? .ok_or("unknown conversation")?; diff --git a/crypto/src/lib.rs b/crypto/src/lib.rs index 0be3fc2..e3e6467 100644 --- a/crypto/src/lib.rs +++ b/crypto/src/lib.rs @@ -79,9 +79,14 @@ mod tests { next ); let fresh = owner.encrypt(&next, b"group-v2", b"after removal").unwrap(); + assert!( + member + .decrypt_group(&group, owner.device(), owner.public_key(), b"group-v2", &fresh) + .is_err() + ); assert_eq!( member - .decrypt(owner.device(), owner.public_key(), b"group-v2", &fresh) + .decrypt_group(&next, owner.device(), owner.public_key(), b"group-v2", &fresh) .unwrap(), b"after removal" ); diff --git a/crypto/src/wasm.rs b/crypto/src/wasm.rs index 97c3237..96a36f7 100644 --- a/crypto/src/wasm.rs +++ b/crypto/src/wasm.rs @@ -84,4 +84,17 @@ impl DeviceMls { ) -> Result, JsError> { self.0.decrypt(peer, key, aad, wire).map_err(JsError::new) } + + pub fn decrypt_group( + &self, + id: &[u8], + peer: &str, + key: &[u8], + aad: &[u8], + wire: &[u8], + ) -> Result, JsError> { + self.0 + .decrypt_group(id, peer, key, aad, wire) + .map_err(JsError::new) + } } diff --git a/docs/api.md b/docs/api.md index 31fa49e..ae68f44 100644 --- a/docs/api.md +++ b/docs/api.md @@ -28,6 +28,10 @@ | GET | /api/v1/attachments/{id} | 原发送或接收设备获取附件密文 | | GET / POST | /api/v1/groups | 列出当前账号所属群组与邀请,或创建群组 | | GET / POST | /api/v1/groups/{id} | 查看群组详情或执行邀请、接受、拒绝、改名、升降管理员、移除、退出或解散 | +| GET | /api/v1/groups/{id}/devices | 获取群成员的有效设备与 MLS 公钥 | +| POST | /api/v1/groups/{id}/devices/{device}/claim | 群主一次性领取群成员设备的 KeyPackage | +| GET / POST | /api/v1/groups/{id}/epochs | 读取当前设备可访问的会话信息或由群主发布新世代 | +| GET / POST | /api/v1/groups/{id}/messages | 使用 after 游标补拉群密文或向当前世代提交群密文 | | POST | /api/v1/contacts/{id}/devices/{device}/claim | 为当前设备原子领取一个联系人的未使用 KeyPackage | 用户名为 3–32 位 ASCII 字母、数字或下划线,忽略大小写。密码最少 12 个 Unicode 字符,最多 256 字节。platform 为 web 或 windows。公钥、签名和 challenge 使用无填充 Base64URL。设备使用 Ed25519 签名 UTF-8 字符串 `XHChat device authentication v1\n` 后紧接 challenge。该签名仅用于证明基础设备密钥持有权。 @@ -44,7 +48,9 @@ MLS 凭据由标准 Base64 的 publicKey 和 signature 组成,使用 UTF-8 前 群组详情包含十进制字符串 membershipVersion。已接受成员变化会递增版本,待处理邀请和角色变化保留版本。active 成员可以查看其他有效成员,群主与管理员还可查看待处理邀请。群主可解散、调整管理员和移除成员。管理员可改名、邀请好友和移除普通成员。 -群组密文投递使用 `/groups/{id}/epochs` 和 `/groups/{id}/messages`。群主发布带 membershipVersion 的世代,选取每个有效成员的一台已登记 MLS 设备,提交其他设备的 Welcome。GET epochs 只返回当前设备被编入的世代及其 Welcome。POST messages 仅接受当前世代的 MLS PrivateMessage,GET messages 通过 after 游标返回当前设备有权读取的密文。 +群组密文投递使用 `/groups/{id}/epochs` 和 `/groups/{id}/messages`。群主发布带 membershipVersion 的世代,选取每个有效成员的一台已登记 MLS 设备,提交其他设备的 Welcome。GET epochs 返回当前有效世代的设备名单和本设备获准接收的 Welcome,旧世代仅向在本次成员资格期间加入过该世代的设备返回。POST messages 接受当前世代的 MLS PrivateMessage,GET messages 通过 after 游标返回本设备有权读取的密文。 + +有效成员可通过 `GET /groups/{id}/devices` 获取群内有效设备凭据。群主通过 `POST /groups/{id}/devices/{device}/claim` 一次性领取其他有效成员的设备密钥包。邀请待接受的账号、已离群的账号和撤销设备无法访问群设备目录。 成员变更后旧世代不能发消息。绑定设备被撤销后需以替代设备发布新世代。重新加入的成员只能补拉本次加入以来的世代。服务端校验外层格式和投递授权,MLS 内容验证由客户端执行。 diff --git a/docs/encryption.md b/docs/encryption.md index 837dda4..3f9900d 100644 --- a/docs/encryption.md +++ b/docs/encryption.md @@ -11,3 +11,5 @@ OpenMLS 0.9.2 兼容性用例已在 Linux 原生和 Windows Chrome WebAssembly 附件采用公开的分块认证加密格式,评估带明确结束认证与大文件恢复语义的实现。每份附件生成独立随机密钥,密文通过对象存储分发,文件密钥及完整性元数据放在 E2EE 消息中。备份使用独立随机恢复秘密,显式确认恢复权限和完整性,服务端只存密文及版本。私人动态按受众分发密钥。Web 应用以同源、受控发布和严格 CSP 管理脚本信任,当前页面的恶意同源脚本属于独立威胁。 预览版附件使用 Web Crypto 的整文件 AES-256-GCM,限制 8 MiB。每份文件独立随机密钥和 96 位 IV,附件 ID、文件名和字节数纳入认证数据。下载在完整验证后才生成本地文件,服务端只持有密文及投递元数据。生产版仍需分块认证、断点续传和对象存储。 + +预览版群聊的每个投递世代使用独立的 OpenMLS 会话,最多 32 个账号,每个账号选一台设备。参与设备各自在可信渠道核验其他设备安全码,并核对 Welcome 的签名创建者、完整 MLS 叶节点名单和群标识。加密消息绑定群、世代、消息 ID 和发送设备。成员加入、离开或绑定设备撤销后,群主为有效设备重新建立会话。服务端拒绝旧世代新消息,已离开的设备拿不到新会话的 Welcome。旧会话的已解密消息保存在本机。正式版仍需同一 MLS 群中的密钥更新、入侵后恢复、多设备授权和群历史同步。 diff --git a/docs/progress.md b/docs/progress.md index b748887..f97c0a6 100644 --- a/docs/progress.md +++ b/docs/progress.md @@ -19,7 +19,7 @@ Web 和 Electron 共用 Vue 客户端,独立接入同一 Go API。真实 Postg ## 尚待实现 - 阶段一还需邮箱和手机号注册、验证码服务、找回密码和双重验证。真实联调需要 SMTP 与短信供应商配置。 -- 阶段二与三还需分片附件、消息操作、群聊、多设备可信授权、加密备份与跨设备历史同步。两设备文字和小附件私聊已进入开发预览。 +- 阶段二与三还需分片附件、群聊附件与消息操作、多设备可信授权、加密备份与跨设备历史同步。文字群聊及两设备文字和小附件私聊已进入开发预览。 - 阶段四还需 WebRTC 音视频、TURN、SFU、屏幕共享及媒体 E2EE。 - 阶段五还需反钓鱼及聊天联动。 - 阶段六到八还需社交、扩展生态、独立管理后台、推送、生产部署与备份演练、压力测试、安全评估、签名安装包和发布流程。 @@ -95,12 +95,18 @@ Windows 和 Web 使用 MediaRecorder 录制 Opus,支持取消、计时和最 ## 群组成员管理 -Web 和 Windows 可创建群组、邀请已接受的联系人、接受或拒绝邀请、管理群名称及管理员、移除成员、退出与解散。未接受邀请的账号无法查看成员名单。成员加入和离开在事务内递增成员版本,后续 MLS 投递将以此拒绝过期名单。群组消息仍待接入。 +Web 和 Windows 可创建群组、邀请已接受的联系人、接受或拒绝邀请、管理群名称及管理员、移除成员、退出与解散。未接受邀请的账号无法查看成员名单。成员加入和离开在事务内递增成员版本,MLS 投递以此拒绝过期名单。 ## 群组密文投递 -服务端已接入群世代登记、设备定向 Welcome、群密文写入、游标补拉与保留期。集成测试覆盖名单外设备拒绝、成员移除后拒绝旧世代、重新加入后的历史隔离和绑定设备撤销。当前群世代限每账户一台设备,客户端 MLS 群会话仍待接入。 +服务端已接入群世代登记、设备定向 Welcome、群密文写入、游标补拉与保留期。集成测试覆盖名单外设备拒绝、成员移除后拒绝旧世代、重新加入后的历史隔离和绑定设备撤销。 ## MLS 群会话引擎 -OpenMLS WASM 新增批量设备入组。创建端校验每个 KeyPackage 和预期设备签名公钥,接收端校验 Welcome 发送者、MLS 群标识与完整设备名单。三设备测试验证替换名单公钥会被拒绝,创建排除已移除设备的新会话后,该设备无法解密新密文。设备信任界面和群消息界面仍待接入。 +OpenMLS WASM 新增批量设备入组。创建端校验每个 KeyPackage 和预期设备签名公钥,接收端校验 Welcome 发送者、MLS 群标识与完整设备名单。三设备测试验证替换名单公钥会被拒绝,创建排除已移除设备的新会话后,该设备无法解密新密文。 + +## 双端加密群聊预览 + +Windows 和 Web 已接入群设备核验、MLS Welcome 校验、文字加解密和本机历史。群主为每名有效成员选定一台已核验设备,成员加入或离开后由群主重建加密会话。预览可补拉本机已加入会话的消息。跨世代补拉尚未在本机加入的旧会话、群附件、群成员多设备和自动世代更新待实现。 + +验收使用 Windows Electron 和两个独立 Edge 会话,覆盖安全码校验、Windows 发消息给 Web、Web 离开群页面后补收消息、移除成员、新世代 Windows 接收和移除成员无法继续访问。服务端集成测试验证群设备目录授权和密钥包只能领取一次,Rust 验证错误的 MLS 群标识与移除设备不能解密。 diff --git a/server/internal/delivery/directory.go b/server/internal/delivery/directory.go index 924a66d..151d344 100644 --- a/server/internal/delivery/directory.go +++ b/server/internal/delivery/directory.go @@ -184,7 +184,17 @@ func (s *Store) ClaimPackage(ctx context.Context, owner, requester, contact, dev if active != 2 { return item, ErrUnavailable } - err = tx.QueryRow(ctx, ` + item, err = TakePackage(ctx, tx, device) + if err != nil { + return item, err + } + return item, tx.Commit(ctx) +} + +// TakePackage consumes a key package while the caller holds the device row lock. +func TakePackage(ctx context.Context, tx pgx.Tx, device string) (KeyPackage, error) { + var item KeyPackage + err := tx.QueryRow(ctx, ` UPDATE device_key_packages SET claimed_at=now() WHERE (device_id, package_hash)=( SELECT device_id, package_hash FROM device_key_packages @@ -196,8 +206,5 @@ func (s *Store) ClaimPackage(ctx context.Context, owner, requester, contact, dev if errors.Is(err, pgx.ErrNoRows) { return item, ErrUnavailable } - if err != nil { - return item, err - } - return item, tx.Commit(ctx) + return item, err } diff --git a/server/internal/groups/devices.go b/server/internal/groups/devices.go new file mode 100644 index 0000000..ae542ba --- /dev/null +++ b/server/internal/groups/devices.go @@ -0,0 +1,84 @@ +package groups + +import ( + "context" + + "xhchat/server/internal/delivery" + + "github.com/jackc/pgx/v5" +) + +type GroupDevice struct { + delivery.DirectoryDevice + User string `json:"user"` +} + +func (s *Store) Devices(ctx context.Context, group, user, device string) ([]GroupDevice, error) { + tx, err := s.db.BeginTx(ctx, pgx.TxOptions{IsoLevel: pgx.RepeatableRead, AccessMode: pgx.ReadOnly}) + if err != nil { + return nil, err + } + defer tx.Rollback(ctx) + if err = readAccess(ctx, tx, group, user, device); err != nil { + return nil, err + } + rows, err := tx.Query(ctx, ` + SELECT d.id,d.name,d.public_key,m.user_id,c.public_key,c.signature + FROM group_members m JOIN devices d ON d.user_id=m.user_id + JOIN device_mls_credentials c ON c.device_id=d.id + WHERE m.group_id=$1 AND m.state='active' AND d.revoked_at IS NULL ORDER BY d.id + `, group) + if err != nil { + return nil, err + } + defer rows.Close() + result := make([]GroupDevice, 0) + for rows.Next() { + var entry GroupDevice + entry.MLS = &delivery.Credential{} + if err = rows.Scan(&entry.ID, &entry.Name, &entry.PublicKey, &entry.User, &entry.MLS.PublicKey, &entry.MLS.Signature); err != nil { + return nil, err + } + result = append(result, entry) + } + if err = rows.Err(); err != nil { + return nil, err + } + return result, tx.Commit(ctx) +} + +func (s *Store) Claim(ctx context.Context, group, user, sender, target string) (delivery.KeyPackage, error) { + tx, err := s.db.Begin(ctx) + if err != nil { + return delivery.KeyPackage{}, err + } + defer tx.Rollback(ctx) + _, owner, err := lockTransport(ctx, tx, group, user, sender) + if err != nil { + return delivery.KeyPackage{}, err + } + if !owner || sender == target { + return delivery.KeyPackage{}, ErrAction + } + var device string + err = tx.QueryRow(ctx, ` + SELECT d.id FROM devices d JOIN group_members m ON m.user_id=d.user_id + JOIN device_mls_credentials c ON c.device_id=d.id + WHERE m.group_id=$1 AND m.state='active' AND d.id=$2 AND d.revoked_at IS NULL AND d.user_id<>$3 + FOR UPDATE OF d + `, group, target, user).Scan(&device) + if err == pgx.ErrNoRows { + return delivery.KeyPackage{}, ErrUnavailable + } + if err != nil { + return delivery.KeyPackage{}, err + } + pack, err := delivery.TakePackage(ctx, tx, device) + if err == delivery.ErrUnavailable { + return pack, ErrUnavailable + } + if err != nil { + return pack, err + } + return pack, tx.Commit(ctx) +} diff --git a/server/internal/groups/transport.go b/server/internal/groups/transport.go index f3719cb..8a29825 100644 --- a/server/internal/groups/transport.go +++ b/server/internal/groups/transport.go @@ -23,11 +23,12 @@ type Epoch struct { } type AvailableEpoch struct { - ID string `json:"id"` - Version string `json:"membershipVersion"` - Creator string `json:"creatorDevice"` - Welcome []byte `json:"welcome,omitempty"` - Current bool `json:"current"` + ID string `json:"id"` + Version string `json:"membershipVersion"` + Creator string `json:"creatorDevice"` + Welcome []byte `json:"welcome,omitempty"` + Current bool `json:"current"` + Roster []string `json:"roster"` } type Message struct { @@ -274,14 +275,18 @@ func (s *Store) Epochs(ctx context.Context, group, user, device string) ([]Avail } rows, err := tx.Query(ctx, ` SELECT e.id,e.membership_version::text,e.creator_device,d.welcome, - e.membership_version=g.membership_version AND e.retired_at IS NULL AND NOT EXISTS ( - SELECT 1 FROM group_epoch_devices x JOIN devices bound ON bound.id=x.device_id - WHERE x.group_id=e.group_id AND x.epoch_id=e.id AND bound.revoked_at IS NOT NULL - ) + phase.current, ARRAY(SELECT x.device_id::text FROM group_epoch_devices x + WHERE x.group_id=e.group_id AND x.epoch_id=e.id ORDER BY x.device_id) FROM group_epochs e JOIN chat_groups g ON g.id=e.group_id - JOIN group_epoch_devices d ON d.group_id=e.group_id AND d.epoch_id=e.id AND d.device_id=$3 + LEFT JOIN group_epoch_devices d ON d.group_id=e.group_id AND d.epoch_id=e.id AND d.device_id=$3 JOIN group_members m ON m.group_id=e.group_id AND m.user_id=$2 - WHERE e.group_id=$1 AND e.membership_version>=m.joined_version + CROSS JOIN LATERAL ( + SELECT e.membership_version=g.membership_version AND e.retired_at IS NULL AND NOT EXISTS ( + SELECT 1 FROM group_epoch_devices x JOIN devices bound ON bound.id=x.device_id + WHERE x.group_id=e.group_id AND x.epoch_id=e.id AND bound.revoked_at IS NOT NULL + ) AS current + ) phase + WHERE e.group_id=$1 AND e.membership_version>=m.joined_version AND (d.device_id IS NOT NULL OR phase.current) ORDER BY e.created_at DESC,e.id LIMIT 200 `, group, user, device) if err != nil { @@ -291,7 +296,7 @@ func (s *Store) Epochs(ctx context.Context, group, user, device string) ([]Avail result := make([]AvailableEpoch, 0) for rows.Next() { var e AvailableEpoch - if err = rows.Scan(&e.ID, &e.Version, &e.Creator, &e.Welcome, &e.Current); err != nil { + if err = rows.Scan(&e.ID, &e.Version, &e.Creator, &e.Welcome, &e.Current, &e.Roster); err != nil { return nil, err } result = append(result, e) diff --git a/server/internal/httpapi/api.go b/server/internal/httpapi/api.go index 85a2613..9cfa474 100644 --- a/server/internal/httpapi/api.go +++ b/server/internal/httpapi/api.go @@ -68,6 +68,8 @@ func New(accounts *account.Store, contactStore *contacts.Store, envelopeStore *d mux.HandleFunc("POST /api/v1/groups/{id}/epochs", a.authorized(a.publishGroupEpoch)) mux.HandleFunc("GET /api/v1/groups/{id}/messages", a.authorized(a.groupInbox)) mux.HandleFunc("POST /api/v1/groups/{id}/messages", a.authorized(a.sendGroupMessage)) + mux.HandleFunc("GET /api/v1/groups/{id}/devices", a.authorized(a.groupDevices)) + mux.HandleFunc("POST /api/v1/groups/{id}/devices/{device}/claim", a.authorized(a.claimGroupPackage)) return a.boundary(mux) } diff --git a/server/internal/httpapi/group_transport.go b/server/internal/httpapi/group_transport.go index ec9dbaf..cdc8034 100644 --- a/server/internal/httpapi/group_transport.go +++ b/server/internal/httpapi/group_transport.go @@ -10,6 +10,37 @@ import ( "xhchat/server/internal/groups" ) +func (a *API) groupDevices(w http.ResponseWriter, r *http.Request, _ string, actor account.Identity) { + id := r.PathValue("id") + if !uuidPattern.MatchString(id) { + groupError(w, groups.ErrUnavailable) + return + } + result, err := a.groups.Devices(r.Context(), id, actor.User.ID, actor.Device.ID) + if err != nil { + groupError(w, err) + return + } + respond(w, 200, result) +} + +func (a *API) claimGroupPackage(w http.ResponseWriter, r *http.Request, _ string, actor account.Identity) { + id, target := r.PathValue("id"), strings.ToLower(r.PathValue("device")) + if !uuidPattern.MatchString(id) || !uuidPattern.MatchString(target) { + groupError(w, groups.ErrUnavailable) + return + } + if !a.limit(w, r, "group-claim:"+actor.Device.ID, 64) { + return + } + pack, err := a.groups.Claim(r.Context(), id, actor.User.ID, actor.Device.ID, target) + if err != nil { + groupError(w, err) + return + } + respond(w, 200, pack) +} + func (a *API) groupEpochs(w http.ResponseWriter, r *http.Request, _ string, actor account.Identity) { id := r.PathValue("id") if !uuidPattern.MatchString(id) { diff --git a/tests/delivery.test.mjs b/tests/delivery.test.mjs index 36a330e..ad868b8 100644 --- a/tests/delivery.test.mjs +++ b/tests/delivery.test.mjs @@ -99,6 +99,10 @@ test('群密文只投递到当前名单中的设备,离开或撤销后阻断 publicKey: publicKey.toString('base64'), signature: sign(null, bytes, keys.privateKey).toString('base64'), }) assert.equal(response.status, 204) + const rawPackage = Buffer.concat([Buffer.from([0, 1, 0, 5]), randomBytes(96)]) + const binding = Buffer.concat([Buffer.from('XHChat MLS KeyPackage v1\n' + actor.user.id + '\n' + actor.device.id + '\n'), rawPackage]) + actor.keyPackage = { package: rawPackage.toString('base64'), signature: sign(null, binding, keys.privateKey).toString('base64') } + assert.equal((await call('/key-packages', 'POST', actor.token, actor.keyPackage)).status, 204) return actor } const owner = await enroll() @@ -124,7 +128,16 @@ test('群密文只投递到当前名单中的设备,离开或撤销后阻断 await contact(member, owner, 'accept') await change(owner, 'invite', member.user.id) await json(path + '/epochs', 'GET', member.token, undefined, 404) + await json(path + '/devices', 'GET', member.token, undefined, 404) + await json(path + '/devices/' + member.device.id + '/claim', 'POST', owner.token, undefined, 404) await change(member, 'accept') + await json(path + '/devices', 'GET', outsider.token, undefined, 404) + const directory = await json(path + '/devices', 'GET', member.token) + assert.deepEqual(directory.map((device) => device.id), [owner.device.id, member.device.id].sort()) + assert.equal(directory.find((device) => device.id === owner.device.id).user, owner.user.id) + await json(path + '/devices/' + owner.device.id + '/claim', 'POST', member.token, undefined, 409) + assert.deepEqual(await json(path + '/devices/' + member.device.id + '/claim', 'POST', owner.token), member.keyPackage) + await json(path + '/devices/' + member.device.id + '/claim', 'POST', owner.token, undefined, 404) await json(path + '/messages', 'POST', owner.token, { ...firstMessage, id: randomUUID() }, 409) assert.deepEqual(await json(path + '/messages', 'GET', member.token), []) const second = { id: randomUUID(), membershipVersion: '2', devices: [ @@ -136,7 +149,8 @@ test('群密文只投递到当前名单中的设备,离开或撤销后阻断 await publish(owner, second) await publish(owner, { ...second, id: randomUUID() }, 409) const epochs = await json(path + '/epochs', 'GET', member.token) - assert.deepEqual(epochs, [{ id: second.id, membershipVersion: '2', creatorDevice: owner.device.id, welcome, current: true }]) + assert.deepEqual(epochs, [{ id: second.id, membershipVersion: '2', creatorDevice: owner.device.id, welcome, current: true, + roster: [owner.device.id, member.device.id].sort() }]) await json(path + '/messages', 'GET', outsider.token, undefined, 404) const message = { id: randomUUID(), epoch: second.id, wire: frame() } const sequence = await json(path + '/messages', 'POST', member.token, message) diff --git a/tests/group-chat.test.mjs b/tests/group-chat.test.mjs new file mode 100644 index 0000000..ccaf430 --- /dev/null +++ b/tests/group-chat.test.mjs @@ -0,0 +1,141 @@ +import assert from 'node:assert/strict' +import { randomBytes } from 'node:crypto' +import { mkdtemp, rm } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import test from 'node:test' +import electron from 'electron' +import { _electron, chromium } from 'playwright' + +const base = process.env.XHCHAT_TEST_URL ?? 'http://127.0.0.1:8080' +const work = (page) => page.getByRole('navigation', { name: '工作区' }) +const chat = (page) => page.getByRole('region', { name: '群消息' }) +const id = () => randomBytes(6).toString('hex') + +async function register(page, username, password) { + await page.getByRole('button', { name: '注册', exact: true }).click() + await page.getByLabel('用户名').fill(username) + await page.getByLabel('密码', { exact: true }).fill(password) + await page.locator('button.primary').click() + await page.getByText('实时连接已建立').waitFor() +} + +async function connect(owner, member, ownerName, memberName) { + await work(owner).getByRole('link', { name: '联系人' }).click() + await work(member).getByRole('link', { name: '联系人' }).click() + await owner.getByLabel('按用户名查找').fill(memberName) + await owner.getByRole('button', { name: '查找' }).click() + await owner.getByRole('button', { name: '添加好友' }).click() + await member.getByRole('button', { name: new RegExp(ownerName) }).click() + await member.getByRole('button', { name: '接受申请' }).click() + await owner.getByRole('link', { name: '打开加密聊天' }).waitFor() +} + +async function invite(owner, member, memberName, group) { + await owner.getByLabel('邀请联系人').selectOption({ label: memberName }) + await owner.getByRole('button', { name: '发送邀请' }).click() + await work(member).getByRole('link', { name: '群组' }).click() + await member.getByRole('link', { name: new RegExp(group) }).click() + await member.getByRole('button', { name: '接受邀请' }).click() + await chat(member).getByRole('button', { name: '启用本机群聊' }).waitFor() +} + +async function verify(page, name, code) { + const section = chat(page).locator('.group-device-member').filter({ hasText: name }) + const securityCode = section.getByLabel(new RegExp(name + '.*安全码')) + await securityCode.fill(code) + await section.getByRole('button', { name: '核验设备' }).click() + await securityCode.waitFor({ state: 'detached' }) +} + +async function publish(owner, pages) { + await chat(owner).getByRole('button', { name: '建立群加密会话' }).click() + await Promise.all(pages.map((page) => chat(page).getByText('群加密已建立', { exact: true }).waitFor())) +} + +async function send(sender, text) { + await chat(sender).getByRole('textbox', { name: '群消息' }).fill(text) + const response = sender.waitForResponse((item) => /\/groups\/[^/]+\/messages$/.test(item.url()) && item.request().method() === 'POST') + await chat(sender).getByRole('button', { name: '发送群消息' }).click() + const sent = await response + assert.equal(sent.status(), 200, await sent.text()) + const packet = sent.request().postDataJSON() + assert.deepEqual(Object.keys(packet).sort(), ['epoch', 'id', 'wire']) + const wire = Buffer.from(packet.wire, 'base64') + assert.equal(wire[3], 2) + assert.ok(!wire.includes(Buffer.from(text))) + return packet.epoch +} + +test('群聊跨 Windows 与 Web 加密投递,移除成员后切换新会话', { timeout: 120_000 }, async () => { + const browser = await chromium.launch({ channel: process.env.XHCHAT_TEST_BROWSER ?? 'msedge' }) + const profile = await mkdtemp(join(tmpdir(), 'xhchat-group-test-')) + let desktop + const pages = [] + try { + const [owner, removed] = await Promise.all([browser.newPage(), browser.newPage()]) + await Promise.all([owner.goto(base), removed.goto(base)]) + desktop = await _electron.launch({ + executablePath: electron, + args: [join(import.meta.dirname, '..', 'Desktop'), '--user-data-dir=' + profile], + env: { ...process.env, XHCHAT_SERVER_URL: base }, + }) + const windows = await desktop.firstWindow() + pages.push(owner, windows, removed) + const names = pages.map(() => 'groupqa_' + id()) + const password = randomBytes(24).toString('hex') + await Promise.all(pages.map((page, index) => register(page, names[index], password))) + await connect(owner, windows, names[0], names[1]) + await connect(owner, removed, names[0], names[2]) + await work(owner).getByRole('link', { name: '群组' }).click() + const group = '加密测试 ' + id() + await owner.getByLabel('群名称', { exact: true }).fill(group) + await owner.getByRole('button', { name: '创建群组' }).click() + await owner.getByRole('heading', { name: group }).waitFor() + await invite(owner, windows, names[1], group) + await invite(owner, removed, names[2], group) + const codes = await Promise.all(pages.map(async (page) => { + await chat(page).getByRole('button', { name: '启用本机群聊' }).click() + const code = page.locator('.group-security-code') + await code.waitFor() + return code.textContent() + })) + assert.ok(codes.every((code) => /^[0-9a-f]{64}$/.test(code))) + assert.equal(await chat(owner).getByRole('button', { name: '建立群加密会话' }).isEnabled(), false) + await verify(owner, names[1], codes[1]) + await verify(owner, names[2], codes[2]) + await publish(owner, [owner]) + await chat(windows).getByText('请先核验名单内每台设备的安全码').waitFor() + assert.equal(await chat(windows).getByRole('button', { name: '发送群消息' }).count(), 0) + await Promise.all([verify(windows, names[0], codes[0]), verify(removed, names[0], codes[0])]) + await Promise.all([verify(windows, names[2], codes[2]), verify(removed, names[1], codes[1])]) + await Promise.all(pages.map((page) => chat(page).getByText('群加密已建立', { exact: true }).waitFor())) + const first = 'Windows 群消息 ' + id() + await work(removed).getByRole('link', { name: '联系人' }).click() + const epoch = await send(windows, first) + await Promise.all([owner, windows].map((page) => chat(page).getByText(first, { exact: true }).waitFor())) + await work(removed).getByRole('link', { name: '群组' }).click() + await removed.getByRole('link', { name: new RegExp(group) }).click() + await chat(removed).getByRole('button', { name: '启用本机群聊' }).click() + await chat(removed).getByText(first, { exact: true }).waitFor() + + const member = owner.getByRole('list', { name: '群成员' }).getByRole('listitem').filter({ hasText: names[2] }) + await member.getByRole('button', { name: '移除成员' }).click() + await owner.getByRole('button', { name: '确认操作' }).click() + await removed.getByRole('heading', { name: group }).waitFor({ state: 'hidden' }) + await chat(windows).getByText('等待群主建立群加密会话。').waitFor() + await publish(owner, [owner, windows]) + const second = '新世代 Web 群消息 ' + id() + assert.notEqual(await send(owner, second), epoch) + await chat(windows).getByText(second, { exact: true }).waitFor() + assert.equal(await removed.getByText(second, { exact: true }).count(), 0) + assert.equal(await chat(windows).getByText(first, { exact: true }).count(), 1) + } catch (error) { + const status = await Promise.all(pages.map((page) => page.locator('[role=alert], .group-chat [role=status]').allTextContents())) + throw new Error(JSON.stringify(status), { cause: error }) + } finally { + await desktop?.close() + await browser.close() + await rm(profile, { recursive: true, force: true }) + } +}) diff --git a/web/src/chat/GroupChat.vue b/web/src/chat/GroupChat.vue new file mode 100644 index 0000000..9d3f75f --- /dev/null +++ b/web/src/chat/GroupChat.vue @@ -0,0 +1,163 @@ + + +