Skip to content

QQ官方机器人增加沙盒模式选项，让本地部署能跳过IP白名单验证 #3087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −10
Open

QQ官方机器人增加沙盒模式选项，让本地部署能跳过IP白名单验证 #3087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions astrbot/core/config/default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
"enable": False,
"appid": "",
"secret": "",
"is_sandbox": False,
"callback_server_host": "0.0.0.0",
"port": 6196,
},
Expand Down
15 changes: 5 additions & 10 deletions astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@ def __init__(self, config: dict, event_queue: asyncio.Queue, botpy_client: Clien
self.appid = config["appid"]
self.secret = config["secret"]
self.port = config.get("port", 6196)
self.is_sandbox = config.get("is_sandbox", False)
self.callback_server_host = config.get("callback_server_host", "0.0.0.0")

if isinstance(self.port, str):
self.port = int(self.port)

self.http: BotHttp = BotHttp(timeout=300)
self.http: BotHttp = BotHttp(timeout=300, is_sandbox=self.is_sandbox)
self.api: BotAPI = BotAPI(http=self.http)
self.token = Token(self.appid, self.secret)

self.server = quart.Quart(__name__)
self.server.add_url_rule(
"/astrbot-qo-webhook/callback", view_func=self.callback, methods=["POST"]
)
self.server.add_url_rule("/astrbot-qo-webhook/callback", view_func=self.callback, methods=["POST"])
self.client = botpy_client
self.event_queue = event_queue
self.shutdown_event = asyncio.Event()
Expand Down Expand Up @@ -60,9 +59,7 @@ async def repeat_seed(self, bot_secret: str, target_size: int = 32) -> bytes:
async def webhook_validation(self, validation_payload: dict):
seed = await self.repeat_seed(self.secret)
private_key = ed25519.Ed25519PrivateKey.from_private_bytes(seed)
msg = validation_payload.get("event_ts", "") + validation_payload.get(
"plain_token", ""
)
msg = validation_payload.get("event_ts", "") + validation_payload.get("plain_token", "")
# sign
signature = private_key.sign(msg.encode()).hex()
response = {
Expand Down Expand Up @@ -97,9 +94,7 @@ async def callback(self):
return {"opcode": 12}

async def start_polling(self):
logger.info(
f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。"
)
logger.info(f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。")
await self.server.run_task(
host=self.callback_server_host,
port=self.port,
Expand Down