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>
73 lines
5.2 KiB
HTML
73 lines
5.2 KiB
HTML
<!doctype html>
|
||
<html lang="ru">
|
||
<head>
|
||
<meta charset="utf-8">
|
||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||
<title>{{BRAND_NAME}} — Публичная оферта</title>
|
||
<style>
|
||
:root {
|
||
--bg: #0a0b0f; --card: #131519; --border: #1e2128;
|
||
--text: #eceef2; --muted: #868c99; --accent: #7c6cf0;
|
||
--ease: cubic-bezier(0.16, 1, 0.3, 1);
|
||
}
|
||
* { box-sizing: border-box; }
|
||
body {
|
||
margin: 0; background: var(--bg); color: var(--text);
|
||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
||
-webkit-font-smoothing: antialiased; line-height: 1.6;
|
||
}
|
||
a { color: var(--accent); }
|
||
.wrap { max-width: 720px; margin: 0 auto; padding: 48px 24px 80px; }
|
||
.back { color: var(--muted); text-decoration: none; font-size: 14px; }
|
||
.back:hover { color: var(--text); }
|
||
h1 { font-size: 26px; margin: 24px 0 6px; letter-spacing: -0.02em; }
|
||
.updated { color: var(--muted); font-size: 13px; margin-bottom: 36px; }
|
||
h2 { font-size: 17px; margin: 36px 0 10px; font-weight: 600; }
|
||
p, li { color: var(--text); font-size: 14.5px; }
|
||
.muted { color: var(--muted); }
|
||
.fill { color: var(--accent); background: rgba(124,108,240,0.1); padding: 1px 5px; border-radius: 4px; }
|
||
ol { padding-left: 20px; }
|
||
li { margin-bottom: 8px; }
|
||
</style>
|
||
</head>
|
||
<body>
|
||
<div class="wrap">
|
||
<a class="back" href="/">← На главную</a>
|
||
<h1>Публичная оферта</h1>
|
||
<p class="updated">Действует с {{EFFECTIVE_DATE}}</p>
|
||
|
||
<p>Настоящий документ является публичной офертой {{LEGAL_NAME}}, {{INN}} (далее — «Исполнитель»), адресованной любому дееспособному физическому лицу (далее — «Клиент»), на заключение договора о предоставлении доступа к VPN-сервису на условиях, указанных ниже. Оплата услуги означает полное и безоговорочное принятие условий оферты (акцепт).</p>
|
||
|
||
<h2>1. Предмет договора</h2>
|
||
<p>Исполнитель предоставляет Клиенту доступ к серверу VPN (VLESS/Hysteria2) на срок, соответствующий выбранному тарифу, через Telegram-бота {{BOT_USERNAME}}. Доступ выдаётся автоматически после подтверждения оплаты.</p>
|
||
|
||
<h2>2. Стоимость и порядок оплаты</h2>
|
||
<ol>
|
||
<li>Стоимость тарифов указана в боте на момент оформления и может изменяться Исполнителем в одностороннем порядке — уже оплаченные периоды это не затрагивает.</li>
|
||
<li>Оплата принимается через платёжных провайдеров ЮKassa / Platega банковской картой или СБП. Реквизиты карты Исполнителю не передаются и не хранятся — оплата проходит на стороне провайдера.</li>
|
||
<li>Доступ активируется автоматически в течение нескольких минут после поступления подтверждения оплаты от провайдера.</li>
|
||
</ol>
|
||
|
||
<h2>3. Срок действия и продление</h2>
|
||
<p>Доступ предоставляется на срок выбранного тарифа (от 7 дней до 1 года) и автоматически прекращается по истечении срока. Продление — отдельной оплатой, автосписание не производится.</p>
|
||
|
||
<h2>4. Возврат средств</h2>
|
||
<p>Возврат возможен в течение {{REFUND_HOURS}} часов с момента оплаты, если доступ ни разу не был использован (не было подключений к серверу), — по обращению в поддержку {{SUPPORT_CONTACT}}. После начала использования услуга считается оказанной.</p>
|
||
|
||
<h2>5. Права и обязанности сторон</h2>
|
||
<ol>
|
||
<li>Клиент обязуется не использовать доступ для рассылки спама, DDoS-атак, распространения вредоносного ПО и иной деятельности, запрещённой законодательством РФ.</li>
|
||
<li>Исполнитель вправе приостановить доступ Клиента при нарушении п. 5.1 без возврата средств.</li>
|
||
<li>Исполнитель не гарантирует бесперебойную работу сервиса на 100% времени — возможны технические перерывы для обслуживания.</li>
|
||
</ol>
|
||
|
||
<h2>6. Реквизиты Исполнителя</h2>
|
||
<p class="muted">
|
||
{{LEGAL_NAME}}<br>
|
||
ИНН {{INN}}<br>
|
||
Email: {{SUPPORT_EMAIL}}<br>
|
||
Telegram: {{SUPPORT_CONTACT}}
|
||
</p>
|
||
</div>
|
||
</body>
|
||
</html>
|