savsis
7cc50973f6
User ask, paraphrased: install it, get help wiring up payments, and
immediately have a ready site under your own name — not "MBS Panel"
plastered everywhere and a bunch of manual follow-up.
Two things were actually broken/missing, found by tracing every surface
a real customer or the operator would see:
1. "MBS Panel" was hardcoded in ~20 places (bot messages, subscription
page, admin panel splash/title/sidebar, legal pages, 2FA issuer,
install.sh) with zero way to change it short of editing source.
New BRAND_NAME config value (config.py default "MBS Panel", so this
is 100% backward compatible for existing installs) wired through
everywhere via the same live-settings pattern from the last commit
(settings.get_brand_name(), no restart needed anywhere it's used).
New Настройки → «Название» section in the admin panel to change it.
2. site/index.html and site/cabinet.html — a fully-built landing page +
personal-cabinet template, already in the repo — were never actually
served by anything. Not mounted by FastAPI, not deployed by
install.sh, not linked from anywhere. Pure dead weight: a repo that
looked like it shipped a client site but didn't. Now legal.py gets a
render_site_page() (same {{TOKEN}} substitution + HTML-escaping as
the existing offer/privacy renderer, new tokens: BRAND_NAME,
SITE_DOMAIN, SUB_DOMAIN, BOT_USERNAME) and GET "/" serves the branded
landing page on any host that isn't PANEL_DOMAIN (in practice:
SUB_DOMAIN, which nginx already routes to this backend — zero
install.sh/nginx/certbot changes needed, so this is live on every
existing install without an upgrade step beyond `mbs update`).
GET /cabinet.html serves the cabinet. Landing page's pricing section
now fetches real, live prices from a new public GET /api/plans
instead of showing static duration labels with no numbers.
Also fixed along the way, same staleness-bug class as the payments/HWID
fix last commit, found by grepping for every remaining frozen `from
config import ...` in api.py: BOT_TOKEN/BOT_USERNAME were still frozen
constants in api.py (mbs-api never restarts itself). Concretely this
meant: changing the bot via Настройки → Telegram-бот would leave
_tg_send_message (payment-received notifications) silently trying the
OLD token, admin_get_bot_settings showing the OLD username right after
a successful save, and gift-code links pointing at the OLD bot — all
until a manual mbs restart, same shape as the Platega-secret bug fixed
last commit. Added settings.bot_credentials(), wired it through every
call site (hoisted out of loops where relevant, same N+1 discipline as
always), removed the now-stale "выполни mbs restart" copy from the bot
settings hint.
legal.py's own BOT_USERNAME import was frozen too (used by the /offer
and /privacy {{BOT_USERNAME}} token) — switched to reading it live
in-module (no settings.py import from legal.py, would've been circular
since settings.py already imports legal.py for the env reader).
install.sh: new interactive prompt for the brand name (default "MBS
Panel", so hitting enter reproduces today's behavior exactly), written
to .env, echoed in the final summary along with the now-live site URL.
Verification: same story as always — api.py/bot.py still can't import
locally (no pydantic-core wheel for Python 3.14 on this machine).
py_compile + pyflakes clean across the whole repo. Real runtime test
against an isolated .env fixture: brand name and bot-credential live
reads (no reimport), render_site_page() token substitution correctness
on the actual site/index.html and site/cabinet.html files including an
XSS check (brand name containing <script> comes out HTML-escaped), and
a regression check that adding the BRAND_NAME token to the existing
legal.render() didn't break offer.html/privacy.html. Extracted
SUB_PAGE_TEMPLATE/SUB_PAGE_EXPIRED_TEMPLATE via ast from api.py (can't
import the module, but can pull the string constants) and ran the real
.format() calls against them to catch any brace-escaping mistake in the
new {brand_name} placeholder — CSS braces in those templates are
already double-escaped for .format(), easy to get wrong. Extracted and
node --check'd admin.html's whole inline script, div-tag-balance check
on the full file. install.sh's new prompt+heredoc snippet run standalone
with piped stdin (both a brand name with spaces and an empty/default
input), round-tripped the resulting .env back through the real
env-parsing logic. Extended the existing CI "app wiring" step (which
does import api/bot for real on Linux) with branding assertions calling
the actual route functions directly (api.root(), api.public_plans(),
api.public_branding()) — ran every part of that step's new logic that
doesn't need api.py locally first, to catch what's catchable before
trusting the rest to CI once the account's abuse-review lifts.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
69 lines
2.7 KiB
Text
69 lines
2.7 KiB
Text
# Copy this to .env and fill in real values. Never commit .env.
|
|
|
|
# Shown to clients everywhere: site, bot, subscription page, offer/privacy, panel
|
|
# login. Also editable live from Настройки in the admin panel, no restart needed.
|
|
BRAND_NAME=MBS Panel
|
|
|
|
# From @BotFather
|
|
BOT_TOKEN=123456789:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
|
BOT_USERNAME=YourBot_robot
|
|
|
|
# Telegram user IDs allowed into the bot's admin menu and the web panel, comma-separated
|
|
ADMIN_IDS=111111111,222222222
|
|
|
|
# Web panel login password — must be a real random string, min 8 chars
|
|
# (panel refuses to start on "change-me"/"admin"/etc). Generate one: openssl rand -base64 12
|
|
# Change it any time with: mbs pass
|
|
ADMIN_PANEL_PASSWORD=
|
|
|
|
# Domains — point all three A records at this server's IP (see README)
|
|
PANEL_DOMAIN=panel.example.com
|
|
SUB_DOMAIN=sub.example.com
|
|
SITE_DOMAIN=example.com
|
|
|
|
# Reality identity for the local node (this same box). Generate with:
|
|
# /usr/local/bin/xray x25519
|
|
# XRAY_PUBLIC_KEY is the "Password (PublicKey)" line; keep the matching
|
|
# private key only inside /usr/local/etc/xray/config.json (never here).
|
|
XRAY_PUBLIC_KEY=
|
|
REALITY_SNI=www.wildberries.ru
|
|
|
|
# Any 16-hex-char string per transport, e.g.: openssl rand -hex 8
|
|
XRAY_SHORT_ID_TCP=
|
|
XRAY_SHORT_ID_GRPC=
|
|
XRAY_SHORT_ID_XHTTP=
|
|
|
|
# Public hostname clients connect to for the local node (A record -> this server)
|
|
DE1_ADDRESS=de1.example.com
|
|
|
|
# Payments — off by default, bot keeps handing out free subscriptions on button press.
|
|
# Flip to true only once at least one provider below is configured and its webhook is live.
|
|
# All of this (toggle, prices, provider keys) is also editable live from the admin panel
|
|
# (Платежи tab) after first boot — no need to hand-edit this file or restart afterwards.
|
|
PAYMENTS_ENABLED=false
|
|
|
|
# Prices in RUB per plan (whole numbers). Only used when PAYMENTS_ENABLED=true.
|
|
PRICE_7D=150
|
|
PRICE_1M=399
|
|
PRICE_3M=999
|
|
PRICE_6M=1799
|
|
PRICE_1Y=2999
|
|
|
|
# ЮKassa — https://yookassa.ru, shop id + secret key from your account settings.
|
|
# Webhook to add in their dashboard: https://<PANEL_DOMAIN>/payments/webhook/yookassa
|
|
YOOKASSA_ENABLED=false
|
|
YOOKASSA_SHOP_ID=
|
|
YOOKASSA_SECRET_KEY=
|
|
|
|
# Platega — https://platega.io, merchant id + secret from your manager.
|
|
# Webhook to add in their dashboard: https://<PANEL_DOMAIN>/payments/webhook/platega
|
|
PLATEGA_ENABLED=false
|
|
PLATEGA_MERCHANT_ID=
|
|
PLATEGA_SECRET=
|
|
|
|
# Device limit (HWID) — off by default. Requires the VPN client app to send an
|
|
# x-hwid header on subscription fetch (Happ/v2rayTun-class apps do this); clients
|
|
# that don't send it get refused once enabled, so only flip this on if your users'
|
|
# apps actually support it. Also editable live from Настройки in the admin panel.
|
|
HWID_LIMIT_ENABLED=false
|
|
HWID_FALLBACK_LIMIT=3
|