feat: outbound webhooks for payment/subscription events
Per the docs.rw comparison researched earlier tonight, Remnawave fires webhooks for users+nodes and Marzban for users — this panel had neither, only received inbound webhooks from payment providers. New webhooks.py, fired on payment.paid (both webhook-driven and reconciler-driven grant paths, so it fires regardless of which one actually processes a given payment) and subscription.granted_by_admin (kept as a distinct event name rather than reusing payment.paid, since no money necessarily changed hands there). Settings tab gets a URL field; a secret is generated once on first save via secrets.token_hex and never regenerated on later URL edits, so a receiver's signature verification doesn't silently break when the admin just updates the endpoint. Every delivery is HMAC-SHA256 signed over the raw JSON body via X-Signature, same verification shape Platega already uses for its inbound webhooks. Delivery is fire-and-forget (10s timeout, swallows all exceptions) — a receiver being down must never block or fail a payment grant. Reads WEBHOOK_URL/WEBHOOK_SECRET fresh from .env via legal.py's existing reader instead of adding a third copy of that logic. Verified with a real local HTTP server: actual delivery, payload shape, and that the received X-Signature verifies against the configured secret using the receiver's own side of the HMAC — not just asserting the sender computed *something*. Also verified the no-URL-configured no-op path and that changing the URL later does not rotate the secret. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
parent
24a1b26df2
commit
4b86406041
4 changed files with 100 additions and 1 deletions
34
api.py
34
api.py
|
|
@ -3,6 +3,7 @@ import datetime
|
|||
import json
|
||||
import os
|
||||
import re
|
||||
import secrets
|
||||
import subprocess
|
||||
import urllib.request
|
||||
from fastapi import FastAPI, HTTPException, Request, Response, File, UploadFile
|
||||
|
|
@ -17,6 +18,7 @@ import links
|
|||
import nodeprov
|
||||
import payments
|
||||
import totp
|
||||
import webhooks
|
||||
import xray_manager
|
||||
from config import (
|
||||
PLANS, PLANS_BY_CODE, SITE_DOMAIN, SUB_DOMAIN, PANEL_DOMAIN,
|
||||
|
|
@ -328,6 +330,15 @@ def _grant_paid_subscription(payment_id: str):
|
|||
f"Срок: {plan['label']} — до {sub['expires_at'][:10]}\n\n"
|
||||
f"Ссылка-подписка:\nhttps://{SUB_DOMAIN}/sub/{user['token']}",
|
||||
)
|
||||
webhooks.send("payment.paid", {
|
||||
"tg_id": payment["tg_id"],
|
||||
"amount": payment["amount"],
|
||||
"provider": payment["provider"],
|
||||
"node": payment["node"],
|
||||
"plan": payment["plan"],
|
||||
"subscription_uuid": sub["uuid"],
|
||||
"expires_at": sub["expires_at"],
|
||||
})
|
||||
|
||||
|
||||
def _check_and_reconcile_payment(payment: dict) -> str:
|
||||
|
|
@ -456,6 +467,25 @@ def admin_set_platega_settings(request: Request, body: dict = Body(...)):
|
|||
return {"ok": True, "restarted_bot": restarted}
|
||||
|
||||
|
||||
@app.get("/admin/api/webhook-settings")
|
||||
def admin_get_webhook_settings(request: Request):
|
||||
require_admin(request)
|
||||
return {
|
||||
"url": legal.read_env_var("WEBHOOK_URL", ""),
|
||||
"secret": legal.read_env_var("WEBHOOK_SECRET", ""),
|
||||
}
|
||||
|
||||
|
||||
@app.post("/admin/api/webhook-settings")
|
||||
def admin_set_webhook_settings(request: Request, body: dict = Body(...)):
|
||||
require_admin(request)
|
||||
url = (body.get("url") or "").strip()
|
||||
_update_env_var("WEBHOOK_URL", url)
|
||||
if url and not legal.read_env_var("WEBHOOK_SECRET", ""):
|
||||
_update_env_var("WEBHOOK_SECRET", secrets.token_hex(24))
|
||||
return {"url": legal.read_env_var("WEBHOOK_URL", ""), "secret": legal.read_env_var("WEBHOOK_SECRET", "")}
|
||||
|
||||
|
||||
@app.post("/payments/webhook/yookassa")
|
||||
async def yookassa_webhook(request: Request):
|
||||
body = await request.json()
|
||||
|
|
@ -864,6 +894,10 @@ def admin_grant_subscription(tg_id: int, request: Request, body: dict = Body(...
|
|||
db.get_or_create_user(tg_id, None)
|
||||
sub = db.create_subscription(tg_id, node_code, plan["days"], plan_code, source="admin")
|
||||
xray_manager.add_client_to_node(node, sub["uuid"], email=sub["uuid"])
|
||||
webhooks.send("subscription.granted_by_admin", {
|
||||
"tg_id": tg_id, "node": node_code, "plan": plan_code,
|
||||
"subscription_uuid": sub["uuid"], "expires_at": sub["expires_at"],
|
||||
})
|
||||
return sub
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue