mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-13 09:01:54 +00:00
Fix QQ voice attachment SSRF validation
This commit is contained in:
parent
a97b08e30c
commit
590c9964e1
2 changed files with 53 additions and 1 deletions
|
|
@ -64,6 +64,7 @@ from gateway.platforms.base import (
|
|||
MessageEvent,
|
||||
MessageType,
|
||||
SendResult,
|
||||
_ssrf_redirect_guard,
|
||||
cache_document_from_bytes,
|
||||
cache_image_from_bytes,
|
||||
)
|
||||
|
|
@ -226,7 +227,11 @@ class QQAdapter(BasePlatformAdapter):
|
|||
return False
|
||||
|
||||
try:
|
||||
self._http_client = httpx.AsyncClient(timeout=30.0, follow_redirects=True)
|
||||
self._http_client = httpx.AsyncClient(
|
||||
timeout=30.0,
|
||||
follow_redirects=True,
|
||||
event_hooks={"response": [_ssrf_redirect_guard]},
|
||||
)
|
||||
|
||||
# 1. Get access token
|
||||
await self._ensure_token()
|
||||
|
|
@ -1101,6 +1106,11 @@ class QQAdapter(BasePlatformAdapter):
|
|||
is_pre_wav = True
|
||||
logger.info("[QQ] STT: using voice_wav_url (pre-converted WAV)")
|
||||
|
||||
from tools.url_safety import is_safe_url
|
||||
if not is_safe_url(download_url):
|
||||
logger.warning("[QQ] STT blocked unsafe URL: %s", download_url[:80])
|
||||
return None
|
||||
|
||||
try:
|
||||
# 2. Download audio (QQ CDN requires Authorization header)
|
||||
if not self._http_client:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
"""Tests for the QQ Bot platform adapter."""
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
|
|
@ -149,6 +150,47 @@ class TestIsVoiceContentType:
|
|||
assert self._fn("", "recording.amr") is True
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Voice attachment SSRF protection
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestVoiceAttachmentSSRFProtection:
|
||||
def _make_adapter(self, **extra):
|
||||
from gateway.platforms.qqbot import QQAdapter
|
||||
return QQAdapter(_make_config(**extra))
|
||||
|
||||
def test_stt_blocks_unsafe_download_url(self):
|
||||
adapter = self._make_adapter(app_id="a", client_secret="b")
|
||||
adapter._http_client = mock.AsyncMock()
|
||||
|
||||
with mock.patch("tools.url_safety.is_safe_url", return_value=False):
|
||||
transcript = asyncio.run(
|
||||
adapter._stt_voice_attachment(
|
||||
"http://127.0.0.1/voice.silk",
|
||||
"audio/silk",
|
||||
"voice.silk",
|
||||
)
|
||||
)
|
||||
|
||||
assert transcript is None
|
||||
adapter._http_client.get.assert_not_called()
|
||||
|
||||
def test_connect_uses_redirect_guard_hook(self):
|
||||
from gateway.platforms.qqbot import QQAdapter, _ssrf_redirect_guard
|
||||
|
||||
client = mock.AsyncMock()
|
||||
with mock.patch("gateway.platforms.qqbot.httpx.AsyncClient", return_value=client) as async_client_cls:
|
||||
adapter = QQAdapter(_make_config(app_id="a", client_secret="b"))
|
||||
adapter._ensure_token = mock.AsyncMock(side_effect=RuntimeError("stop after client creation"))
|
||||
|
||||
connected = asyncio.run(adapter.connect())
|
||||
|
||||
assert connected is False
|
||||
assert async_client_cls.call_count == 1
|
||||
kwargs = async_client_cls.call_args.kwargs
|
||||
assert kwargs.get("follow_redirects") is True
|
||||
assert kwargs.get("event_hooks", {}).get("response") == [_ssrf_redirect_guard]
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# _strip_at_mention
|
||||
# ---------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue