2026-09-10 17:45:36 +05:00
|
|
|
import os
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _load_dotenv(path):
|
|
|
|
|
if not os.path.exists(path):
|
|
|
|
|
return
|
|
|
|
|
with open(path, encoding="utf-8") as f:
|
|
|
|
|
for line in f:
|
|
|
|
|
line = line.strip()
|
|
|
|
|
if not line or line.startswith("#") or "=" not in line:
|
|
|
|
|
continue
|
|
|
|
|
key, _, value = line.partition("=")
|
|
|
|
|
os.environ.setdefault(key.strip(), value.strip())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
|
|
|
|
_load_dotenv(os.path.join(BASE_DIR, ".env"))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def env(key, default=None, required=False):
|
|
|
|
|
val = os.environ.get(key, default)
|
|
|
|
|
if required and not val:
|
|
|
|
|
raise RuntimeError(f"missing required env var: {key} — copy .env.example to .env and fill it in")
|
|
|
|
|
return val
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BOT_TOKEN = env("BOT_TOKEN", required=True)
|
|
|
|
|
BOT_USERNAME = env("BOT_USERNAME", required=True)
|
|
|
|
|
ADMIN_IDS = {int(x) for x in env("ADMIN_IDS", "").split(",") if x.strip()}
|
2026-09-10 18:14:05 +05:00
|
|
|
|
2026-09-10 17:45:36 +05:00
|
|
|
ADMIN_PANEL_PASSWORD = env("ADMIN_PANEL_PASSWORD", required=True)
|
2026-09-10 18:14:05 +05:00
|
|
|
if ADMIN_PANEL_PASSWORD in ("change-me", "changeme", "admin", "password") or len(ADMIN_PANEL_PASSWORD) < 8:
|
|
|
|
|
raise RuntimeError(
|
|
|
|
|
"ADMIN_PANEL_PASSWORD в .env слишком слабый или дефолтный — поставь случайный пароль "
|
|
|
|
|
"(например: mbs pass)"
|
|
|
|
|
)
|
|
|
|
|
|
2026-09-10 17:45:36 +05:00
|
|
|
PANEL_DOMAIN = env("PANEL_DOMAIN", required=True)
|
|
|
|
|
SUB_DOMAIN = env("SUB_DOMAIN", required=True)
|
|
|
|
|
SITE_DOMAIN = env("SITE_DOMAIN", required=True)
|
feat: custom brand name everywhere + a working client-facing site out of the box
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>
2026-09-13 23:52:54 +05:00
|
|
|
BRAND_NAME = env("BRAND_NAME", "MBS Panel")
|
feat: optional custom admin login path — matches a Remnawave-listed security measure Marzban doesn't have
Pulled a fresh copy of docs.rw's own Remnawave-vs-Marzban comparison
table (not working from memory of an earlier read) to check what's
still genuinely different after tonight's run of fixes — most rows
already match or beat both panels (multi-admin, 2FA, HWID limits,
backup/restore, host sorting, config validation, node autonomy, on-hold
status as of a few commits ago). One concrete, bounded, unclaimed row:
"Security measures in documentation" lists CF zero trust / custom path
/ Telegram OAuth / 2FA for Remnawave, nothing for Marzban. We already
had 2FA and rate-limiting; custom path was the missing, actually
implementable piece — everything else in that row is deployment
guidance, not panel code.
New ADMIN_PATH env var (config.py, defaults to "admin" — every existing
install keeps working exactly as before with zero action needed). The
page-serving route moves to whatever path is configured; root() on
PANEL_DOMAIN only falls through to serving admin.html when ADMIN_PATH
is still the default, otherwise it shows the same branded landing page
every other domain gets — so a scanner or a human guessing "/admin"
finds nothing once this is set, not even a redirect that confirms
something lives there.
Deliberately scoped to ONLY the page route. /admin/api/* stays fixed —
it's already behind real cookie+session auth (verified this while
auditing: every mutating admin route either calls require_admin() or
the equivalent _require_current_admin(), checked programmatically via
ast rather than trusting my memory of having added the check everywhere
— found nothing actually missing, which is itself worth knowing, not
just assumed). Moving the API namespace too would be a much bigger,
riskier rewrite of every @app decorator in the file for no real security
gain over what auth already provides.
Deliberately NOT exposed in the Settings UI, unlike almost everything
else made live-editable tonight. This one genuinely needs a process
restart to take effect (FastAPI resolves routes at import time, not
per-request), and a typo saved through the UI followed by a restart
is a real self-lockout risk with no web-based way back — same tier as
PANEL_DOMAIN/SUB_DOMAIN, which are also .env-only for the same reason.
.env + SSH is the correct blast radius for a setting that can lock you
out.
Verification: config.py's normalization (strip slashes, empty/lone-
slash/repeated-slash input all falling back to "admin" rather than
accidentally producing a route at bare "/") tested directly — 8 cases.
AST-extracted the updated root() out of api.py (still can't import the
module locally) and exercised its actual branching with a mocked
FileResponse/legal/request — confirmed the default case is byte-for-
byte the old behavior and the custom-path case stops serving admin.html
on PANEL_DOMAIN's root. Added a dedicated CI step that does what only a
real FastAPI import can prove: with ADMIN_PATH set, /xyz123secret is a
registered route, plain /admin is NOT (not just supplemented — actually
gone), and /admin/api/login is untouched.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-14 01:58:45 +05:00
|
|
|
ADMIN_PATH = env("ADMIN_PATH", "admin").strip("/") or "admin"
|
2026-09-10 17:45:36 +05:00
|
|
|
|
|
|
|
|
DB_PATH = os.path.join(BASE_DIR, "mbs.db")
|
|
|
|
|
XRAY_CONFIG_PATH = "/usr/local/etc/xray/config.json"
|
|
|
|
|
|
|
|
|
|
XRAY_PUBLIC_KEY = env("XRAY_PUBLIC_KEY", required=True)
|
|
|
|
|
REALITY_SNI = env("REALITY_SNI", "www.wildberries.ru")
|
|
|
|
|
XRAY_SHORT_ID_TCP = env("XRAY_SHORT_ID_TCP", required=True)
|
|
|
|
|
XRAY_SHORT_ID_GRPC = env("XRAY_SHORT_ID_GRPC", required=True)
|
|
|
|
|
XRAY_SHORT_ID_XHTTP = env("XRAY_SHORT_ID_XHTTP", required=True)
|
|
|
|
|
DE1_ADDRESS = env("DE1_ADDRESS", f"de1.{SITE_DOMAIN}")
|
|
|
|
|
|
|
|
|
|
DE1_TRANSPORTS = [
|
|
|
|
|
{
|
|
|
|
|
"tag": "vless-tcp-reality",
|
|
|
|
|
"label": "TCP + Reality (основной)",
|
|
|
|
|
"network": "tcp",
|
|
|
|
|
"security": "reality",
|
|
|
|
|
"address": DE1_ADDRESS,
|
|
|
|
|
"port": 443,
|
|
|
|
|
"public_key": XRAY_PUBLIC_KEY,
|
|
|
|
|
"short_id": XRAY_SHORT_ID_TCP,
|
|
|
|
|
"sni": REALITY_SNI,
|
|
|
|
|
"flow": "xtls-rprx-vision",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"tag": "vless-grpc-reality",
|
|
|
|
|
"label": "gRPC + Reality",
|
|
|
|
|
"network": "grpc",
|
|
|
|
|
"security": "reality",
|
|
|
|
|
"address": DE1_ADDRESS,
|
|
|
|
|
"port": 2053,
|
|
|
|
|
"public_key": XRAY_PUBLIC_KEY,
|
|
|
|
|
"short_id": XRAY_SHORT_ID_GRPC,
|
|
|
|
|
"sni": REALITY_SNI,
|
|
|
|
|
"service_name": "mbs-grpc",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"tag": "vless-xhttp-reality",
|
|
|
|
|
"label": "XHTTP + Reality",
|
|
|
|
|
"network": "xhttp",
|
|
|
|
|
"security": "reality",
|
|
|
|
|
"address": DE1_ADDRESS,
|
|
|
|
|
"port": 2087,
|
|
|
|
|
"public_key": XRAY_PUBLIC_KEY,
|
|
|
|
|
"short_id": XRAY_SHORT_ID_XHTTP,
|
|
|
|
|
"sni": REALITY_SNI,
|
|
|
|
|
"path": "/mbs-xh",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"tag": "vless-ws-tls",
|
|
|
|
|
"label": "WebSocket + TLS",
|
|
|
|
|
"network": "ws",
|
|
|
|
|
"security": "tls",
|
|
|
|
|
"address": DE1_ADDRESS,
|
|
|
|
|
"port": 8880,
|
|
|
|
|
"path": "/mbs-ws",
|
|
|
|
|
},
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
PLANS = [
|
2026-09-10 21:44:45 +05:00
|
|
|
{"code": "7d", "label": "7 дней", "days": 7, "price": int(env("PRICE_7D", "150"))},
|
|
|
|
|
{"code": "1m", "label": "1 месяц", "days": 30, "price": int(env("PRICE_1M", "399"))},
|
|
|
|
|
{"code": "3m", "label": "3 месяца", "days": 90, "price": int(env("PRICE_3M", "999"))},
|
|
|
|
|
{"code": "6m", "label": "6 месяцев", "days": 180, "price": int(env("PRICE_6M", "1799"))},
|
|
|
|
|
{"code": "1y", "label": "1 год", "days": 365, "price": int(env("PRICE_1Y", "2999"))},
|
2026-09-10 17:45:36 +05:00
|
|
|
]
|
|
|
|
|
PLANS_BY_CODE = {p["code"]: p for p in PLANS}
|
2026-09-10 21:44:45 +05:00
|
|
|
|
|
|
|
|
PAYMENTS_ENABLED = env("PAYMENTS_ENABLED", "false").lower() == "true"
|
|
|
|
|
|
|
|
|
|
YOOKASSA_ENABLED = env("YOOKASSA_ENABLED", "false").lower() == "true"
|
|
|
|
|
YOOKASSA_SHOP_ID = env("YOOKASSA_SHOP_ID", "")
|
|
|
|
|
YOOKASSA_SECRET_KEY = env("YOOKASSA_SECRET_KEY", "")
|
|
|
|
|
|
|
|
|
|
PLATEGA_ENABLED = env("PLATEGA_ENABLED", "false").lower() == "true"
|
|
|
|
|
PLATEGA_MERCHANT_ID = env("PLATEGA_MERCHANT_ID", "")
|
|
|
|
|
PLATEGA_SECRET = env("PLATEGA_SECRET", "")
|
2026-09-10 22:06:15 +05:00
|
|
|
|
|
|
|
|
HWID_LIMIT_ENABLED = env("HWID_LIMIT_ENABLED", "false").lower() == "true"
|
|
|
|
|
HWID_FALLBACK_LIMIT = int(env("HWID_FALLBACK_LIMIT", "3"))
|