From 47b76080c6665132a3b21fb1a4c89f1f25ff9995 Mon Sep 17 00:00:00 2001 From: xhgit Date: Sun, 15 Nov 2026 17:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E5=AF=86=E7=BE=A4?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=92=8C=E7=BE=A4=E4=B8=BB=E8=BD=AC=E8=AE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- docs/api.md | 4 +- docs/progress.md | 6 +++ server/internal/groups/store.go | 18 +++++++++ server/internal/httpapi/groups.go | 2 +- tests/delivery.test.mjs | 14 ++++++- tests/group-chat.test.mjs | 34 ++++++++++++++++ web/src/chat/GroupChat.vue | 34 ++++++++++++++++ web/src/chat/group-chat.ts | 66 +++++++++++++++++++++++-------- web/src/views/GroupView.vue | 3 ++ 10 files changed, 163 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index cd6af3e..156887d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | 账号与设备 | Windows 和 Web 共用账号,支持用户名注册、登录、查看设备和远程撤销。 | | 联系人 | 按用户名查找、处理好友申请、管理备注与分组,以及拉黑。变更可在双端实时同步。 | | 加密文字聊天 | 在两个已核验设备之间发送 MLS 加密消息,支持离线接收。 | -| 加密群聊 | 创建群组、邀请联系人和管理成员。群列表显示本机未读,并按账号同步置顶和免打扰。每个账号选一台已核验设备参与 MLS 加密文字聊天。 | +| 加密群聊 | 创建群组、邀请联系人、管理成员和转让群主。群主可发布加密公告。群列表显示本机未读,并按账号同步置顶和免打扰。 | | 加密附件 | 两端可在私聊和群聊发送、下载最多 8 MiB 的文件,并在本机预览图片和视频。群聊提供文件、图片和视频的分类视图。 | | 加密语音 | 两端可在私聊和群聊录制、取消或发送最长 60 秒的语音消息,接收方在本机解密播放。 | | 消息管理 | 私聊和群聊支持引用回复、编辑文字、撤回、本机搜索和收藏。消息可转发到已建立加密会话的群或已核验的联系人设备。私聊支持可选加密已读回执。 | @@ -55,7 +55,7 @@ npm.cmd run desktop 体验加密文字聊天时,注册两个账号并互加好友。在双方的联系人详情中打开「加密聊天」,启用本机加密,通过另一可信渠道交换安全码,分别核验对方设备后即可互发消息。 -体验群聊时,在「群组」中邀请联系人。成员接受邀请后启用本机群聊,通过可信渠道核验群内设备。群主选好设备后点击「建立群加密会话」。成员加入、离开或已选设备被撤销时,群主需要重新建立加密会话。 +体验群聊时,在「群组」中邀请联系人。成员接受邀请后启用本机群聊,通过可信渠道为每个账号核验一台参与设备。群主选好设备后点击「建立群加密会话」。成员加入、离开、群主转让或已选设备被撤销时,由当时的群主重新建立加密会话。 ## 开发文档 diff --git a/docs/api.md b/docs/api.md index 5243d4e..98b527c 100644 --- a/docs/api.md +++ b/docs/api.md @@ -27,7 +27,7 @@ | POST | /api/v1/attachments/{id}?recipient= | 已接受好友设备上传附件密文,使用 application/octet-stream,成功返回 204 | | GET | /api/v1/attachments/{id} | 原发送或接收设备获取附件密文 | | GET / POST | /api/v1/groups | 列出当前账号所属群组与邀请,或创建群组 | -| GET / POST | /api/v1/groups/{id} | 查看群组详情或执行邀请、接受、拒绝、改名、升降管理员、移除、退出或解散 | +| GET / POST | /api/v1/groups/{id} | 查看群组详情或执行邀请、接受、拒绝、改名、升降管理员、转让群主、移除、退出或解散 | | POST | /api/v1/groups/{id}/preferences | 更新当前账号的 `pinned` 和 `muted`,可只传其中一项 | | POST | /api/v1/groups/{id}/seen | 提交当前设备已同步的消息游标 `sequence`,成功返回 204 | | GET | /api/v1/groups/{id}/devices | 获取群成员的有效设备与 MLS 公钥 | @@ -52,6 +52,8 @@ MLS 凭据由标准 Base64 的 publicKey 和 signature 组成,使用 UTF-8 前 群组详情包含十进制字符串 membershipVersion。已接受成员变化会递增版本,待处理邀请和角色变化保留版本。active 成员可以查看其他有效成员,群主与管理员还可查看待处理邀请。群主可解散、调整管理员和移除成员。管理员可改名、邀请好友和移除普通成员。 +群主可使用 `transfer` 和有效成员的 `target` 转让群主。转让会将原群主设为普通成员,更新群版本,由新群主创建后续 MLS 会话。公告使用现有 MLS 密文投递接口,客户端验证公告来自该会话经核验的群主设备。 + 创建或更新群资料和成员后,受影响账号的在线客户端收到 `{"type":"group_list_changed"}`,再用授权 API 刷新。邀请相关提示发送给管理者和被邀请人。提示只包含类型字段,不传群号、群名或成员资料。 群组密文投递使用 `/groups/{id}/epochs` 和 `/groups/{id}/messages`。群主发布带 membershipVersion 的世代,选取每个有效成员的一台已登记 MLS 设备,提交其他设备的 Welcome。GET epochs 返回当前有效世代的设备名单和本设备获准接收的 Welcome,旧世代仅向在本次成员资格期间加入过该世代的设备返回。POST messages 接受当前世代的 MLS PrivateMessage,GET messages 通过 after 游标返回本设备有权读取的密文。 diff --git a/docs/progress.md b/docs/progress.md index 10c6f30..290a585 100644 --- a/docs/progress.md +++ b/docs/progress.md @@ -174,3 +174,9 @@ Windows Electron 和 Edge 验证了群组页在兜底轮询前显示邀请、成 Windows 和 Web 的群列表按当前设备显示未读投递数量,免打扰群使用低强调角标。打开可见的群聊并同步后,客户端提交本机游标。统计排除本机发送的消息,页面后台时保留角标。游标由服务端按设备保存,其他成员看不到逐条已读状态。编辑和撤回也是群密文投递,会计入尚未同步的数量。 接口测试覆盖发送设备排除、游标单调递增、越权及重新入群隔离。Windows Electron 与 Edge 验证免打扰时显示未读、启用群安全会话后同步并清除角标,以及群消息和私聊附件回归。私聊文件选择在同步繁忙时也会排队提交。 + +## 群公告和群主转让 + +群主可用当前群会话设备发布、编辑和清除公告,公告正文通过 MLS 群密文传递。已经同步的公告保存在本机,新加入的设备从其加入后的会话获取公告,群主可以重新发布。群主可以把管理权转让给已接受邀请的成员,原群主成为普通成员,可以主动退出。转让更新群版本,新群主建立新会话前旧会话停止发送。 + +Windows 和 Edge 验证加密发布与清除公告、群主转让、原群主退出和新群主建立会话。服务端测试覆盖普通成员、管理员、外部账号、受邀未入群成员及向自己转让的拒绝路径。 diff --git a/server/internal/groups/store.go b/server/internal/groups/store.go index bdd38b0..ff048ee 100644 --- a/server/internal/groups/store.go +++ b/server/internal/groups/store.go @@ -273,6 +273,24 @@ func changeActive(ctx context.Context, tx pgx.Tx, user, id, owner, role string, return false, ErrAction } return false, invite(ctx, tx, user, id, change.Target) + case "transfer": + if role != "owner" || change.Target == owner { + return false, ErrAction + } + tag, err := tx.Exec(ctx, ` + UPDATE chat_groups SET owner_id=$2 WHERE id=$1 AND EXISTS ( + SELECT 1 FROM group_members WHERE group_id=$1 AND user_id=$2 AND state='active' + ) + `, id, change.Target) + if err != nil { + return false, err + } + if tag.RowsAffected() == 0 { + return false, ErrAction + } + _, err = tx.Exec(ctx, "UPDATE group_members SET role='member' WHERE group_id=$1 AND user_id IN ($2,$3)", id, owner, change.Target) + // The new owner establishes a new authenticated MLS session for the same roster. + return true, err case "remove", "promote", "demote": if !manage || change.Target == owner || change.Target == user { return false, ErrAction diff --git a/server/internal/httpapi/groups.go b/server/internal/httpapi/groups.go index 9ea1b3e..9f84d19 100644 --- a/server/internal/httpapi/groups.go +++ b/server/internal/httpapi/groups.go @@ -92,7 +92,7 @@ func (a *API) changeGroup(w http.ResponseWriter, r *http.Request, _ string, id a return } switch change.Action { - case "invite", "remove", "promote", "demote": + case "invite", "remove", "promote", "demote", "transfer": if !uuidPattern.MatchString(change.Target) { problem(w, 400, "invalid_member", "群成员 ID 无效") return diff --git a/tests/delivery.test.mjs b/tests/delivery.test.mjs index b8d81ab..222b521 100644 --- a/tests/delivery.test.mjs +++ b/tests/delivery.test.mjs @@ -108,6 +108,7 @@ test('群组邀请、授权、成员移除、版本变更与实时提示', { tim }) assert.equal(active.membershipVersion, '2') assert.deepEqual(active.members.map((item) => item.role).sort(), ['member', 'owner']) + await act(member, 'transfer', owner.user.id, 409) await act(member, 'remove', owner.user.id, 409) await act(member, 'rename', undefined, 409, '未授权名称') const candidate = await register() @@ -130,12 +131,23 @@ test('群组邀请、授权、成员移除、版本变更与实时提示', { tim const renamed = await json(path, 'GET', owner.token) assert.equal(renamed.name, '管理员改名') assert.equal(renamed.membershipVersion, '2') + await act(member, 'transfer', owner.user.id, 409) + await act(owner, 'transfer', other.user.id, 409) + await act(owner, 'transfer', owner.user.id, 409) + await expectHint([ownerSocket, memberSocket], () => act(owner, 'transfer', member.user.id)) + assert.equal((await json(path, 'GET', owner.token)).role, 'member') + const newOwner = await json(path, 'GET', member.token) + assert.equal(newOwner.role, 'owner') + assert.equal(newOwner.membershipVersion, '3') + await act(owner, 'disband', undefined, 409) + await expectHint([ownerSocket, memberSocket], () => act(member, 'transfer', owner.user.id)) await act(member, 'disband', undefined, 409) await expectHint([ownerSocket, memberSocket], () => act(owner, 'remove', member.user.id)) await json(path, 'GET', member.token, undefined, 404) assert.deepEqual(await json('/groups', 'GET', member.token), []) - assert.equal((await json(path, 'GET', owner.token)).membershipVersion, '3') + assert.equal((await json(path, 'GET', owner.token)).membershipVersion, '5') await expectHint([ownerSocket, memberSocket], () => act(owner, 'invite', member.user.id)) + await act(owner, 'transfer', member.user.id, 409) await expectHint([ownerSocket, memberSocket], () => act(owner, 'disband')) await json(path, 'GET', owner.token, undefined, 404) assert.deepEqual(await json('/groups', 'GET', member.token), []) diff --git a/tests/group-chat.test.mjs b/tests/group-chat.test.mjs index bc7786b..e37f378 100644 --- a/tests/group-chat.test.mjs +++ b/tests/group-chat.test.mjs @@ -210,6 +210,21 @@ test('Windows 与 Web 加密群聊支持消息操作、附件、语音和成员 await unreadGroup.waitFor({ state: 'detached', timeout: 4500 }) assert.equal(await windows.getByRole('link', { name: new RegExp(group + '.*未读') }).count(), 0) + const announcement = '群公告 ' + id() + const ownerAnnouncement = chat(owner).getByRole('region', { name: '群公告' }) + await ownerAnnouncement.getByRole('button', { name: '写群公告' }).click() + await ownerAnnouncement.getByLabel('公告内容').fill(announcement) + const announcementPost = owner.waitForRequest((request) => /\/groups\/[^/]+\/messages$/.test(request.url()) && request.method() === 'POST') + await ownerAnnouncement.getByRole('button', { name: '发布公告' }).click() + assert.ok(!Buffer.from((await announcementPost).postDataJSON().wire, 'base64').includes(Buffer.from(announcement))) + const windowsAnnouncement = chat(windows).getByRole('region', { name: '群公告' }) + await windowsAnnouncement.getByText(announcement, { exact: true }).waitFor() + assert.equal(await windowsAnnouncement.getByRole('button').count(), 0) + await ownerAnnouncement.getByRole('button', { name: '编辑群公告' }).click() + await ownerAnnouncement.getByLabel('公告内容').clear() + await ownerAnnouncement.getByRole('button', { name: '清除公告' }).click() + await windowsAnnouncement.waitFor({ state: 'detached' }) + const original = chat(owner).getByRole('listitem').filter({ hasText: first }) assert.equal(await original.getByRole('button', { name: '编辑', exact: true }).count(), 0) assert.equal(await original.getByRole('button', { name: '撤回', exact: true }).count(), 0) @@ -524,6 +539,25 @@ test('Windows 与 Web 加密群聊支持消息操作、附件、语音和成员 await chat(owner).getByRole('button', { name: '下载 ' + privateFile, exact: true }).click() assert.notDeepEqual(await (await groupFileResponse).body(), originalBytes) assert.deepEqual(await readFile(await (await groupDownload).path()), contents) + + await work(windows).getByRole('link', { name: '群组' }).click() + await windows.getByRole('link', { name: new RegExp(targetGroup) }).click() + const successor = owner.getByRole('list', { name: '群成员' }).getByRole('listitem').filter({ hasText: names[1] }) + await successor.getByRole('button', { name: '转让群主', exact: true }).click() + await owner.getByRole('button', { name: '确认操作', exact: true }).click() + await windows.getByRole('list', { name: '群成员' }).getByText(names[1] + ' · 群主', { exact: true }).waitFor() + await owner.getByRole('button', { name: '退出群组', exact: true }).waitFor() + await owner.getByRole('button', { name: '退出群组', exact: true }).click() + await owner.getByRole('button', { name: '确认操作', exact: true }).click() + await owner.getByRole('heading', { name: targetGroup }).waitFor({ state: 'detached' }) + await windows.getByRole('list', { name: '群成员' }).getByText(names[0] + ' · 成员', { exact: true }).waitFor({ state: 'detached' }) + await chat(windows).getByRole('button', { name: '启用本机群聊' }).click() + await publish(windows, [windows]) + const successorAnnouncement = chat(windows).getByRole('region', { name: '群公告' }) + await successorAnnouncement.getByRole('button', { name: '写群公告' }).click() + await successorAnnouncement.getByLabel('公告内容').fill('新群主公告') + await successorAnnouncement.getByRole('button', { name: '发布公告' }).click() + await successorAnnouncement.getByText('新群主公告', { exact: true }).waitFor() } 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 }) diff --git a/web/src/chat/GroupChat.vue b/web/src/chat/GroupChat.vue index 332a3bf..431be88 100644 --- a/web/src/chat/GroupChat.vue +++ b/web/src/chat/GroupChat.vue @@ -20,6 +20,7 @@ const code = ref('') const codes = ref>({}) const selected = ref>({}) const draft = ref('') +const announcementDraft = ref() const search = ref('') const favoritesOnly = ref(false) const historyViews = [ @@ -146,6 +147,17 @@ function establish() { }) } +function saveAnnouncement() { + const identity = session.identity + const announcement = announcementDraft.value + if (!identity || announcement === undefined) return + void run(async () => { + await sendGroupMessage(identity, props.group, { announcement }, session.authorized) + announcementDraft.value = undefined + await refresh() + }) +} + function send() { const identity = session.identity if (identity) void run(async () => { @@ -239,6 +251,7 @@ watch(() => session.groupChange, (event) => { if (event?.groupId === props.group watch(() => session.connection, (connection) => { if (connection === '实时连接已建立') queueRefresh() }) watch(currentEpoch, (epoch, previous) => { if (!previous || epoch === previous) return + announcementDraft.value = undefined if (editing.value || replying.value) draft.value = '' editing.value = undefined replying.value = undefined @@ -283,6 +296,24 @@ onBeforeUnmount(() => {

群加密已建立

当前设备未获分配群密钥。

等待群主建立群加密会话。

+
+

群公告

+

{{ view.announcement }}

+

暂无群公告。

+