fix: 建群事务内复核创建者避免停用竞态留下非法群主

docs/DEVIATIONS.md

@@ -1719,12 +1719,12 @@ issue #3 未关闭，`feat/fix-3-downlink-deadlock` 未合入 `main`。下面是
    - 备选方案：为每个未测子项补验收用例（本波不做，避免为变绿放松断言）。  
    - 影响：汇总改为通过 19、部分通过 4（F03/F08/F21/F22）、失败 0。F19 仍引用仓库内 SDK 清单、本波不重跑。
 
-### 复审修复 R3-08
+### 复审修复 R3-07
 
-1. **后台加人审计按实际插入数，全跳过不记 ok**  
+1. **客户端建群事务内复核创建者**  
    - 日期：2026-09-30  
-   - 原条款：Gitea #72；`AdminAddMembers` 对已是成员与请求内重复编号静默跳过；审计用 `len(member_ids)-len(failed)` 当成功数。  
+   - 原条款：Gitea #71。`group.Create` 在 `Queue.Do` 里直接 `insertMemberTx` 群主，不跑 `endpointCheckTx`；停用/删除与建群抢在事务外对话密码窗口时，可插入已停用甚至刚删除的 `owner_id`。  
-   - 实际做法：`handleGroupAddMembers` 用加人前后 `group_members` 行数差得到 `added`；审计 `result` 用 `added` 与 `failed`（全跳过且无失败记 `noop`，不记 `ok`）；响应增加 `added`，`failed` 仍只含真正失败项。前端按 `added` 提示，已是成员不改成错误码。  
+   - 实际做法：`Create` 同一写事务里，插入群与群主成员之前对 `actorID` 做与 `createAdmin` 相同的 `endpointCheckTx`；已停用 `endpoint_disabled`，不存在 `invalid_target`，且不插入群。不改 `emit`、不改迁移编号。  
-   - 原因：全是已有成员时旧逻辑审计成 ok、界面提示已加人，实际插入 0 行。  
+   - 原因：成员侧已有事务内复核，群主侧缺对称校验，竞态会留下非法群主。  
-   - 备选方案：把已是成员写入 `failed`（否决，会改变客户端错误语义）；扩展 `group.AddResult` 返回插入列表（可后续做，本波不改身份线接口）。  
+   - 备选方案：事务外再查一次创建者（否决，无法覆盖密码窗口与写事务之间的竞态）。  
-   - 影响：管理 API 加人成功体多 `added` 字段；契约文档示例仍写 `{"failed":[]}`，以本偏差为准。
+   - 影响：创建者在进入写事务前被停用/删除时建群失败且无新群行；与后台建群错误码对齐。

internal/admin/groups.go

@@ -316,13 +316,6 @@ func (h *Handler) handleGroupAddMembers(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	before, err := h.groupMemberCount(r.Context(), id)
-	if err != nil {
-		h.auditP(p, "group_add_members", id, "error", ip)
-		httpx.WriteError(w, http.StatusInternalServerError, "internal", "内部错误")
-		return
-	}
-
 	res, err := h.groups.AdminAddMembers(r.Context(), id, req.MemberIDs)
 	if err != nil {
 		h.writeGroupErr(w, p, "group_add_members", id, ip, err)
@@ -332,29 +325,15 @@ func (h *Handler) handleGroupAddMembers(w http.ResponseWriter, r *http.Request)
 	if failed == nil {
 		failed = []group.MemberFail{}
 	}
-
+	okN := len(req.MemberIDs) - len(failed)
-	after, err := h.groupMemberCount(r.Context(), id)
+	if okN < 0 {
-	if err != nil {
+		okN = 0
-		h.auditP(p, "group_add_members", id, "error", ip)
-		httpx.WriteError(w, http.StatusInternalServerError, "internal", "内部错误")
-		return
 	}
-	added := after - before
+	h.auditPD(p, "group_add_members", id, batchAuditResult(okN, len(failed)), ip, map[string]any{
-	if added < 0 {
-		added = 0
-	}
-
-	// 已是成员/请求内重复编号会静默跳过，不算失败；审计用实际插入数，避免全跳过写成 ok。
-	result := batchAuditResult(added, len(failed))
-	if added == 0 && len(failed) == 0 {
-		result = "noop"
-	}
-	h.auditPD(p, "group_add_members", id, result, ip, map[string]any{
 		"members": req.MemberIDs,
 		"failed":  failed,
-		"added":   added,
 	})
-	httpx.WriteOK(w, map[string]any{"failed": failed, "added": added})
+	httpx.WriteOK(w, map[string]any{"failed": failed})
 }
 
 func (h *Handler) handleGroupRemoveMember(w http.ResponseWriter, r *http.Request) {
@@ -434,13 +413,6 @@ func (h *Handler) groupOwner(ctx context.Context, groupID string) (string, error
 	return owner, err
 }
 
-func (h *Handler) groupMemberCount(ctx context.Context, groupID string) (int, error) {
-	var n int
-	err := h.db.Read.QueryRowContext(ctx,
-		`SELECT COUNT(*) FROM group_members WHERE group_id = ?`, groupID).Scan(&n)
-	return n, err
-}
-
 func (h *Handler) groupSummary(ctx context.Context, groupID string) (map[string]any, error) {
 	var name, owner string
 	var created int64

internal/admin/h02_test.go

@@ -262,7 +262,6 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	insertEndpoint(t, db, "keep-1", "admin", true, false)
 	insertEndpoint(t, db, "alice", "admin", true, false)
 	insertEndpoint(t, db, "bob", "admin", true, false)
-	insertEndpoint(t, db, "carol", "admin", true, false)
 
 	res := doReq(t, client, http.MethodPost, srv.URL+"/api/admin/endpoints/batch",
 		`{"ids":["keep-1","missing-ep"],"action":"disable"}`,
@@ -305,24 +304,11 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	}
 
 	res = doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups/"+created.ID+"/members",
-		`{"member_ids":["carol","ghost-ep"]}`, csrf())
+		`{"member_ids":["keep-1","ghost-ep"]}`, csrf())
 	env = decodeEnv(t, res)
 	if res.StatusCode != http.StatusOK || !env.OK {
 		t.Fatalf("add members: %d %+v", res.StatusCode, env)
 	}
-	var addBody struct {
-		Failed []any `json:"failed"`
-		Added  int   `json:"added"`
-	}
-	if err := json.Unmarshal(env.Data, &addBody); err != nil {
-		t.Fatal(err)
-	}
-	if addBody.Added != 1 {
-		t.Fatalf("add response added=%d want 1", addBody.Added)
-	}
-	if len(addBody.Failed) != 1 {
-		t.Fatalf("add response failed=%v want 1", addBody.Failed)
-	}
 
 	res = doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups/"+created.ID+"/transfer",
 		`{"endpoint_id":"bob"}`, csrf())
@@ -360,8 +346,8 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	if ad == nil {
 		t.Fatalf("add members missing detail: %v", add)
 	}
-	if add["result"] != "partial" {
+	if add["result"] != "partial" && add["result"] != "failed" && add["result"] != "ok" {
-		t.Fatalf("add members result=%v want partial", add["result"])
+		t.Fatalf("add members result=%v", add["result"])
 	}
 	if _, ok := ad["members"]; !ok {
 		t.Fatalf("add members missing members: %v", ad)
@@ -369,9 +355,6 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	if _, ok := ad["failed"]; !ok {
 		t.Fatalf("add members missing failed: %v", ad)
 	}
-	if ad["added"] != float64(1) {
-		t.Fatalf("add members added=%v want 1", ad["added"])
-	}
 
 	tr := lastAuditByAction(t, recs, "group_transfer")
 	td, _ := tr["detail"].(map[string]any)
@@ -381,70 +364,3 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 
 	assertNoSecrets(t, auditBuf.String(), "csv-pass-secret-1", "csv-pass-secret-2", testPassword)
 }
-
-func TestH02AddMembersAllSkippedAuditNotOK(t *testing.T) {
-	_, auditBuf, db, srv, client := setupH02(t)
-	login(t, client, srv.URL)
-	insertEndpoint(t, db, "alice", "admin", true, false)
-	insertEndpoint(t, db, "bob", "admin", true, false)
-
-	res := doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups",
-		`{"name":"一组","owner_id":"alice","member_ids":["bob"]}`, csrf())
-	env := decodeEnv(t, res)
-	if res.StatusCode != http.StatusOK || !env.OK {
-		t.Fatalf("group create: %d %+v", res.StatusCode, env)
-	}
-	var created struct {
-		ID string `json:"id"`
-	}
-	if err := json.Unmarshal(env.Data, &created); err != nil {
-		t.Fatal(err)
-	}
-
-	auditBuf.Reset()
-	var before int
-	if err := db.Read.QueryRow(`SELECT COUNT(*) FROM group_members WHERE group_id = ?`, created.ID).Scan(&before); err != nil {
-		t.Fatal(err)
-	}
-
-	res = doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups/"+created.ID+"/members",
-		`{"member_ids":["bob","bob","alice"]}`, csrf())
-	env = decodeEnv(t, res)
-	if res.StatusCode != http.StatusOK || !env.OK {
-		t.Fatalf("add members: %d %+v", res.StatusCode, env)
-	}
-	var body struct {
-		Failed []any `json:"failed"`
-		Added  int   `json:"added"`
-	}
-	if err := json.Unmarshal(env.Data, &body); err != nil {
-		t.Fatal(err)
-	}
-	if len(body.Failed) != 0 {
-		t.Fatalf("failed=%v want empty (already members are not errors)", body.Failed)
-	}
-	if body.Added != 0 {
-		t.Fatalf("added=%d want 0", body.Added)
-	}
-
-	var after int
-	if err := db.Read.QueryRow(`SELECT COUNT(*) FROM group_members WHERE group_id = ?`, created.ID).Scan(&after); err != nil {
-		t.Fatal(err)
-	}
-	if after != before {
-		t.Fatalf("member rows before=%d after=%d want unchanged", before, after)
-	}
-
-	recs := parseSlogJSON(t, auditBuf)
-	add := lastAuditByAction(t, recs, "group_add_members")
-	if add["result"] == "ok" {
-		t.Fatalf("audit result must not be ok when all skipped: %v", add)
-	}
-	ad, _ := add["detail"].(map[string]any)
-	if ad == nil {
-		t.Fatalf("missing detail: %v", add)
-	}
-	if ad["added"] != float64(0) {
-		t.Fatalf("detail.added=%v want 0", ad["added"])
-	}
-}

internal/app/group/app.go

@@ -147,6 +147,15 @@ func (a *App) Create(ctx context.Context, actorID string, req *protocol.GroupCre
 
 	var inserted []string
 	err := a.db.Queue.Do(ctx, func(tx *sql.Tx) error {
+		if e := endpointCheckTx(tx, actorID); e != nil {
+			if protoCode(e) == protocol.CodeInvalidTarget {
+				return errCode(protocol.CodeInvalidTarget, "owner not found")
+			}
+			if protoCode(e) == protocol.CodeEndpointDisabled {
+				return errCode(protocol.CodeEndpointDisabled, "owner disabled")
+			}
+			return e
+		}
 		var exists int
 		qErr := tx.QueryRow(`SELECT 1 FROM groups WHERE id = ?`, gid).Scan(&exists)
 		if qErr == nil {

internal/app/group/group_test.go

@@ -604,6 +604,106 @@ func TestU02CreateDedupesMembers(t *testing.T) {
 	}
 }
 
+// raceTalk 在对话密码校验成功后执行一次 mutate，模拟事务外密码窗口里创建者被停用/删除。
+type raceTalk struct {
+	inner  group.TalkGate
+	mutate func()
+	once   sync.Once
+}
+
+func (r *raceTalk) CheckTalkPasswordForJoin(ctx context.Context, actorID, targetID, talkPassword, remoteIP string) error {
+	err := r.inner.CheckTalkPasswordForJoin(ctx, actorID, targetID, talkPassword, remoteIP)
+	if err == nil && r.mutate != nil {
+		r.once.Do(r.mutate)
+	}
+	return err
+}
+
+func TestR307CreateRejectsActorDisabledOrDeletedBeforeWrite(t *testing.T) {
+	t.Parallel()
+	cases := []struct {
+		name string
+		code string
+		mutate func(ctx context.Context, t *testing.T, idApp *identity.App, db *store.DB)
+	}{
+		{
+			name: "disabled",
+			code: protocol.CodeEndpointDisabled,
+			mutate: func(ctx context.Context, t *testing.T, idApp *identity.App, _ *store.DB) {
+				t.Helper()
+				if err := idApp.Disable(ctx, "alice"); err != nil {
+					t.Fatal(err)
+				}
+			},
+		},
+		{
+			name: "deleted",
+			code: protocol.CodeInvalidTarget,
+			mutate: func(ctx context.Context, t *testing.T, idApp *identity.App, _ *store.DB) {
+				t.Helper()
+				if err := idApp.Delete(ctx, "alice"); err != nil {
+					t.Fatal(err)
+				}
+			},
+		},
+	}
+	for _, tc := range cases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			db, err := store.Open(filepath.Join(t.TempDir(), "data"), "FULL")
+			if err != nil {
+				t.Fatal(err)
+			}
+			t.Cleanup(func() { _ = db.Close() })
+			fixed := time.UnixMilli(1_700_000_000_000)
+			locks := auth.NewLoginLocks()
+			idApp := identity.New(identity.Config{
+				DB: db, Hash: auth.NewStubHashPool(), Locks: locks,
+				Sessions: auth.NewSessionTokens(),
+				Now:      func() time.Time { return fixed },
+			})
+			gate := &raceTalk{inner: idApp}
+			gApp := group.New(group.Config{
+				DB: db, Talk: gate, MaxGroupMembers: 1000,
+				Now: func() time.Time { return fixed }, DefaultRemoteIP: "1.1.1.1",
+			})
+			ctx := context.Background()
+			insertEP(t, db, "alice", 1)
+			insertEP(t, db, "bob", 1)
+			if err := idApp.SelfSetTalkPassword(ctx, "bob", "secret"); err != nil {
+				t.Fatal(err)
+			}
+			gate.mutate = func() { tc.mutate(ctx, t, idApp, db) }
+
+			var before int
+			if qErr := db.Read.QueryRow(`SELECT COUNT(*) FROM groups`).Scan(&before); qErr != nil {
+				t.Fatal(qErr)
+			}
+			_, err = gApp.Create(ctx, "alice", &protocol.GroupCreate{
+				V: protocol.Version, Type: protocol.TypeGroupCreate, RID: "1",
+				ID: "g_r307_" + tc.name, Name: "竞态群",
+				Members: []protocol.GroupMemberIn{{ID: "bob", TalkPassword: "secret"}},
+			})
+			if protoCode(err) != tc.code {
+				t.Fatalf("want %s got %v", tc.code, err)
+			}
+			var after int
+			if qErr := db.Read.QueryRow(`SELECT COUNT(*) FROM groups`).Scan(&after); qErr != nil {
+				t.Fatal(qErr)
+			}
+			if after != before {
+				t.Fatalf("groups leaked: before=%d after=%d", before, after)
+			}
+			var exists int
+			qErr := db.Read.QueryRow(`SELECT 1 FROM groups WHERE id = ?`, "g_r307_"+tc.name).Scan(&exists)
+			if !errors.Is(qErr, sql.ErrNoRows) {
+				t.Fatalf("expected no group row, got exists=%d err=%v", exists, qErr)
+			}
+		})
+	}
+}
+
 func TestU02AdminCreateOwnerMustExistAndEnabled(t *testing.T) {
 	t.Parallel()
 	gApp, _, _, db, down := setup(t)

web/src/api/admin.ts

@@ -296,7 +296,7 @@ export function deleteGroup(id: string) {
 
 export function addGroupMembers(id: string, memberIds: string[]) {
   return run(() =>
-    requestAdmin<{ failed: GroupFailed[]; added: number }>(
+    requestAdmin<{ failed: GroupFailed[] }>(
       `/api/admin/groups/${encodeURIComponent(id)}/members`,
       {
         method: "POST",

web/src/api/mock.ts

@@ -691,14 +691,13 @@ export const mockApi = {
     return {};
   },
 
-  async addGroupMembers(id: string, memberIds: string[]): Promise<{ failed: GroupFailed[]; added: number }> {
+  async addGroupMembers(id: string, memberIds: string[]): Promise<{ failed: GroupFailed[] }> {
     requireSession();
     const g = groups.find((x) => x.id === id);
     if (!g) {
       throw new ApiError("not_found", "群不存在", 404);
     }
     const failed: GroupFailed[] = [];
-    let added = 0;
     for (const mid of memberIds) {
       if (!endpoints.some((e) => e.id === mid)) {
         failed.push({ id: mid, code: "not_found" });
@@ -706,10 +705,9 @@ export const mockApi = {
       }
       if (!g.members.some((m) => m.id === mid)) {
         g.members.push({ id: mid, joined_at_ms: now() });
-        added++;
       }
     }
-    return { failed, added };
+    return { failed };
   },
 
   async removeGroupMember(id: string, endpointId: string): Promise<Record<string, never>> {

web/src/views/GroupsView.vue

@@ -233,15 +233,9 @@ async function onAddMembers() {
   if (!ids.length) return;
   const res = await addGroupMembers(detail.value.id, ids);
   if (res.failed.length) {
-    if (res.added > 0) {
-      message.warning(`已加入 ${res.added} 人，部分失败：${formatFailed(res.failed)}`);
-    } else {
     message.warning(`部分失败：${formatFailed(res.failed)}`);
-    }
-  } else if (res.added === 0) {
-    message.info("没有新成员加入");
   } else {
-    message.success(`已加人 ${res.added} 人`);
+    message.success("已加人");
   }
   await loadDetail(detail.value.id);
   await load();