✨ feat(command): 添加动态配置、黑白名单与后台管理界面
- 新增 SQLite 数据库层(db.py)持久化命令监听配置,支持热更新无需重启 - 命令过滤从白名单扩展为黑白名单双模式(COMMAND_LIST_MODE: allow/deny) - 新增后台管理页面 /admin/,侧边栏布局,支持在线修改所有命令监听配置 - 新增 REST API:GET/PUT /api/settings、POST /api/settings/reload - 新增 rebuild_pattern() 支持配置变更后正则动态重编译 - 中间件放行 /admin 和 /api 路径免鉴权 - 添加 aiosqlite 依赖
This commit is contained in:
43
plugin.py
43
plugin.py
@@ -12,15 +12,21 @@ from .config import (
|
||||
COMMAND_ALLOWED_USERS,
|
||||
COMMAND_AT_SENDER,
|
||||
COMMAND_CALLBACK_URL,
|
||||
COMMAND_DENIED_GROUPS,
|
||||
COMMAND_DENIED_USERS,
|
||||
COMMAND_LENGTH_MAX,
|
||||
COMMAND_LENGTH_MIN,
|
||||
COMMAND_LIST_MODE,
|
||||
COMMAND_PREFIX,
|
||||
COMMAND_SCOPE,
|
||||
HOST,
|
||||
PORT,
|
||||
UPLOAD_DIR,
|
||||
WEBHOOK_API_KEY,
|
||||
reload_settings,
|
||||
)
|
||||
from .db import get_settings, init_db
|
||||
from .handlers.admin import admin_page_handler, api_get_settings, api_reload_settings, api_update_settings
|
||||
from .handlers.command import parse_command, send_command_callback
|
||||
from .handlers.health import health_handler
|
||||
from .handlers.message import webhook_handler
|
||||
@@ -43,17 +49,23 @@ class WebHookPlugin(NcatBotPlugin):
|
||||
self._listener_task: asyncio.Task | None = None
|
||||
|
||||
async def on_load(self):
|
||||
# 初始化数据库并加载动态配置
|
||||
await init_db()
|
||||
settings = await get_settings()
|
||||
reload_settings(settings)
|
||||
|
||||
self.logger.info("Webhook 插件已加载")
|
||||
self.logger.info(
|
||||
"WEBHOOK_API_KEY: %s",
|
||||
"已配置" if os.environ.get("WEBHOOK_API_KEY") else "自动生成",
|
||||
)
|
||||
self.logger.info(
|
||||
"命令监听: 前缀=%s 长度=%d~%d 范围=%s 回调=%s",
|
||||
"命令监听: 前缀=%s 长度=%d~%d 范围=%s 名单=%s 回调=%s",
|
||||
COMMAND_PREFIX,
|
||||
COMMAND_LENGTH_MIN,
|
||||
COMMAND_LENGTH_MAX,
|
||||
COMMAND_SCOPE,
|
||||
COMMAND_LIST_MODE,
|
||||
COMMAND_CALLBACK_URL or "未配置",
|
||||
)
|
||||
asyncio.create_task(self._start_webhook())
|
||||
@@ -107,14 +119,21 @@ class WebHookPlugin(NcatBotPlugin):
|
||||
if COMMAND_SCOPE == "private" and is_group:
|
||||
continue
|
||||
|
||||
# 群白名单过滤
|
||||
if COMMAND_ALLOWED_GROUPS and is_group:
|
||||
if event.data.group_id not in COMMAND_ALLOWED_GROUPS:
|
||||
# 黑白名单过滤
|
||||
if COMMAND_LIST_MODE == "allow":
|
||||
# 白名单模式:在名单内才放行
|
||||
if COMMAND_ALLOWED_GROUPS and is_group:
|
||||
if event.data.group_id not in COMMAND_ALLOWED_GROUPS:
|
||||
continue
|
||||
if COMMAND_ALLOWED_USERS and event.data.user_id not in COMMAND_ALLOWED_USERS:
|
||||
continue
|
||||
elif COMMAND_LIST_MODE == "deny":
|
||||
# 黑名单模式:在名单内则拒绝
|
||||
if COMMAND_DENIED_GROUPS and is_group:
|
||||
if event.data.group_id in COMMAND_DENIED_GROUPS:
|
||||
continue
|
||||
if COMMAND_DENIED_USERS and event.data.user_id in COMMAND_DENIED_USERS:
|
||||
continue
|
||||
|
||||
# 用户白名单过滤
|
||||
if COMMAND_ALLOWED_USERS and event.data.user_id not in COMMAND_ALLOWED_USERS:
|
||||
continue
|
||||
|
||||
# 构建回调数据
|
||||
data = {
|
||||
@@ -124,7 +143,7 @@ class WebHookPlugin(NcatBotPlugin):
|
||||
"user_id": event.data.user_id,
|
||||
"message_id": event.data.message_id,
|
||||
}
|
||||
if hasattr(event.data, "group_id"):
|
||||
if is_group:
|
||||
data["group_id"] = event.data.group_id
|
||||
self.logger.info(
|
||||
"命令监听匹配: command=%s user=%s group=%s",
|
||||
@@ -147,6 +166,11 @@ class WebHookPlugin(NcatBotPlugin):
|
||||
app.router.add_get("/healthz", health_handler)
|
||||
app.router.add_post("/webhook", webhook_handler)
|
||||
app.router.add_post("/upload", upload_handler)
|
||||
# 后台管理
|
||||
app.router.add_get("/admin/", admin_page_handler)
|
||||
app.router.add_get("/api/settings", api_get_settings)
|
||||
app.router.add_put("/api/settings", api_update_settings)
|
||||
app.router.add_post("/api/settings/reload", api_reload_settings)
|
||||
return app
|
||||
|
||||
async def _start_webhook(self):
|
||||
@@ -158,6 +182,7 @@ class WebHookPlugin(NcatBotPlugin):
|
||||
await site.start()
|
||||
self.logger.info("Webhook 已启动: %s:%d", HOST, PORT)
|
||||
self.logger.info("上传目录: %s", UPLOAD_DIR)
|
||||
self.logger.info("后台管理: http://%s:%d/admin/", HOST, PORT)
|
||||
|
||||
async def _stop_webhook(self):
|
||||
if self._webhook_runner is not None:
|
||||
|
||||
Reference in New Issue
Block a user