ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-02-26 04:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🚑 hotfix due to cq security problem

Browse Source
This commit is contained in:
yanyongyu 2020-12-28 00:24:18 +08:00
parent 2ae76ff78b
commit 2d63eb32e1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nonebot/adapters/cqhttp/bot.py
View File

@ -14,7 +14,7 @@ from nonebot.message import handle_event
from nonebot.adapters import Bot as BaseBot from nonebot.adapters import Bot as BaseBot
from nonebot.exception import RequestDenied from nonebot.exception import RequestDenied
from .utils import log from .utils import log, escape
from .message import Message, MessageSegment from .message import Message, MessageSegment
from .event import Reply, Event, MessageEvent, get_event_model from .event import Reply, Event, MessageEvent, get_event_model
from .exception import NetworkError, ApiNotAvailable, ActionFailed from .exception import NetworkError, ApiNotAvailable, ActionFailed
@ -419,6 +419,7 @@ class Bot(BaseBot):
- ``NetworkError``: 网络错误 - ``NetworkError``: 网络错误
- ``ActionFailed``: API 调用失败 - ``ActionFailed``: API 调用失败
""" """
message = escape(message) if isinstance(message, str) else message
msg = message if isinstance(message, Message) else Message(message) msg = message if isinstance(message, Message) else Message(message)
at_sender = at_sender and hasattr(event, "user_id") at_sender = at_sender and hasattr(event, "user_id")

1
pages/changelog.md
View File

@ -11,6 +11,7 @@ sidebar: auto
- 修复部分非法 CQ 码被识别导致报错 - 修复部分非法 CQ 码被识别导致报错
- 修复非 text 类型 CQ 码 data 未进行去转义 - 修复非 text 类型 CQ 码 data 未进行去转义
- 修复内置插件为进行去转义，修改内置插件为 cqhttp 定制 - 修复内置插件为进行去转义，修改内置插件为 cqhttp 定制
- 出于**CQ 码安全性考虑**，使用 cqhttp 的 `bot.send` 或者 `matcher.send` 时默认对字符串进行转义
## v2.0.0a7 ## v2.0.0a7