mirror of
https://github.com/MODSetter/SurfSense.git
synced 2026-06-02 19:55:18 +02:00
fix(gateway): harden Telegram webhook intake
This commit is contained in:
Anish Sarkar
parent
a57b741d5e
commit
72024353f9
3 changed files with 231 additions and 67 deletions
|
|
@ -2,6 +2,9 @@
|
|||
|
||||
from __future__ import annotations
|
||||
|
||||
import hmac
|
||||
import logging
|
||||
import uuid
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any
|
||||
|
||||
|
|
@ -13,10 +16,10 @@ from starlette.responses import Response
|
|||
|
||||
from app.config import config
|
||||
from app.db import (
|
||||
GatewayBindingState,
|
||||
GatewayConversationBinding,
|
||||
GatewayPlatform,
|
||||
GatewayPlatformAccount,
|
||||
ExternalChatBindingState,
|
||||
ExternalChatBinding,
|
||||
ExternalChatPlatform,
|
||||
ExternalChatAccount,
|
||||
User,
|
||||
get_async_session,
|
||||
)
|
||||
|
|
@ -24,15 +27,18 @@ from app.gateway.accounts import get_or_create_system_telegram_account
|
|||
from app.gateway.bindings import resume_binding, revoke_binding
|
||||
from app.gateway.inbox import persist_inbound_event, telegram_event_dedupe_key
|
||||
from app.gateway.pairing import generate_pairing_code, pairing_expires_at
|
||||
from app.observability.metrics import record_gateway_inbox_write
|
||||
from app.rate_limiter import limiter
|
||||
from app.observability.metrics import (
|
||||
record_gateway_inbox_write,
|
||||
record_gateway_webhook_parse_error,
|
||||
)
|
||||
from app.users import current_active_user
|
||||
|
||||
router = APIRouter(prefix="/gateway", tags=["gateway"])
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class StartBindingRequest(BaseModel):
|
||||
platform: GatewayPlatform = GatewayPlatform.TELEGRAM
|
||||
platform: ExternalChatPlatform = ExternalChatPlatform.TELEGRAM
|
||||
search_space_id: int
|
||||
|
||||
|
||||
|
|
@ -60,63 +66,63 @@ def _telegram_message(payload: dict[str, Any]) -> dict[str, Any] | None:
|
|||
async def _resolve_webhook_account(
|
||||
session: AsyncSession,
|
||||
*,
|
||||
secret: str,
|
||||
account_id: int,
|
||||
header_secret: str | None,
|
||||
) -> GatewayPlatformAccount:
|
||||
if config.TELEGRAM_WEBHOOK_SECRET and secret == config.TELEGRAM_WEBHOOK_SECRET:
|
||||
if header_secret != config.TELEGRAM_WEBHOOK_SECRET:
|
||||
raise HTTPException(status_code=403, detail="Invalid Telegram webhook secret")
|
||||
return await get_or_create_system_telegram_account(session)
|
||||
|
||||
result = await session.execute(
|
||||
select(GatewayPlatformAccount).where(
|
||||
GatewayPlatformAccount.platform == GatewayPlatform.TELEGRAM
|
||||
)
|
||||
)
|
||||
for account in result.scalars():
|
||||
metadata = account.account_metadata or {}
|
||||
webhook_secret = metadata.get("webhook_secret")
|
||||
if webhook_secret and webhook_secret == secret:
|
||||
if header_secret != webhook_secret:
|
||||
raise HTTPException(status_code=403, detail="Invalid Telegram webhook secret")
|
||||
return account
|
||||
|
||||
raise HTTPException(status_code=404, detail="Gateway account not found")
|
||||
) -> ExternalChatAccount:
|
||||
account = await session.get(ExternalChatAccount, account_id)
|
||||
if account is None or account.platform != ExternalChatPlatform.TELEGRAM:
|
||||
raise HTTPException(status_code=404, detail="Gateway account not found")
|
||||
expected_secret = account.webhook_secret or ""
|
||||
if not expected_secret or not hmac.compare_digest(header_secret or "", expected_secret):
|
||||
raise HTTPException(status_code=403, detail="Invalid Telegram webhook secret")
|
||||
return account
|
||||
|
||||
|
||||
@router.post("/webhooks/telegram/{secret}")
|
||||
@limiter.limit("60/minute", key_func=lambda request: f"tg-webhook:{request.path_params['secret']}")
|
||||
@router.post("/webhooks/telegram/{account_id}")
|
||||
async def telegram_webhook(
|
||||
request: Request,
|
||||
secret: str,
|
||||
account_id: int,
|
||||
session: AsyncSession = Depends(get_async_session),
|
||||
) -> Response:
|
||||
payload = await request.json()
|
||||
account = await _resolve_webhook_account(
|
||||
session,
|
||||
secret=secret,
|
||||
header_secret=request.headers.get("X-Telegram-Bot-Api-Secret-Token"),
|
||||
)
|
||||
update_id = payload.get("update_id")
|
||||
if update_id is None:
|
||||
request_id = f"gateway_{uuid.uuid4().hex[:16]}"
|
||||
try:
|
||||
payload = await request.json()
|
||||
except ValueError:
|
||||
record_gateway_webhook_parse_error()
|
||||
return Response(status_code=200)
|
||||
|
||||
message = _telegram_message(payload) or {}
|
||||
inbox_id = await persist_inbound_event(
|
||||
account = await _resolve_webhook_account(
|
||||
session,
|
||||
account_id=account.id,
|
||||
platform=GatewayPlatform.TELEGRAM,
|
||||
event_dedupe_key=telegram_event_dedupe_key(update_id),
|
||||
external_event_id=str(update_id),
|
||||
external_message_id=(
|
||||
str(message["message_id"]) if message.get("message_id") is not None else None
|
||||
),
|
||||
event_kind=_classify_telegram_event(payload),
|
||||
raw_payload=payload,
|
||||
account_id=account_id,
|
||||
header_secret=request.headers.get("X-Telegram-Bot-Api-Secret-Token"),
|
||||
)
|
||||
await session.commit()
|
||||
record_gateway_inbox_write(platform="telegram", dedup_skipped=inbox_id is None)
|
||||
return Response(status_code=200)
|
||||
|
||||
try:
|
||||
update_id = payload.get("update_id")
|
||||
if update_id is None:
|
||||
return Response(status_code=200)
|
||||
|
||||
message = _telegram_message(payload) or {}
|
||||
inbox_id = await persist_inbound_event(
|
||||
session,
|
||||
account_id=account.id,
|
||||
platform=ExternalChatPlatform.TELEGRAM,
|
||||
event_dedupe_key=telegram_event_dedupe_key(update_id),
|
||||
external_event_id=str(update_id),
|
||||
external_message_id=(
|
||||
str(message["message_id"]) if message.get("message_id") is not None else None
|
||||
),
|
||||
event_kind=_classify_telegram_event(payload),
|
||||
raw_payload=payload,
|
||||
request_id=request_id,
|
||||
)
|
||||
await session.commit()
|
||||
record_gateway_inbox_write(platform="telegram", dedup_skipped=inbox_id is None)
|
||||
return Response(status_code=200)
|
||||
except Exception:
|
||||
await session.rollback()
|
||||
logger.exception("Telegram webhook processing failed account_id=%s", account_id)
|
||||
return Response(status_code=200)
|
||||
|
||||
|
||||
@router.post("/bindings/start", response_model=StartBindingResponse)
|
||||
|
|
@ -125,17 +131,17 @@ async def start_binding(
|
|||
user: User = Depends(current_active_user),
|
||||
session: AsyncSession = Depends(get_async_session),
|
||||
) -> StartBindingResponse:
|
||||
if body.platform != GatewayPlatform.TELEGRAM:
|
||||
if body.platform != ExternalChatPlatform.TELEGRAM:
|
||||
raise HTTPException(status_code=400, detail="Only Telegram is supported in v1")
|
||||
|
||||
account = await get_or_create_system_telegram_account(session)
|
||||
code = generate_pairing_code()
|
||||
expires_at = pairing_expires_at()
|
||||
binding = GatewayConversationBinding(
|
||||
binding = ExternalChatBinding(
|
||||
account_id=account.id,
|
||||
user_id=user.id,
|
||||
search_space_id=body.search_space_id,
|
||||
state=GatewayBindingState.PENDING,
|
||||
state=ExternalChatBindingState.PENDING,
|
||||
pairing_code=code,
|
||||
pairing_code_expires_at=expires_at,
|
||||
)
|
||||
|
|
@ -143,7 +149,7 @@ async def start_binding(
|
|||
await session.commit()
|
||||
await session.refresh(binding)
|
||||
|
||||
username = account.account_metadata.get("bot_username") or config.TELEGRAM_SHARED_BOT_USERNAME
|
||||
username = account.bot_username or config.TELEGRAM_SHARED_BOT_USERNAME
|
||||
if not username:
|
||||
raise HTTPException(status_code=500, detail="Telegram bot username is not configured")
|
||||
return StartBindingResponse(
|
||||
|
|
@ -160,8 +166,8 @@ async def list_bindings(
|
|||
session: AsyncSession = Depends(get_async_session),
|
||||
) -> list[dict[str, Any]]:
|
||||
result = await session.execute(
|
||||
select(GatewayConversationBinding).where(
|
||||
GatewayConversationBinding.user_id == user.id
|
||||
select(ExternalChatBinding).where(
|
||||
ExternalChatBinding.user_id == user.id
|
||||
)
|
||||
)
|
||||
return [
|
||||
|
|
@ -184,9 +190,9 @@ async def list_platforms(
|
|||
session: AsyncSession = Depends(get_async_session),
|
||||
) -> list[dict[str, Any]]:
|
||||
result = await session.execute(
|
||||
select(GatewayPlatformAccount).where(
|
||||
(GatewayPlatformAccount.owner_user_id == user.id)
|
||||
| (GatewayPlatformAccount.is_system_account.is_(True))
|
||||
select(ExternalChatAccount).where(
|
||||
(ExternalChatAccount.owner_user_id == user.id)
|
||||
| (ExternalChatAccount.is_system_account.is_(True))
|
||||
)
|
||||
)
|
||||
return [
|
||||
|
|
@ -194,7 +200,7 @@ async def list_platforms(
|
|||
"id": account.id,
|
||||
"platform": account.platform.value,
|
||||
"mode": account.mode.value,
|
||||
"bot_username": (account.account_metadata or {}).get("bot_username"),
|
||||
"bot_username": account.bot_username,
|
||||
"health_status": account.health_status.value,
|
||||
"last_health_check_at": account.last_health_check_at,
|
||||
}
|
||||
|
|
@ -208,7 +214,7 @@ async def delete_binding(
|
|||
user: User = Depends(current_active_user),
|
||||
session: AsyncSession = Depends(get_async_session),
|
||||
) -> dict[str, bool]:
|
||||
binding = await session.get(GatewayConversationBinding, binding_id)
|
||||
binding = await session.get(ExternalChatBinding, binding_id)
|
||||
if binding is None or binding.user_id != user.id:
|
||||
raise HTTPException(status_code=404, detail="Binding not found")
|
||||
revoke_binding(binding)
|
||||
|
|
@ -217,12 +223,12 @@ async def delete_binding(
|
|||
|
||||
|
||||
@router.post("/bindings/{binding_id}/resume")
|
||||
async def resume_gateway_binding(
|
||||
async def resume_external_chat_binding(
|
||||
binding_id: int,
|
||||
user: User = Depends(current_active_user),
|
||||
session: AsyncSession = Depends(get_async_session),
|
||||
) -> dict[str, bool]:
|
||||
binding = await session.get(GatewayConversationBinding, binding_id)
|
||||
binding = await session.get(ExternalChatBinding, binding_id)
|
||||
if binding is None or binding.user_id != user.id:
|
||||
raise HTTPException(status_code=404, detail="Binding not found")
|
||||
resume_binding(binding)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue