review: fix critical/medium bugs in 4 plugins (round 2)
group_horse_racing: - settle_race: rewrite with 7 bug fixes (race condition, draw double-credit, empty participants, etc.) - models.py: reorder fields for correct defaults, add indexes - message_service: add logger import danding_points: - api.py: add finally blocks to 3 methods (add_points, get_history, get_leaderboard) - database.py: add finally block to get_user_balance chatai: - __init__.py: deprecated API→asyncio.to_thread, deduplicate logging, taskkill filter for safety - screenshot.py: XSS protection with bleach on HTML content - requirements.txt: add bleach dependency danding_qqpush: - api.py L13: fix self-referencing _renderer NameError crash - api.py: lazy singleton pattern via _get_renderer() instead of per-request ImageRenderer - __init__.py: mask Token in log output (security) All 34 tests pass.
This commit is contained in:
@@ -47,9 +47,9 @@ def _force_kill_chrome():
|
||||
"""强制终止残留的 headless Chrome 进程(仅 pyppeteer 创建的)"""
|
||||
try:
|
||||
if sys.platform == "win32":
|
||||
# 只杀带 --headless 参数的 chrome(避免误杀用户浏览器)
|
||||
# 只杀带 --remote-debugging-port 参数的 chrome(避免误杀用户浏览器)
|
||||
subprocess.run(
|
||||
["taskkill", "/F", "/IM", "chrome.exe", "/FI", "MODULES eq *pyppeteer*"],
|
||||
["taskkill", "/F", "/FI", "IMAGENAME eq chrome.exe", "/FI", "MODULES eq pyppeteer*"],
|
||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
|
||||
)
|
||||
else:
|
||||
@@ -124,16 +124,14 @@ def _get_ai_client() -> OpenAI:
|
||||
async def call_ai_api(message: str) -> str:
|
||||
"""调用 AI 接口"""
|
||||
client = _get_ai_client()
|
||||
response = await asyncio.get_event_loop().run_in_executor(
|
||||
None,
|
||||
lambda: client.chat.completions.create(
|
||||
model="deepseek-ai/DeepSeek-V3",
|
||||
messages=[
|
||||
{"role": "system", "content": _AI_SYSTEM_PROMPT},
|
||||
{"role": "user", "content": message},
|
||||
],
|
||||
stream=False,
|
||||
),
|
||||
response = await asyncio.to_thread(
|
||||
client.chat.completions.create,
|
||||
model="deepseek-ai/DeepSeek-V3",
|
||||
messages=[
|
||||
{"role": "system", "content": _AI_SYSTEM_PROMPT},
|
||||
{"role": "user", "content": message},
|
||||
],
|
||||
stream=False,
|
||||
)
|
||||
return response.choices[0].message.content or ""
|
||||
|
||||
@@ -183,7 +181,6 @@ async def handle_message(event: MessageEvent, bot: Bot):
|
||||
except Exception as e:
|
||||
logger.error(f"chatai处理失败: user_id={event.user_id} error={e}")
|
||||
await asyncio.sleep(random.uniform(2, 3))
|
||||
logger.error(f"chatai详细错误: {e}")
|
||||
await message_handler.finish("出错了,请稍后再试~")
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import asyncio
|
||||
import re
|
||||
import html as html_module
|
||||
import markdown
|
||||
import bleach
|
||||
from nonebot import logger
|
||||
|
||||
async def markdown_to_image(markdown_text: str, output_path: str, browser=None):
|
||||
@@ -11,6 +13,15 @@ async def markdown_to_image(markdown_text: str, output_path: str, browser=None):
|
||||
# Convert markdown to HTML. The markdown library handles special chars safely.
|
||||
# Note: do NOT html.escape() before markdown.markdown() - it breaks markdown syntax.
|
||||
html_content = markdown.markdown(markdown_text, extensions=["fenced_code", "tables"])
|
||||
# Sanitize to prevent XSS from malicious AI responses
|
||||
allowed_tags = [
|
||||
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'br', 'hr',
|
||||
'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'span',
|
||||
'table', 'thead', 'tbody', 'tr', 'th', 'td',
|
||||
'strong', 'em', 'b', 'i', 'u', 'a', 'img', 'div',
|
||||
]
|
||||
allowed_attrs = {'a': ['href', 'title'], 'img': ['src', 'alt', 'title']}
|
||||
html_content = bleach.clean(html_content, tags=allowed_tags, attributes=allowed_attrs)
|
||||
|
||||
# 使用传入的浏览器实例或创建新的
|
||||
if browser is None:
|
||||
|
||||
Reference in New Issue
Block a user