696 lines
33 KiB
Plaintext
696 lines
33 KiB
Plaintext
--- production/wechat_rpa/rbac.py
|
||
+++ release/wechat_rpa/rbac.py
|
||
@@ -13,45 +13,75 @@
|
||
是改数据;代码里那句 `require("model:write")` 一个字都不用动。
|
||
|
||
内置的三个角色可以改权限,但不能删——删掉 admin 就没人能进后台了。
|
||
+
|
||
+权限码按「权限菜单」组织:一级菜单 → 页面 → 权限码,和管理后台左侧菜单一一对应,
|
||
+角色界面照这个结构勾选。权限码有三个来源(`permissions.source`):
|
||
+
|
||
+ builtin 下面 PERMISSIONS 里登记的,随代码发布,界面上只读
|
||
+ custom 管理员在「权限菜单」页自己加的权限点或菜单链接,可改可删
|
||
+ discovered 代码里 require() 用到、却忘了在 PERMISSIONS 登记的码——API 启动时
|
||
+ 自动登记到「未归类」,免得新功能上线了、角色界面里却勾不到
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
-# ── 权限码 ───────────────────────────────────────────────────────────────────
|
||
+import re
|
||
+import sqlite3
|
||
+from typing import Any, Iterable, NamedTuple
|
||
+
|
||
+
|
||
+class Permission(NamedTuple):
|
||
+ code: str
|
||
+ name: str
|
||
+ group: str # 一级菜单
|
||
+ page: str # 页面(二级菜单);没有页面的纯接口权限也写一个说明性的名字
|
||
+ kind: str = "action" # page = 能打开这个页面;action = 页面里的操作
|
||
+ # 新拆出来的页面权限第一次上线时,自动授给已持有旧码的角色,访问范围不变。
|
||
+ implied_by: str = ""
|
||
+
|
||
+
|
||
+# ── 权限菜单 ─────────────────────────────────────────────────────────────────
|
||
# 命名规则 `资源:动作`。读写分开,因为"能看不能改"是最常见的诉求。
|
||
-PERMISSIONS: list[tuple[str, str, str]] = [
|
||
- # (权限码, 中文名, 分组)
|
||
- ("config:read", "查看模型配置", "配置"),
|
||
- ("config:write", "修改模型配置", "配置"),
|
||
- ("model:read", "查看模型清单", "模型"),
|
||
- ("model:write", "增删改模型与编排", "模型"),
|
||
- ("agent:read", "查看智能体", "模型"),
|
||
- ("agent:write", "增删改智能体与协作方案", "模型"),
|
||
- ("knowledge:read", "查看知识中心", "知识库"),
|
||
- ("knowledge:write", "加工和编辑知识草稿", "知识库"),
|
||
- ("knowledge:review", "审核知识", "知识库"),
|
||
- ("knowledge:publish", "发布和停用知识", "知识库"),
|
||
- ("knowledge:export", "导出已发布知识", "知识库"),
|
||
- ("review:read", "查看待审队列", "审核"),
|
||
- ("review:write", "通过/驳回待审回复", "审核"),
|
||
- ("stats:read", "查看调用统计", "运营"),
|
||
- ("audit:read", "查看审计日志", "运营"),
|
||
- ("release:write", "发布客户端版本", "运维"),
|
||
- ("user:read", "查看用户", "系统"),
|
||
- ("user:write", "管理用户与角色", "系统"),
|
||
- ("role:write", "管理角色权限", "系统"),
|
||
- ("desktop-account:read", "查看客户端账号", "桌面端"),
|
||
- ("desktop-account:write", "管理客户端账号", "桌面端"),
|
||
- ("desktop-account:all", "查看全部客户端数据", "桌面端"),
|
||
- ("im:read", "查看聊天归档概览", "聊天归档"),
|
||
- ("im:content:read", "查看聊天正文与素材", "聊天归档"),
|
||
- ("im:import", "导入聊天记录", "聊天归档"),
|
||
- ("im:export", "导出聊天记录", "聊天归档"),
|
||
- ("im:storage:write", "管理素材存储", "聊天归档"),
|
||
- ("im:identity:write", "管理人员唯一标识", "聊天归档"),
|
||
+# 加页面或按钮时在这里登记一行;前端 `router/routes/modules/console.ts` 里每个页面的
|
||
+# `meta.authority` 都必须在这里有,「权限菜单」页会把没登记的码标出来。
|
||
+PERMISSIONS: list[Permission] = [
|
||
+ Permission("model:read", "查看模型清单与角色编排", "AI 模型", "模型清单、角色编排", "page"),
|
||
+ Permission("model:write", "增删改模型、测试连通、修改编排", "AI 模型", "模型清单、角色编排"),
|
||
+ Permission("agent:read", "查看智能体", "AI 模型", "智能体", "page"),
|
||
+ Permission("agent:write", "增删改智能体与协作方案", "AI 模型", "智能体"),
|
||
+ Permission("stats:read", "查看调用统计、Token 用量与知识引用记录", "AI 模型", "调用统计", "page"),
|
||
+ Permission("desktop-account:read", "查看客户端账号", "桌面端", "客户端账号", "page"),
|
||
+ Permission("desktop-account:write", "管理客户端账号(启停、下线设备、分配管理员)", "桌面端", "客户端账号"),
|
||
+ Permission("desktop-account:all", "查看全部客户端数据(不受账号分配限制)", "桌面端", "客户端账号"),
|
||
+ Permission("config:read", "查看客户端配置", "桌面端", "客户端配置", "page"),
|
||
+ Permission("config:write", "修改客户端配置(能力开关、审核规则、MCP 等)", "桌面端", "客户端配置"),
|
||
+ Permission("release:read", "查看版本升级与升级进度", "桌面端", "版本升级", "page", "config:read"),
|
||
+ Permission("release:write", "发布客户端版本", "桌面端", "版本升级"),
|
||
+ Permission("im:read", "查看归档概览", "聊天归档", "归档概览", "page"),
|
||
+ Permission("im:content:read", "查看聊天正文与素材", "聊天归档", "会话与消息", "page"),
|
||
+ Permission("im:export", "导出聊天记录", "聊天归档", "导出中心", "page"),
|
||
+ Permission("im:identity:write", "管理人员唯一标识与患者绑定", "聊天归档", "人员唯一标识", "page"),
|
||
+ Permission("im:storage:write", "管理 COS 素材存储", "聊天归档", "COS 存储", "page"),
|
||
+ Permission("im:import", "导入聊天记录", "聊天归档", "导入接口"),
|
||
+ Permission("knowledge:read", "查看知识中心", "知识中心", "知识加工与检索", "page"),
|
||
+ Permission("knowledge:write", "加工和编辑知识草稿", "知识中心", "知识加工与检索"),
|
||
+ Permission("knowledge:review", "审核知识", "知识中心", "知识加工与检索"),
|
||
+ Permission("knowledge:publish", "发布和停用知识", "知识中心", "知识加工与检索"),
|
||
+ Permission("knowledge:export", "导出已发布知识", "知识中心", "知识加工与检索"),
|
||
+ Permission("role:read", "查看角色与权限菜单", "系统管理", "角色权限、权限菜单", "page", "user:read"),
|
||
+ Permission("role:write", "管理角色、维护权限菜单", "系统管理", "角色权限、权限菜单"),
|
||
+ Permission("user:read", "查看用户", "系统管理", "用户管理", "page"),
|
||
+ Permission("user:write", "管理用户与角色分配", "系统管理", "用户管理"),
|
||
+ Permission("audit:read", "查看审计日志", "系统管理", "审计日志", "page"),
|
||
]
|
||
|
||
-PERMISSION_CODES = frozenset(code for code, _name, _group in PERMISSIONS)
|
||
+PERMISSION_CODES = frozenset(item.code for item in PERMISSIONS)
|
||
+
|
||
+UNGROUPED = "未归类"
|
||
+CODE_PATTERN = re.compile(r"^[a-z][a-z0-9-]*(?::[a-z0-9-]+)+$")
|
||
+ICON_PATTERN = re.compile(r"^[a-z0-9-]+:[a-z0-9-]+$")
|
||
+CUSTOM_KINDS = {"action", "link"}
|
||
+LINK_MODES = {"tab", "iframe"}
|
||
|
||
# ── 内置角色 ─────────────────────────────────────────────────────────────────
|
||
# 这里给的只是**初始**授权。装好之后运营可以在界面上改,改完立刻生效。
|
||
@@ -64,10 +94,9 @@
|
||
"config:read", "config:write",
|
||
"model:read", "model:write",
|
||
"agent:read", "agent:write",
|
||
- "review:read", "review:write",
|
||
"stats:read", "audit:read",
|
||
- "release:write",
|
||
- "user:read",
|
||
+ "release:read", "release:write",
|
||
+ "user:read", "role:read",
|
||
],
|
||
),
|
||
(
|
||
@@ -75,7 +104,7 @@
|
||
"只读用户",
|
||
[
|
||
"config:read", "model:read", "agent:read",
|
||
- "review:read", "stats:read", "user:read",
|
||
+ "release:read", "stats:read", "user:read", "role:read",
|
||
],
|
||
),
|
||
]
|
||
@@ -103,26 +132,79 @@
|
||
CREATE INDEX IF NOT EXISTS idx_role_perms ON role_permissions(role_code);
|
||
"""
|
||
|
||
+# 权限菜单的列是后加的:老库只有 code/name/group_name,启动时按需补列。
|
||
+# 只加列不改列——回滚到老版本时,老代码照样只读它认识的三列。
|
||
+PERMISSION_COLUMNS: dict[str, str] = {
|
||
+ "page_name": "TEXT NOT NULL DEFAULT ''",
|
||
+ "kind": "TEXT NOT NULL DEFAULT 'action'",
|
||
+ "source": "TEXT NOT NULL DEFAULT 'builtin'",
|
||
+ "sort_order": "INTEGER NOT NULL DEFAULT 0",
|
||
+ "link_url": "TEXT NOT NULL DEFAULT ''",
|
||
+ "link_mode": "TEXT NOT NULL DEFAULT ''",
|
||
+ "icon": "TEXT NOT NULL DEFAULT ''",
|
||
+ "enabled": "INTEGER NOT NULL DEFAULT 1",
|
||
+ "created_at": "TEXT NOT NULL DEFAULT ''",
|
||
+ "updated_at": "TEXT NOT NULL DEFAULT ''",
|
||
+}
|
||
+
|
||
+def _ensure_columns(db) -> None:
|
||
+ present = {row[1] for row in db.execute("PRAGMA table_info(permissions)")}
|
||
+ for column, ddl in PERMISSION_COLUMNS.items():
|
||
+ if column in present:
|
||
+ continue
|
||
+ try:
|
||
+ db.execute(f"ALTER TABLE permissions ADD COLUMN {column} {ddl}")
|
||
+ except sqlite3.OperationalError as exc:
|
||
+ # API、模型网关、知识加工进程同时启动时会抢着补同一列,晚到的那个跳过即可。
|
||
+ if "duplicate column" not in str(exc).lower():
|
||
+ raise
|
||
+
|
||
|
||
def seed(db, now: str) -> None:
|
||
- """建表并写入内置角色。可重复执行。
|
||
+ """建表、同步内置权限菜单并写入内置角色。可重复执行。
|
||
|
||
只在角色**第一次**出现时写默认授权——之后运营改过的授权不能被一次重启冲掉。
|
||
+ API、模型网关、知识加工进程启动时都会跑这一步,所以它必须并发安全、幂等。
|
||
"""
|
||
db.executescript(SCHEMA)
|
||
- for code, name, group in PERMISSIONS:
|
||
+ _ensure_columns(db)
|
||
+ for index, item in enumerate(PERMISSIONS):
|
||
db.execute(
|
||
- """INSERT INTO permissions (code,name,group_name) VALUES (?,?,?)
|
||
+ """INSERT INTO permissions
|
||
+ (code,name,group_name,page_name,kind,source,sort_order,
|
||
+ link_url,link_mode,icon,enabled,created_at,updated_at)
|
||
+ VALUES (?,?,?,?,?,'builtin',?,'','','',1,?,?)
|
||
ON CONFLICT(code) DO UPDATE SET name=excluded.name,
|
||
- group_name=excluded.group_name""",
|
||
- (code, name, group),
|
||
+ group_name=excluded.group_name, page_name=excluded.page_name,
|
||
+ kind=excluded.kind, source='builtin', sort_order=excluded.sort_order,
|
||
+ link_url='', link_mode='', icon='', enabled=1""",
|
||
+ (item.code, item.name, item.group, item.page, item.kind, index, now, now),
|
||
)
|
||
- # 权限码删掉了就该级联清掉授权,否则界面上会显示一堆不存在的能力
|
||
+ # 代码里删掉的内置权限码要连授权一起清掉,否则界面上会显示一堆不存在的能力。
|
||
+ # 自定义和自动登记的条目不归这里管。
|
||
db.execute(
|
||
- "DELETE FROM role_permissions WHERE permission_code NOT IN "
|
||
+ "DELETE FROM permissions WHERE source='builtin' AND code NOT IN "
|
||
f"({','.join('?' for _ in PERMISSION_CODES)})",
|
||
tuple(sorted(PERMISSION_CODES)),
|
||
)
|
||
+ db.execute(
|
||
+ "DELETE FROM role_permissions WHERE permission_code NOT IN (SELECT code FROM permissions)"
|
||
+ )
|
||
+ # 从旧码拆出来的页面权限:没有任何角色持有它(刚上线,或被不认识它的旧版本清掉了),
|
||
+ # 就按旧码补授——原来能进这个页面的角色上线后照样能进。之后管理员总持有全部权限码,
|
||
+ # 这一步不会再生效,界面上收回的授权不会被重启冲回来。
|
||
+ for item in PERMISSIONS:
|
||
+ if not item.implied_by:
|
||
+ continue
|
||
+ held = db.execute(
|
||
+ "SELECT 1 FROM role_permissions WHERE permission_code=? LIMIT 1", (item.code,)
|
||
+ ).fetchone()
|
||
+ if held is None:
|
||
+ db.execute(
|
||
+ """INSERT OR IGNORE INTO role_permissions (role_code,permission_code)
|
||
+ SELECT role_code, ? FROM role_permissions WHERE permission_code=?""",
|
||
+ (item.code, item.implied_by),
|
||
+ )
|
||
for code, name, defaults in BUILTIN_ROLES:
|
||
existing = db.execute("SELECT code FROM roles WHERE code=?", (code,)).fetchone()
|
||
db.execute(
|
||
@@ -138,13 +220,20 @@
|
||
"VALUES (?,?)",
|
||
[(code, item) for item in defaults],
|
||
)
|
||
- elif code == "admin":
|
||
- # 管理员角色不能在界面里被削权;新增权限时也要给已有管理员补齐。
|
||
- db.executemany(
|
||
- "INSERT OR IGNORE INTO role_permissions (role_code,permission_code) "
|
||
- "VALUES (?,?)",
|
||
- [(code, item) for item in defaults],
|
||
- )
|
||
+ # 管理员角色不能在界面里被削权;新增权限(含自定义、自动登记的)时也要给管理员补齐。
|
||
+ _grant_admin_everything(db)
|
||
+
|
||
+
|
||
+def _grant_admin_everything(db) -> None:
|
||
+ db.execute(
|
||
+ """INSERT OR IGNORE INTO role_permissions (role_code,permission_code)
|
||
+ SELECT 'admin', code FROM permissions"""
|
||
+ )
|
||
+
|
||
+
|
||
+def all_codes(db) -> set[str]:
|
||
+ """库里登记的全部权限码:内置 + 自定义 + 自动登记。"""
|
||
+ return {row[0] for row in db.execute("SELECT code FROM permissions")}
|
||
|
||
|
||
def permissions_of(db, role_code: str) -> set[str]:
|
||
@@ -165,10 +254,11 @@
|
||
if role is None:
|
||
raise ValueError(f"角色不存在:{role_code}")
|
||
wanted = {str(item).strip() for item in (codes or []) if str(item).strip()}
|
||
- unknown = wanted - PERMISSION_CODES
|
||
+ known = all_codes(db)
|
||
+ unknown = wanted - known
|
||
if unknown:
|
||
raise ValueError(f"未知权限码:{'、'.join(sorted(unknown))}")
|
||
- if role_code == "admin" and wanted != set(PERMISSION_CODES):
|
||
+ if role_code == "admin" and wanted != known:
|
||
# 管理员被削权之后就没人能再把权限加回来了,只能改库。这道闸必须在。
|
||
raise ValueError("管理员角色的权限不可修改,否则会把自己锁在门外")
|
||
db.execute("DELETE FROM role_permissions WHERE role_code=?", (role_code,))
|
||
@@ -178,3 +268,209 @@
|
||
)
|
||
db.execute("UPDATE roles SET updated_at=? WHERE code=?", (now, role_code))
|
||
return wanted
|
||
+
|
||
+
|
||
+# ── 权限菜单的读写 ───────────────────────────────────────────────────────────
|
||
+def _weight(row: dict[str, Any]) -> int:
|
||
+ """排序权重:内置按登记顺序,自定义排在内置之后,自动登记的排最后。"""
|
||
+ offset = {"builtin": 0, "custom": 1000}.get(row["source"], 9000)
|
||
+ return offset + int(row["sort_order"] or 0)
|
||
+
|
||
+
|
||
+def catalog(db) -> list[dict[str, Any]]:
|
||
+ """权限菜单:每个权限码一行,带上它挂在哪个菜单/页面、哪些角色持有它。
|
||
+
|
||
+ 排序:内置菜单按 PERMISSIONS 的登记顺序(也就是左侧菜单的顺序),自定义菜单
|
||
+ 排在后面;同一菜单里内置在前,自定义按管理员填的排序。
|
||
+ """
|
||
+ cursor = db.execute(
|
||
+ """SELECT code,name,group_name,page_name,kind,source,sort_order,
|
||
+ link_url,link_mode,icon,enabled,updated_at FROM permissions"""
|
||
+ )
|
||
+ columns = [item[0] for item in cursor.description]
|
||
+ rows = [dict(zip(columns, row)) for row in cursor.fetchall()]
|
||
+ holders: dict[str, list[str]] = {}
|
||
+ for role_code, code in db.execute(
|
||
+ "SELECT role_code, permission_code FROM role_permissions ORDER BY role_code"
|
||
+ ).fetchall():
|
||
+ holders.setdefault(code, []).append(role_code)
|
||
+ group_order: dict[str, int] = {}
|
||
+ for row in rows:
|
||
+ group_order[row["group_name"]] = min(group_order.get(row["group_name"], 1 << 30), _weight(row))
|
||
+ rows.sort(key=lambda row: (group_order[row["group_name"]], row["group_name"], _weight(row), row["code"]))
|
||
+ return [
|
||
+ {
|
||
+ **row,
|
||
+ "sort_order": int(row["sort_order"] or 0),
|
||
+ "enabled": bool(row["enabled"]),
|
||
+ "roles": holders.get(row["code"], []),
|
||
+ }
|
||
+ for row in rows
|
||
+ ]
|
||
+
|
||
+
|
||
+def custom_menus(db, permissions: Iterable[str]) -> list[dict[str, Any]]:
|
||
+ """当前用户能看到的自定义菜单链接(左侧菜单用)。"""
|
||
+ allowed = set(permissions)
|
||
+ return [
|
||
+ {key: item[key] for key in ("code", "name", "group_name", "link_url", "link_mode", "icon", "sort_order")}
|
||
+ for item in catalog(db)
|
||
+ if item["kind"] == "link" and item["enabled"] and item["code"] in allowed
|
||
+ ]
|
||
+
|
||
+
|
||
+def _clean_text(value: Any, label: str, limit: int, *, required: bool) -> str:
|
||
+ text = " ".join(str(value or "").split())
|
||
+ if required and not text:
|
||
+ raise ValueError(f"{label}不能为空")
|
||
+ if len(text) > limit:
|
||
+ raise ValueError(f"{label}不能超过 {limit} 个字")
|
||
+ return text
|
||
+
|
||
+
|
||
+def _clean_link(value: Any) -> str:
|
||
+ url = str(value or "").strip()
|
||
+ if not url:
|
||
+ raise ValueError("菜单链接需要填写链接地址")
|
||
+ if len(url) > 1000:
|
||
+ raise ValueError("链接地址太长")
|
||
+ if any(ch.isspace() or ord(ch) < 32 for ch in url):
|
||
+ raise ValueError("链接地址里不能有空格或控制字符")
|
||
+ lowered = url.lower()
|
||
+ # 只认 http(s) 绝对地址和本站路径;javascript:、data: 之类一律不收
|
||
+ if lowered.startswith(("http://", "https://")):
|
||
+ if len(url.split("//", 1)[1].split("/", 1)[0]) == 0:
|
||
+ raise ValueError("链接地址缺少域名")
|
||
+ return url
|
||
+ if url.startswith("/") and not url.startswith("//"):
|
||
+ return url
|
||
+ raise ValueError("链接地址只能是 http(s):// 开头的网址,或以 / 开头的本站路径")
|
||
+
|
||
+
|
||
+def _validated_custom(data: dict[str, Any], code: str) -> dict[str, Any]:
|
||
+ kind = str(data.get("kind") or "action").strip()
|
||
+ if kind not in CUSTOM_KINDS:
|
||
+ raise ValueError("类型只能是「权限点」或「菜单链接」")
|
||
+ item = {
|
||
+ "code": code,
|
||
+ "name": _clean_text(data.get("name"), "名称", 40, required=True),
|
||
+ "group_name": _clean_text(data.get("group_name"), "所属菜单", 20, required=True),
|
||
+ "page_name": _clean_text(data.get("page_name"), "所属页面", 40, required=False),
|
||
+ "kind": kind,
|
||
+ "link_url": "",
|
||
+ "link_mode": "",
|
||
+ "icon": "",
|
||
+ "enabled": 1 if data.get("enabled", True) else 0,
|
||
+ }
|
||
+ try:
|
||
+ sort_order = int(data.get("sort_order") if data.get("sort_order") is not None else 0)
|
||
+ except (TypeError, ValueError):
|
||
+ raise ValueError("排序必须是数字") from None
|
||
+ if not 0 <= sort_order <= 999:
|
||
+ raise ValueError("排序取 0–999")
|
||
+ item["sort_order"] = sort_order
|
||
+ if kind == "link":
|
||
+ item["link_url"] = _clean_link(data.get("link_url"))
|
||
+ mode = str(data.get("link_mode") or "tab").strip()
|
||
+ if mode not in LINK_MODES:
|
||
+ raise ValueError("打开方式只能是「新窗口」或「内嵌」")
|
||
+ item["link_mode"] = mode
|
||
+ icon = str(data.get("icon") or "").strip()
|
||
+ if icon and not ICON_PATTERN.fullmatch(icon):
|
||
+ raise ValueError("图标写成 lucide:link 这样的格式")
|
||
+ item["icon"] = icon
|
||
+ return item
|
||
+
|
||
+
|
||
+def _clean_code(value: Any) -> str:
|
||
+ code = str(value or "").strip().lower()
|
||
+ if not CODE_PATTERN.fullmatch(code) or len(code) > 64:
|
||
+ raise ValueError("权限码写成 资源:动作,例如 report:read(小写字母、数字、连字符)")
|
||
+ return code
|
||
+
|
||
+
|
||
+def create_custom(db, data: dict[str, Any], now: str) -> dict[str, Any]:
|
||
+ """新增一条自定义权限点或菜单链接。管理员自动持有它。"""
|
||
+ code = _clean_code(data.get("code"))
|
||
+ existing = db.execute("SELECT source FROM permissions WHERE code=?", (code,)).fetchone()
|
||
+ if existing is not None:
|
||
+ raise ValueError(f"权限码已存在:{code}")
|
||
+ item = _validated_custom(data, code)
|
||
+ db.execute(
|
||
+ """INSERT INTO permissions
|
||
+ (code,name,group_name,page_name,kind,source,sort_order,
|
||
+ link_url,link_mode,icon,enabled,created_at,updated_at)
|
||
+ VALUES (?,?,?,?,?,'custom',?,?,?,?,?,?,?)""",
|
||
+ (
|
||
+ code, item["name"], item["group_name"], item["page_name"], item["kind"],
|
||
+ item["sort_order"], item["link_url"], item["link_mode"], item["icon"],
|
||
+ item["enabled"], now, now,
|
||
+ ),
|
||
+ )
|
||
+ _grant_admin_everything(db)
|
||
+ return item
|
||
+
|
||
+
|
||
+def update_custom(db, code: str, data: dict[str, Any], now: str) -> dict[str, Any]:
|
||
+ """改一条自定义或自动登记的条目。自动登记的改过之后就算自定义(不再随代码自动删)。"""
|
||
+ code = _clean_code(code)
|
||
+ existing = db.execute("SELECT source FROM permissions WHERE code=?", (code,)).fetchone()
|
||
+ if existing is None:
|
||
+ raise ValueError(f"权限码不存在:{code}")
|
||
+ if existing[0] == "builtin":
|
||
+ raise ValueError("内置权限随代码发布,不能在这里修改")
|
||
+ item = _validated_custom(data, code)
|
||
+ db.execute(
|
||
+ """UPDATE permissions SET name=?, group_name=?, page_name=?, kind=?, source='custom',
|
||
+ sort_order=?, link_url=?, link_mode=?, icon=?, enabled=?, updated_at=?
|
||
+ WHERE code=?""",
|
||
+ (
|
||
+ item["name"], item["group_name"], item["page_name"], item["kind"],
|
||
+ item["sort_order"], item["link_url"], item["link_mode"], item["icon"],
|
||
+ item["enabled"], now, code,
|
||
+ ),
|
||
+ )
|
||
+ return item
|
||
+
|
||
+
|
||
+def delete_custom(db, code: str) -> None:
|
||
+ """删一条自定义条目,连同各角色上的授权。内置和自动登记的不能删。"""
|
||
+ code = str(code or "").strip().lower()
|
||
+ existing = db.execute("SELECT source FROM permissions WHERE code=?", (code,)).fetchone()
|
||
+ if existing is None:
|
||
+ raise ValueError(f"权限码不存在:{code}")
|
||
+ if existing[0] == "builtin":
|
||
+ raise ValueError("内置权限随代码发布,不能删除")
|
||
+ if existing[0] == "discovered":
|
||
+ raise ValueError("这个权限码还在代码里使用,不能删除;不再使用后会自动移除")
|
||
+ db.execute("DELETE FROM role_permissions WHERE permission_code=?", (code,))
|
||
+ db.execute("DELETE FROM permissions WHERE code=?", (code,))
|
||
+
|
||
+
|
||
+def sync_code_permissions(db, used: Iterable[str], now: str) -> list[str]:
|
||
+ """代码里实际用到的权限码 → 权限菜单。返回这次新登记的码。
|
||
+
|
||
+ require() 用到了、却没在 PERMISSIONS 里登记的码,登记到「未归类」并授给管理员——
|
||
+ 功能一上线就能在角色界面里勾选;以前自动登记、现在代码里不再用到的,自动移除。
|
||
+ 只有 API 进程调它:只有它知道自己注册了哪些接口。
|
||
+ """
|
||
+ wanted = {str(code).strip() for code in used if str(code or "").strip()}
|
||
+ existing = {
|
||
+ row[0]: row[1] for row in db.execute("SELECT code, source FROM permissions").fetchall()
|
||
+ }
|
||
+ added = sorted(wanted - set(existing))
|
||
+ for code in added:
|
||
+ db.execute(
|
||
+ """INSERT INTO permissions
|
||
+ (code,name,group_name,page_name,kind,source,sort_order,
|
||
+ link_url,link_mode,icon,enabled,created_at,updated_at)
|
||
+ VALUES (?,?,?,'','action','discovered',0,'','','',1,?,?)""",
|
||
+ (code, code, UNGROUPED, now, now),
|
||
+ )
|
||
+ stale = [code for code, source in existing.items() if source == "discovered" and code not in wanted]
|
||
+ for code in stale:
|
||
+ db.execute("DELETE FROM role_permissions WHERE permission_code=?", (code,))
|
||
+ db.execute("DELETE FROM permissions WHERE code=?", (code,))
|
||
+ if added:
|
||
+ _grant_admin_everything(db)
|
||
+ return added
|
||
--- production/wechat_rpa/admin_backend.py
|
||
+++ release/wechat_rpa/admin_backend.py
|
||
@@ -2073,12 +2073,70 @@
|
||
for row in rows
|
||
]
|
||
|
||
- def permission_catalog(self) -> list[dict[str, str]]:
|
||
- with self.connect() as db:
|
||
- rows = db.execute(
|
||
- "SELECT code,name,group_name FROM permissions ORDER BY group_name,code"
|
||
- ).fetchall()
|
||
- return [{key: row[key] for key in row.keys()} for row in rows]
|
||
+ def permission_catalog(self) -> list[dict[str, Any]]:
|
||
+ """权限菜单:菜单 → 页面 → 权限码,带持有角色。"""
|
||
+ import rbac
|
||
+
|
||
+ with self.connect() as db:
|
||
+ return rbac.catalog(db)
|
||
+
|
||
+ def create_permission(
|
||
+ self, data: dict[str, Any], user_id: int, ip: str
|
||
+ ) -> dict[str, Any]:
|
||
+ import rbac
|
||
+
|
||
+ with self.connect() as db:
|
||
+ db.execute("BEGIN IMMEDIATE")
|
||
+ item = rbac.create_custom(db, data, now_text())
|
||
+ self._audit(
|
||
+ db, user_id, "permission.create",
|
||
+ f"{item['code']} {item['name']}({item['group_name']})", ip,
|
||
+ )
|
||
+ db.commit()
|
||
+ return item
|
||
+
|
||
+ def update_permission(
|
||
+ self, code: str, data: dict[str, Any], user_id: int, ip: str
|
||
+ ) -> dict[str, Any]:
|
||
+ import rbac
|
||
+
|
||
+ with self.connect() as db:
|
||
+ db.execute("BEGIN IMMEDIATE")
|
||
+ item = rbac.update_custom(db, code, data, now_text())
|
||
+ self._audit(
|
||
+ db, user_id, "permission.update",
|
||
+ f"{item['code']} {item['name']}({item['group_name']})", ip,
|
||
+ )
|
||
+ db.commit()
|
||
+ return item
|
||
+
|
||
+ def delete_permission(self, code: str, user_id: int, ip: str) -> None:
|
||
+ import rbac
|
||
+
|
||
+ with self.connect() as db:
|
||
+ db.execute("BEGIN IMMEDIATE")
|
||
+ rbac.delete_custom(db, code)
|
||
+ self._audit(db, user_id, "permission.delete", str(code)[:80], ip)
|
||
+ db.commit()
|
||
+
|
||
+ def custom_menus(self, permissions: set[str]) -> list[dict[str, Any]]:
|
||
+ """当前用户能看到的自定义菜单链接。"""
|
||
+ import rbac
|
||
+
|
||
+ with self.connect() as db:
|
||
+ return rbac.custom_menus(db, permissions)
|
||
+
|
||
+ def sync_code_permissions(self, codes: set[str]) -> list[str]:
|
||
+ """代码里 require() 用到却没登记的权限码,自动登记进权限菜单。"""
|
||
+ import rbac
|
||
+
|
||
+ with self.connect() as db:
|
||
+ db.execute("BEGIN IMMEDIATE")
|
||
+ added = rbac.sync_code_permissions(db, codes, now_text())
|
||
+ db.commit()
|
||
+ if added:
|
||
+ print(f"[RBAC] 自动登记了 {len(added)} 个未在 rbac.PERMISSIONS 里登记的权限码:{added}")
|
||
+ return added
|
||
|
||
def permissions_for_user(self, user_id: int) -> set[str]:
|
||
"""一个用户实际拥有的权限码。前端的路由守卫和按钮显隐都以它为准。"""
|
||
--- production/wechat_rpa/admin_api.py
|
||
+++ release/wechat_rpa/admin_api.py
|
||
@@ -74,6 +74,21 @@
|
||
code: str
|
||
name: str = ""
|
||
permissions: list[str] = Field(default_factory=list)
|
||
+
|
||
+
|
||
+class PermissionBody(BaseModel):
|
||
+ """权限菜单里管理员自己加的一条:权限点(action)或左侧菜单链接(link)。"""
|
||
+
|
||
+ code: str = ""
|
||
+ name: str = ""
|
||
+ group_name: str = ""
|
||
+ page_name: str = ""
|
||
+ kind: str = "action"
|
||
+ link_url: str = ""
|
||
+ link_mode: str = "tab"
|
||
+ icon: str = ""
|
||
+ sort_order: int = 0
|
||
+ enabled: bool = True
|
||
|
||
|
||
class UserBody(BaseModel):
|
||
@@ -377,8 +392,13 @@
|
||
)
|
||
return account
|
||
|
||
+ # 代码里实际用到的权限码。建完路由后和权限菜单对一遍:忘了在 rbac.PERMISSIONS
|
||
+ # 登记的码会被自动登记,新功能上线就能在角色界面里勾到,不用等下一次补登记。
|
||
+ used_codes: set[str] = set()
|
||
+
|
||
def require(*codes: str):
|
||
- """权限依赖。只认权限码,不认角色名。"""
|
||
+ """权限依赖。只认权限码,不认角色名。多个码要同时具备。"""
|
||
+ used_codes.update(codes)
|
||
|
||
async def guard(principal: Principal = Depends(current)) -> Principal:
|
||
missing = [code for code in codes if code not in principal.permissions]
|
||
@@ -386,6 +406,20 @@
|
||
raise HTTPException(
|
||
status_code=status.HTTP_403_FORBIDDEN,
|
||
detail=f"缺少权限:{'、'.join(missing)}",
|
||
+ )
|
||
+ return principal
|
||
+
|
||
+ return guard
|
||
+
|
||
+ def require_any(*codes: str):
|
||
+ """权限依赖:具备其中任意一个码即可(例如"能看"或"能改"都能读列表)。"""
|
||
+ used_codes.update(codes)
|
||
+
|
||
+ async def guard(principal: Principal = Depends(current)) -> Principal:
|
||
+ if not any(code in principal.permissions for code in codes):
|
||
+ raise HTTPException(
|
||
+ status_code=status.HTTP_403_FORBIDDEN,
|
||
+ detail=f"缺少权限:{' 或 '.join(codes)}",
|
||
)
|
||
return principal
|
||
|
||
@@ -677,11 +711,54 @@
|
||
|
||
# ── 角色与权限 ───────────────────────────────────────────────────────
|
||
@app.get("/api/v2/permissions")
|
||
- async def permissions(_: Principal = Depends(require("role:write"))) -> dict:
|
||
+ async def permissions(
|
||
+ _: Principal = Depends(require_any("role:read", "role:write")),
|
||
+ ) -> dict:
|
||
return {"permissions": database.permission_catalog()}
|
||
|
||
+ @app.post("/api/v2/permissions")
|
||
+ async def create_permission(
|
||
+ body: PermissionBody, request: Request, principal: Principal = Depends(require("role:write"))
|
||
+ ) -> dict:
|
||
+ try:
|
||
+ item = database.create_permission(body.model_dump(), principal.id, client_ip(request))
|
||
+ except ValueError as exc:
|
||
+ raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||
+ return {"permission": item, "permissions": database.permission_catalog()}
|
||
+
|
||
+ @app.put("/api/v2/permissions/{code}")
|
||
+ async def update_permission(
|
||
+ code: str,
|
||
+ body: PermissionBody,
|
||
+ request: Request,
|
||
+ principal: Principal = Depends(require("role:write")),
|
||
+ ) -> dict:
|
||
+ try:
|
||
+ item = database.update_permission(code, body.model_dump(), principal.id, client_ip(request))
|
||
+ except ValueError as exc:
|
||
+ raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||
+ return {"permission": item, "permissions": database.permission_catalog()}
|
||
+
|
||
+ @app.delete("/api/v2/permissions/{code}")
|
||
+ async def delete_permission(
|
||
+ code: str, request: Request, principal: Principal = Depends(require("role:write"))
|
||
+ ) -> dict:
|
||
+ try:
|
||
+ database.delete_permission(code, principal.id, client_ip(request))
|
||
+ except ValueError as exc:
|
||
+ raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||
+ return {"permissions": database.permission_catalog()}
|
||
+
|
||
+ @app.get("/api/v2/custom-menus")
|
||
+ async def custom_menus(principal: Principal = Depends(current)) -> dict:
|
||
+ """左侧菜单里管理员自己加的链接,只返回当前用户有权看到的。"""
|
||
+ return {"menus": database.custom_menus(principal.permissions)}
|
||
+
|
||
@app.get("/api/v2/roles")
|
||
- async def list_roles(_: Principal = Depends(require("user:read"))) -> dict:
|
||
+ async def list_roles(
|
||
+ # 用户管理页要角色下拉框,角色权限页要列表:两边任一权限都能读。
|
||
+ _: Principal = Depends(require_any("user:read", "role:read")),
|
||
+ ) -> dict:
|
||
return {"roles": database.roles()}
|
||
|
||
@app.post("/api/v2/roles")
|
||
@@ -1062,7 +1139,9 @@
|
||
|
||
# ── 桌面端版本升级 ───────────────────────────────────────────────────
|
||
@app.get("/api/v2/release")
|
||
- async def get_release(_: Principal = Depends(require("config:read"))) -> dict:
|
||
+ async def get_release(
|
||
+ _: Principal = Depends(require_any("release:read", "release:write")),
|
||
+ ) -> dict:
|
||
return release_payload(database.release(), direct_download=True)
|
||
|
||
@app.post("/api/v2/release")
|
||
@@ -1199,7 +1278,7 @@
|
||
|
||
@app.get("/api/v2/releases")
|
||
async def release_history(
|
||
- _: Principal = Depends(require("config:read")),
|
||
+ _: Principal = Depends(require_any("release:read", "release:write")),
|
||
) -> dict:
|
||
current = release_payload(database.release())
|
||
return {
|
||
@@ -1553,6 +1632,7 @@
|
||
return FileResponse(candidate)
|
||
return FileResponse(dist / "index.html")
|
||
|
||
+ database.sync_code_permissions(used_codes)
|
||
return app
|
||
|
||
|