Add hub login password auth

This commit is contained in:
kzolotarev95 committed 2026-06-29 05:09:20 +04:00
1 parent 77715522e2
commit 004b1b63bb
3 files changed
+462 -158

No files matched your search

+227 -108
View File
@@ -2,159 +2,278 @@
# OpenWrt Remote Hub # OpenWrt Remote Hub
**Легкий удаленный доступ к OpenWrt через свой VPS: карточки роутеров, online/offline, Xray reverse и локальная LuCI-интеграция без тяжелого VPN.** Remote access to OpenWrt through your own VPS: router cards, online/offline heartbeat, Xray VLESS reverse tunnel and LuCI proxy without ZeroTier, Tailscale or WireGuard.
[![OpenWrt](https://img.shields.io/badge/OpenWrt-22.x%20%7C%2023.x%20%7C%2024.x%20%7C%2025.x-00A3E0?style=for-the-badge)](https://openwrt.org/) [Telegram](https://t.me/kzolotarev95) · [GitHub](https://github.com/kzolotarev95) · [NetHaven VPN](https://t.me/+LZDsQJhUfcNhYWEy)
[![Xray](https://img.shields.io/badge/Xray-VLESS%20reverse-111827?style=for-the-badge)](https://xtls.github.io/en/document/level-2/vless_reverse.html)
[![No IPK](https://img.shields.io/badge/install-one%20command-2563EB?style=for-the-badge)](#быстрый-старт)
</div> </div>
## Что это ## What It Does
`luci-app-owrt-remote` собирает схему "роутер за NAT -> VPS -> красивая панель -> админка роутера". `luci-app-owrt-remote` builds this route:
На роутере ставится маленький агент:
- пункт в LuCI: `Службы -> OpenWrt Remote`;
- `/usr/sbin/owrt-remote` для старта Xray reverse, heartbeat и генерации client config;
- `/etc/init.d/owrt-remote` для автозапуска через `procd`;
- локальная CGI-панель настройки, без Lua runtime.
На VPS запускается `vps/owrt-remote-hub.py`:
- веб-панель с карточками роутеров;
- online/offline по heartbeat;
- кнопка "Открыть админку";
- прокси к локальному Xray entry port, чтобы наружу не торчали админки всех роутеров;
- генерация server-side Xray config для нескольких роутеров.
ZeroTier, Tailscale и WireGuard тут не используются. Xray-бинарь в репозиторий не кладется, чтобы не занимать флешку OpenWrt.
## Как работает
```mermaid
flowchart LR
User["Браузер админа"] --> Hub["VPS: OpenWrt Remote Hub"]
Hub --> LocalEntry["127.0.0.1:18080<br/>Xray tunnel inbound"]
LocalEntry --> Reverse["VLESS reverse tunnel"]
Router["OpenWrt router<br/>owrt-remote + Xray"] --> Reverse
Router --> LuCI["127.0.0.1:80<br/>LuCI/uhttpd"]
```
1. Роутер сам подключается к VPS и держит reverse tunnel.
2. VPS-панель показывает карточку роутера и статус.
3. Когда нажимаешь "Открыть админку", хаб проксирует запрос в локальный entry port Xray.
4. Xray возвращает этот поток через reverse tunnel на LuCI роутера.
## Быстрый старт
### 1. VPS
На VPS нужен Python 3 и Xray. Скопируй папку `vps` на сервер и запусти:
```sh
sudo mkdir -p /opt/owrt-remote /var/lib/owrt-remote
sudo cp vps/owrt-remote-hub.py /opt/owrt-remote/
sudo chmod +x /opt/owrt-remote/owrt-remote-hub.py
sudo /opt/owrt-remote/owrt-remote-hub.py init
sudo /opt/owrt-remote/owrt-remote-hub.py add-router --id main --name "Главный роутер" --role main --entry-port 18080 --vps-host YOUR_VPS_DOMAIN_OR_IP
sudo /opt/owrt-remote/owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json
```
Запусти хаб:
```sh
sudo OWRT_REMOTE_BIND=0.0.0.0 OWRT_REMOTE_PORT=8088 /opt/owrt-remote/owrt-remote-hub.py serve
```
Панель:
```text ```text
http://YOUR_VPS_IP:8088/?token=ADMIN_TOKEN Browser -> VPS Hub -> local Xray entry port -> VLESS reverse tunnel -> OpenWrt LuCI
``` ```
`ADMIN_TOKEN` хаб покажет при первом `init`/`serve`, также он лежит в `/var/lib/owrt-remote/admin.token`. The VPS shows router cards with online/offline state. A router behind NAT connects outward to the VPS and keeps a reverse Xray tunnel alive. You click `Админка` in the Hub and open the router LuCI through the VPS.
### 2. OpenWrt No public LuCI ports on the router are needed.
На роутере: ## Current Features
- VPS dashboard at `http://YOUR_VPS_IP:8088/`.
- Normal Hub login and password, no secret token in browser URLs.
- Login/password can be changed inside the Hub panel.
- Multiple router cards.
- Online/offline heartbeat.
- `OpenWrt config` button with ready UCI commands for a router.
- `Client JSON` button for generated router Xray config.
- LuCI proxy through `/access/<router-id>/`.
- Lightweight OpenWrt agent: shell + CGI, no heavy LuCI Lua app.
## VPS Install
Use Ubuntu/Debian VPS with Python 3 and Xray.
### 1. Install Xray On VPS
```sh ```sh
wget -O - https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/install.sh | sh sudo apt update
sudo apt install -y curl unzip python3
sudo bash -c "$(curl -L https://github.com/XTLS/Xray-install/raw/main/install-release.sh)" @ install
xray version || /usr/local/bin/xray version
``` ```
После установки: ### 2. Install Hub
```sh
sudo mkdir -p /opt/owrt-remote /var/lib/owrt-remote /etc/xray
sudo wget -O /opt/owrt-remote/owrt-remote-hub.py "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/vps/owrt-remote-hub.py"
sudo wget -O /etc/systemd/system/owrt-remote.service "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/vps/owrt-remote.service"
sudo chmod +x /opt/owrt-remote/owrt-remote-hub.py
sudo systemctl daemon-reload
```
Set your Hub login and password:
```sh
sudo /opt/owrt-remote/owrt-remote-hub.py init
sudo /opt/owrt-remote/owrt-remote-hub.py set-login --username admin --password 'CHANGE_ME_STRONG_PASSWORD'
```
Start the Hub:
```sh
sudo systemctl enable --now owrt-remote
sudo systemctl status owrt-remote --no-pager -l
```
Open:
```text
http://YOUR_VPS_IP:8088/
```
### 3. Add First Router On VPS
Example:
```sh
sudo /opt/owrt-remote/owrt-remote-hub.py add-router \
--id main \
--name "Главный роутер" \
--role main \
--entry-port 18080 \
--vps-host YOUR_VPS_IP
```
Render and start VPS Xray reverse service:
```sh
sudo /opt/owrt-remote/owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json
XRAY_BIN="$(command -v xray || command -v /usr/local/bin/xray || command -v /usr/bin/xray)"
sudo tee /etc/systemd/system/owrt-remote-xray.service >/dev/null <<EOF
[Unit]
Description=OpenWrt Remote Xray Reverse
After=network-online.target
Wants=network-online.target
[Service]
Type=simple
ExecStart=$XRAY_BIN run -config /etc/xray/owrt-remote.json
Restart=on-failure
RestartSec=3
[Install]
WantedBy=multi-user.target
EOF
sudo systemctl daemon-reload
sudo systemctl enable --now owrt-remote-xray
```
Firewall:
```sh
sudo ufw allow 8088/tcp
sudo ufw allow 8443/tcp
```
Check:
```sh
sudo ss -lntp | grep -E ':(8088|8443|18080)\b'
```
`18080` should listen only on `127.0.0.1`. The public ports are `8088` for Hub and `8443` for Xray.
## OpenWrt Install
Install the OpenWrt agent:
```sh
wget -O - "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/install.sh?v=$(date +%s)" | sh
```
Open local panel:
```text ```text
LuCI -> Службы -> OpenWrt Remote LuCI -> Службы -> OpenWrt Remote
``` ```
В VPS-панели открой карточку роутера и скопируй готовые UCI-команды из "OpenWrt config". Вставь их на роутер, затем: Or direct:
```text
http://192.168.1.1/cgi-bin/owrt-remote
```
In the VPS Hub open router card -> `OpenWrt config`, paste the UCI commands into the router shell, then:
```sh ```sh
owrt-remote render-client
/etc/init.d/owrt-remote enable /etc/init.d/owrt-remote enable
/etc/init.d/owrt-remote restart /etc/init.d/owrt-remote restart
owrt-remote doctor
owrt-remote heartbeat
```
## Xray On OpenWrt
If your router has enough flash:
```sh
opkg update
opkg install xray-core
```
If flash is small, run Xray from RAM for testing:
```sh
mkdir -p /var/lock /var/run /tmp/owrt-xray
cd /tmp/owrt-xray
wget -O xray.zip "https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip"
command -v unzip >/dev/null 2>&1 || { opkg update; opkg install unzip; }
unzip -o xray.zip xray
chmod +x /tmp/owrt-xray/xray
/tmp/owrt-xray/xray version
uci set owrtremote.main.xray_bin='/tmp/owrt-xray/xray'
uci commit owrtremote
/etc/init.d/owrt-remote restart
```
For another architecture, download the matching Xray release asset from:
```text
https://github.com/XTLS/Xray-core/releases/latest
```
## Update
VPS:
```sh
sudo wget -O /opt/owrt-remote/owrt-remote-hub.py "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/vps/owrt-remote-hub.py?v=$(date +%s)"
sudo chmod +x /opt/owrt-remote/owrt-remote-hub.py
sudo systemctl restart owrt-remote
sudo /opt/owrt-remote/owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json
sudo systemctl restart owrt-remote-xray
```
OpenWrt:
```sh
wget -O - "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/install.sh?v=$(date +%s)" | sh
owrt-remote render-client
/etc/init.d/owrt-remote restart
owrt-remote heartbeat owrt-remote heartbeat
``` ```
## Что ставится на роутер For cache-proof updates, use a commit SHA instead of `main`:
| Путь | Назначение | ```sh
| --- | --- | SHA="PUT_COMMIT_SHA_HERE"
| `/usr/sbin/owrt-remote` | CLI-агент: render config, heartbeat, status | export RAW_URL="https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/$SHA"
| `/etc/init.d/owrt-remote` | сервис автозапуска Xray reverse + heartbeat loop | wget -O - "$RAW_URL/install.sh" | sh
| `/www/cgi-bin/owrt-remote` | локальная красивая панель настройки | ```
| `/www/luci-static/resources/view/owrt_remote.js` | LuCI-страница-редирект |
| `/usr/share/luci/menu.d/luci-app-owrt-remote.json` | пункт меню LuCI |
| `/usr/share/rpcd/acl.d/luci-app-owrt-remote.json` | ACL для чтения web key |
| `/etc/config/owrtremote` | UCI-настройки агента |
| `/etc/owrt-remote/web.key` | приватный ключ локальной панели |
## Память OpenWrt ## Hub Commands
Сам модуль маленький: shell-скрипты, LuCI redirect и CGI. Самый тяжелый компонент - `xray-core`, но он не включен в этот репозиторий. Если на роутере мало флешки, лучше поставить Xray на extroot/USB или использовать сборку прошивки, где Xray уже включен. ```sh
sudo /opt/owrt-remote/owrt-remote-hub.py init
sudo /opt/owrt-remote/owrt-remote-hub.py set-login --username admin --password 'NEW_PASSWORD'
sudo /opt/owrt-remote/owrt-remote-hub.py add-router --id main --name "Главный роутер" --role main --entry-port 18080 --vps-host YOUR_VPS_IP
sudo /opt/owrt-remote/owrt-remote-hub.py list-routers
sudo /opt/owrt-remote/owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json
sudo /opt/owrt-remote/owrt-remote-hub.py print-openwrt-config --id main --hub-url http://YOUR_VPS_IP:8088 --vps-host YOUR_VPS_IP
```
## Команды агента ## OpenWrt Agent Commands
```sh ```sh
owrt-remote status owrt-remote status
owrt-remote doctor
owrt-remote render-client owrt-remote render-client
owrt-remote render-client --stdout owrt-remote render-client --stdout
owrt-remote heartbeat owrt-remote heartbeat
```
## Troubleshooting
Router heartbeat:
```sh
owrt-remote doctor owrt-remote doctor
owrt-remote status
owrt-remote heartbeat
``` ```
## Команды VPS-хаба VPS Xray:
```sh ```sh
vps/owrt-remote-hub.py init sudo systemctl status owrt-remote-xray --no-pager -l
vps/owrt-remote-hub.py add-router --id main --name "Главный" --role main --entry-port 18080 --vps-host example.com sudo journalctl -u owrt-remote-xray -n 100 --no-pager
vps/owrt-remote-hub.py list-routers curl -v --max-time 10 http://127.0.0.1:18080/cgi-bin/luci
vps/owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json
vps/owrt-remote-hub.py print-openwrt-config --id main
vps/owrt-remote-hub.py serve --host 0.0.0.0 --port 8088
``` ```
## Удаление If `curl` returns LuCI HTML or `403 Forbidden` with login page, the tunnel works. Open Hub and click `Админка`.
С роутера: ## Files On OpenWrt
```sh | Path | Purpose |
wget -O - https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/uninstall.sh | sh | --- | --- |
``` | `/usr/sbin/owrt-remote` | CLI agent: render config, heartbeat, status |
| `/etc/init.d/owrt-remote` | procd service: Xray reverse + heartbeat loop |
| `/www/cgi-bin/owrt-remote` | local CGI configuration panel |
| `/www/luci-static/resources/view/owrt_remote.js` | LuCI menu redirect |
| `/usr/share/luci/menu.d/luci-app-owrt-remote.json` | LuCI menu item |
| `/usr/share/rpcd/acl.d/luci-app-owrt-remote.json` | LuCI ACL |
| `/etc/config/owrtremote` | UCI settings |
| `/etc/owrt-remote/web.key` | local panel private key |
Полностью, вместе с конфигом: ## Security Notes
```sh
wget -O - https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main/uninstall.sh | PURGE=1 sh
```
## Важное по безопасности
- Не открывай LuCI роутеров напрямую наружу.
- Entry ports Xray на VPS по умолчанию слушают `127.0.0.1`, а наружу отдается только dashboard.
- Панель хаба защищена `ADMIN_TOKEN`, а heartbeat от роутеров - отдельным `AGENT_TOKEN`.
- Для боевого режима лучше посадить dashboard за HTTPS reverse proxy: Caddy, Nginx или Traefik.
- Xray VLESS reverse можно усилить своим `xray vlessenc`; по умолчанию конфиг использует совместимый режим `none`.
- Do not expose router LuCI directly to the internet.
- Router entry ports on VPS listen on `127.0.0.1` only.
- Hub uses login/password and cookie session.
- Router heartbeat uses separate `AGENT_TOKEN`.
- For production, put Hub behind HTTPS with Caddy, Nginx or another reverse proxy.
+234 -48
View File
@@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse import argparse
import datetime as dt import datetime as dt
import hashlib
import html import html
import http.client import http.client
import json import json
@@ -18,10 +19,13 @@ from pathlib import Path
APP_NAME = "OpenWrt Remote Hub" APP_NAME = "OpenWrt Remote Hub"
STATE_DIR = Path(os.environ.get("OWRT_REMOTE_STATE_DIR", "/var/lib/owrt-remote")) STATE_DIR = Path(os.environ.get("OWRT_REMOTE_STATE_DIR", "/var/lib/owrt-remote"))
DB_PATH = Path(os.environ.get("OWRT_REMOTE_DB", str(STATE_DIR / "hub.db"))) DB_PATH = Path(os.environ.get("OWRT_REMOTE_DB", str(STATE_DIR / "hub.db")))
ADMIN_TOKEN_FILE = STATE_DIR / "admin.token" AUTH_FILE = STATE_DIR / "hub-auth.json"
SESSION_TOKEN_FILE = STATE_DIR / "hub-session.token"
AGENT_TOKEN_FILE = STATE_DIR / "agent.token" AGENT_TOKEN_FILE = STATE_DIR / "agent.token"
ONLINE_AFTER_SECONDS = int(os.environ.get("OWRT_REMOTE_ONLINE_AFTER", "75")) ONLINE_AFTER_SECONDS = int(os.environ.get("OWRT_REMOTE_ONLINE_AFTER", "75"))
DEFAULT_VLESS_PORT = int(os.environ.get("OWRT_REMOTE_VLESS_PORT", "8443")) DEFAULT_VLESS_PORT = int(os.environ.get("OWRT_REMOTE_VLESS_PORT", "8443"))
PBKDF2_ITERATIONS = 240000
SESSION_COOKIE = "owrt_remote_session"
def now_ts(): def now_ts():
@@ -53,14 +57,101 @@ def read_or_make_token(path):
return token return token
def admin_token():
return os.environ.get("OWRT_REMOTE_ADMIN_TOKEN") or read_or_make_token(ADMIN_TOKEN_FILE)
def agent_token(): def agent_token():
return os.environ.get("OWRT_REMOTE_AGENT_TOKEN") or read_or_make_token(AGENT_TOKEN_FILE) return os.environ.get("OWRT_REMOTE_AGENT_TOKEN") or read_or_make_token(AGENT_TOKEN_FILE)
def session_token():
return read_or_make_token(SESSION_TOKEN_FILE)
def password_digest(password, salt=None, iterations=PBKDF2_ITERATIONS):
salt = salt or secrets.token_hex(16)
raw = hashlib.pbkdf2_hmac(
"sha256",
password.encode("utf-8"),
bytes.fromhex(salt),
int(iterations),
)
return {
"salt": salt,
"hash": raw.hex(),
"iterations": int(iterations),
}
def write_json_private(path, data):
ensure_state()
path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
try:
os.chmod(path, 0o600)
except OSError:
pass
def save_auth(username, password):
username = clean_username(username)
if len(password) < 8:
raise ValueError("password must be at least 8 characters")
data = {
"username": username,
"password": password_digest(password),
"updated_at": now_ts(),
}
write_json_private(AUTH_FILE, data)
return data
def load_auth():
ensure_state()
if AUTH_FILE.exists():
return json.loads(AUTH_FILE.read_text(encoding="utf-8"))
username = os.environ.get("OWRT_REMOTE_ADMIN_USER", "admin")
password = os.environ.get("OWRT_REMOTE_ADMIN_PASSWORD") or secrets.token_urlsafe(16)
data = save_auth(username, password)
login_hint = STATE_DIR / "hub-login.txt"
login_hint.write_text(
f"username: {data['username']}\npassword: {password}\n",
encoding="utf-8",
)
try:
os.chmod(login_hint, 0o600)
except OSError:
pass
return data
def clean_username(value):
value = (value or "").strip()
if not (1 <= len(value) <= 64):
raise ValueError("username length must be 1..64")
for ch in value:
if not (ch.isalnum() or ch in "._-@"):
raise ValueError("username may contain only letters, digits, . _ - @")
return value
def verify_login(username, password):
try:
auth = load_auth()
stored_user = auth.get("username", "")
stored = auth.get("password", {})
digest = password_digest(password or "", stored.get("salt"), stored.get("iterations", PBKDF2_ITERATIONS))
except Exception:
return False
return secrets.compare_digest(username or "", stored_user) and secrets.compare_digest(
digest["hash"],
stored.get("hash", ""),
)
def current_username():
try:
return load_auth().get("username", "admin")
except Exception:
return "admin"
def clean_router_id(value): def clean_router_id(value):
value = (value or "").strip() value = (value or "").strip()
out = [] out = []
@@ -414,15 +505,15 @@ def clean_forward_cookie(cookie_header):
for chunk in (cookie_header or "").split(";"): for chunk in (cookie_header or "").split(";"):
if not chunk.strip(): if not chunk.strip():
continue continue
if chunk.strip().startswith("owrt_remote_admin="): if chunk.strip().startswith("owrt_remote_admin=") or chunk.strip().startswith(f"{SESSION_COOKIE}="):
continue continue
parts.append(chunk.strip()) parts.append(chunk.strip())
return "; ".join(parts) return "; ".join(parts)
def dashboard_html(routers, token): def dashboard_html(routers, username):
routers_json = json.dumps(routers, ensure_ascii=False) routers_json = json.dumps(routers, ensure_ascii=False)
safe_token = html.escape(token, quote=True) safe_username = html.escape(username, quote=True)
return f"""<!doctype html> return f"""<!doctype html>
<html lang="ru"> <html lang="ru">
<head> <head>
@@ -438,15 +529,16 @@ body::before{{content:"";position:fixed;inset:-25%;z-index:0;pointer-events:none
.wrap{{position:relative;z-index:1;max-width:1220px;margin:0 auto;padding:22px}}.top{{display:flex;align-items:flex-start;justify-content:space-between;gap:16px;border-bottom:1px solid var(--line);padding:20px 0 18px}} .wrap{{position:relative;z-index:1;max-width:1220px;margin:0 auto;padding:22px}}.top{{display:flex;align-items:flex-start;justify-content:space-between;gap:16px;border-bottom:1px solid var(--line);padding:20px 0 18px}}
.brand{{display:flex;align-items:center;gap:14px}} .brand{{display:flex;align-items:center;gap:14px}}
h1{{margin:0;font-size:29px;line-height:1.2;letter-spacing:0}}.muted{{color:var(--muted)}}.top p{{margin:4px 0 0}}.links,.headerActions{{display:flex;align-items:center;gap:8px;flex-wrap:wrap}}.links{{margin-top:8px}}.links a,.badge{{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;min-width:132px;padding:8px 14px;border:1px solid var(--line);border-radius:999px;background:rgba(255,255,255,.08);color:#f3e8ff;text-decoration:none;font-weight:800;font-size:13px;line-height:1;white-space:nowrap;overflow:hidden}}.headerActions{{justify-content:flex-end;padding-top:42px}}.badge{{background:var(--panel);color:var(--muted)}}.dot{{width:9px;height:9px;border-radius:999px;background:var(--red);box-shadow:0 0 13px rgba(251,113,133,.72)}}.dot.on{{background:var(--green);box-shadow:0 0 13px rgba(34,197,94,.75)}}.dot.warn{{background:var(--amber);box-shadow:0 0 13px rgba(245,158,11,.75)}} h1{{margin:0;font-size:29px;line-height:1.2;letter-spacing:0}}.muted{{color:var(--muted)}}.top p{{margin:4px 0 0}}.links,.headerActions{{display:flex;align-items:center;gap:8px;flex-wrap:wrap}}.links{{margin-top:8px}}.links a,.badge{{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;min-width:132px;padding:8px 14px;border:1px solid var(--line);border-radius:999px;background:rgba(255,255,255,.08);color:#f3e8ff;text-decoration:none;font-weight:800;font-size:13px;line-height:1;white-space:nowrap;overflow:hidden}}.headerActions{{justify-content:flex-end;padding-top:42px}}.badge{{background:var(--panel);color:var(--muted)}}.dot{{width:9px;height:9px;border-radius:999px;background:var(--red);box-shadow:0 0 13px rgba(251,113,133,.72)}}.dot.on{{background:var(--green);box-shadow:0 0 13px rgba(34,197,94,.75)}}.dot.warn{{background:var(--amber);box-shadow:0 0 13px rgba(245,158,11,.75)}}
.toolbar{{display:grid;grid-template-columns:1fr 1fr 110px 110px 150px auto;gap:10px;margin:18px 0;padding:14px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);border:1px solid var(--line);border-radius:8px;box-shadow:0 18px 46px rgba(0,0,0,.20);backdrop-filter:blur(10px)}} .toolbar{{display:grid;grid-template-columns:1fr 1fr 110px 110px 150px auto;gap:10px;margin:18px 0;padding:14px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);border:1px solid var(--line);border-radius:8px;box-shadow:0 18px 46px rgba(0,0,0,.20);backdrop-filter:blur(10px)}}
.settings{{margin:0 0 18px;padding:14px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);border:1px solid var(--line);border-radius:8px;box-shadow:0 18px 46px rgba(0,0,0,.18);backdrop-filter:blur(10px)}}.settings h2{{margin:0 0 4px;font-size:18px}}.settings p{{margin:0 0 12px;color:var(--muted)}}.authGrid{{display:grid;grid-template-columns:1fr 1fr 1fr 1fr auto;gap:10px}}.msg{{margin-top:10px;color:#bbf7d0;font-weight:750}}.msg.bad{{color:#fecdd3}}
input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding:10px 11px;background:rgba(8,5,18,.72);color:var(--text)}}button,.btn{{border:1px solid rgba(255,255,255,.10);border-radius:8px;padding:10px 13px;background:rgba(255,255,255,.10);color:#f7f2ff;font-weight:850;text-decoration:none;cursor:pointer;display:inline-flex;justify-content:center;align-items:center}}button.primary,.btn.primary{{background:var(--blue);color:#fff;box-shadow:0 10px 22px rgba(124,58,237,.22)}}button.bad,.btn.bad{{background:rgba(251,113,133,.16);color:#fecdd3}}.btn.good{{background:rgba(34,197,94,.16);color:#bbf7d0}}.btn.disabled{{opacity:.45;cursor:not-allowed}} input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding:10px 11px;background:rgba(8,5,18,.72);color:var(--text)}}button,.btn{{border:1px solid rgba(255,255,255,.10);border-radius:8px;padding:10px 13px;background:rgba(255,255,255,.10);color:#f7f2ff;font-weight:850;text-decoration:none;cursor:pointer;display:inline-flex;justify-content:center;align-items:center}}button.primary,.btn.primary{{background:var(--blue);color:#fff;box-shadow:0 10px 22px rgba(124,58,237,.22)}}button.bad,.btn.bad{{background:rgba(251,113,133,.16);color:#fecdd3}}.btn.good{{background:rgba(34,197,94,.16);color:#bbf7d0}}.btn.disabled{{opacity:.45;cursor:not-allowed}}
.sectionHead{{display:flex;align-items:flex-end;justify-content:space-between;gap:16px;margin:24px 0 14px}}.sectionHead h2{{margin:0;font-size:22px}}.sectionHead p{{margin:3px 0 0;color:var(--muted)}}.summary{{display:flex;gap:10px;flex-wrap:wrap;justify-content:flex-end}}.miniStat{{border:1px solid var(--line);border-radius:999px;background:rgba(255,255,255,.07);padding:8px 12px;color:#ddd6fe;font-weight:750;white-space:nowrap}} .sectionHead{{display:flex;align-items:flex-end;justify-content:space-between;gap:16px;margin:24px 0 14px}}.sectionHead h2{{margin:0;font-size:22px}}.sectionHead p{{margin:3px 0 0;color:var(--muted)}}.summary{{display:flex;gap:10px;flex-wrap:wrap;justify-content:flex-end}}.miniStat{{border:1px solid var(--line);border-radius:999px;background:rgba(255,255,255,.07);padding:8px 12px;color:#ddd6fe;font-weight:750;white-space:nowrap}}
.cards{{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:14px}}.card{{position:relative;min-height:246px;overflow:hidden;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);border:1px solid var(--line);border-radius:8px;padding:14px;box-shadow:0 18px 46px rgba(0,0,0,.28);backdrop-filter:blur(10px)}}.card::before{{content:"";position:absolute;inset:0 0 auto 0;height:3px;background:var(--green)}}.card.off::before{{background:var(--red)}}.card.warn::before{{background:var(--amber)}}.card.main{{grid-column:span 2}} .cards{{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:14px}}.card{{position:relative;min-height:246px;overflow:hidden;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);border:1px solid var(--line);border-radius:8px;padding:14px;box-shadow:0 18px 46px rgba(0,0,0,.28);backdrop-filter:blur(10px)}}.card::before{{content:"";position:absolute;inset:0 0 auto 0;height:3px;background:var(--green)}}.card.off::before{{background:var(--red)}}.card.warn::before{{background:var(--amber)}}.card.main{{grid-column:span 2}}
.cardTop{{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}}.routerMark{{display:grid;place-items:center;width:46px;height:46px;border-radius:8px;border:1px solid rgba(255,255,255,.14);background:rgba(255,255,255,.08)}}.routerIcon{{position:relative;width:28px;height:18px;border:2px solid #ddd6fe;border-radius:5px}}.routerIcon::before,.routerIcon::after{{content:"";position:absolute;top:-9px;width:9px;height:9px;border-top:2px solid #ddd6fe}}.routerIcon::before{{left:2px;transform:rotate(-34deg)}}.routerIcon::after{{right:2px;transform:rotate(34deg)}}.routerIcon span{{position:absolute;left:5px;right:5px;bottom:4px;display:flex;justify-content:space-between}}.routerIcon span::before,.routerIcon span::after{{content:"";width:4px;height:4px;border-radius:50%;background:#ddd6fe}} .cardTop{{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}}.routerMark{{display:grid;place-items:center;width:46px;height:46px;border-radius:8px;border:1px solid rgba(255,255,255,.14);background:rgba(255,255,255,.08)}}.routerIcon{{position:relative;width:28px;height:18px;border:2px solid #ddd6fe;border-radius:5px}}.routerIcon::before,.routerIcon::after{{content:"";position:absolute;top:-9px;width:9px;height:9px;border-top:2px solid #ddd6fe}}.routerIcon::before{{left:2px;transform:rotate(-34deg)}}.routerIcon::after{{right:2px;transform:rotate(34deg)}}.routerIcon span{{position:absolute;left:5px;right:5px;bottom:4px;display:flex;justify-content:space-between}}.routerIcon span::before,.routerIcon span::after{{content:"";width:4px;height:4px;border-radius:50%;background:#ddd6fe}}
.status{{display:inline-flex;align-items:center;gap:7px;border-radius:999px;border:1px solid rgba(255,255,255,.12);background:rgba(255,255,255,.07);padding:7px 10px;font-weight:850;font-size:12px}}.status i{{width:8px;height:8px;border-radius:50%;background:var(--green);box-shadow:0 0 13px var(--green)}}.status.off i{{background:var(--red);box-shadow:0 0 13px var(--red)}}.status.warn i{{background:var(--amber);box-shadow:0 0 13px var(--amber)}}.name{{margin:12px 0 0;font-size:19px;font-weight:900;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.metaLine{{margin-top:3px;color:var(--muted)}}.tagRow{{display:flex;gap:8px;flex-wrap:wrap;margin-top:12px}}.tag{{border:1px solid var(--line);border-radius:999px;padding:5px 9px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:12px;font-weight:750}} .status{{display:inline-flex;align-items:center;gap:7px;border-radius:999px;border:1px solid rgba(255,255,255,.12);background:rgba(255,255,255,.07);padding:7px 10px;font-weight:850;font-size:12px}}.status i{{width:8px;height:8px;border-radius:50%;background:var(--green);box-shadow:0 0 13px var(--green)}}.status.off i{{background:var(--red);box-shadow:0 0 13px var(--red)}}.status.warn i{{background:var(--amber);box-shadow:0 0 13px var(--amber)}}.name{{margin:12px 0 0;font-size:19px;font-weight:900;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.metaLine{{margin-top:3px;color:var(--muted)}}.tagRow{{display:flex;gap:8px;flex-wrap:wrap;margin-top:12px}}.tag{{border:1px solid var(--line);border-radius:999px;padding:5px 9px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:12px;font-weight:750}}
.metrics{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:14px}}.metric{{border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055);padding:9px}}.metric span{{display:block;color:var(--muted);font-size:11px}}.metric strong{{display:block;margin-top:2px;font-size:14px;word-break:break-word}}.actions{{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}}.empty{{grid-column:1/-1;border:1px dashed var(--line);border-radius:8px;padding:30px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);text-align:center;color:var(--muted)}}.hint{{margin-top:16px;padding:13px;border:1px solid var(--line);border-radius:8px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);color:var(--muted)}}code{{background:rgba(255,255,255,.10);border-radius:6px;padding:2px 5px;color:#f3e8ff}} .metrics{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:14px}}.metric{{border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055);padding:9px}}.metric span{{display:block;color:var(--muted);font-size:11px}}.metric strong{{display:block;margin-top:2px;font-size:14px;word-break:break-word}}.actions{{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}}.empty{{grid-column:1/-1;border:1px dashed var(--line);border-radius:8px;padding:30px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);text-align:center;color:var(--muted)}}.hint{{margin-top:16px;padding:13px;border:1px solid var(--line);border-radius:8px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);color:var(--muted)}}code{{background:rgba(255,255,255,.10);border-radius:6px;padding:2px 5px;color:#f3e8ff}}
@media(max-width:980px){{.cards{{grid-template-columns:repeat(2,minmax(0,1fr))}}.toolbar{{grid-template-columns:1fr 1fr}}.card.main{{grid-column:span 2}}.top{{flex-direction:column}}.headerActions{{padding-top:0;justify-content:flex-start}}}} @media(max-width:980px){{.cards{{grid-template-columns:repeat(2,minmax(0,1fr))}}.toolbar,.authGrid{{grid-template-columns:1fr 1fr}}.card.main{{grid-column:span 2}}.top{{flex-direction:column}}.headerActions{{padding-top:0;justify-content:flex-start}}}}
@media(max-width:680px){{.wrap{{padding:14px}}.cards,.toolbar{{grid-template-columns:1fr}}.card.main{{grid-column:span 1}}.top,.sectionHead{{align-items:flex-start;flex-direction:column}}.headerActions,.summary{{justify-content:flex-start}}.links a,.badge{{width:100%;min-width:0}}h1{{font-size:24px}}}} @media(max-width:680px){{.wrap{{padding:14px}}.cards,.toolbar,.authGrid{{grid-template-columns:1fr}}.card.main{{grid-column:span 1}}.top,.sectionHead{{align-items:flex-start;flex-direction:column}}.headerActions,.summary{{justify-content:flex-start}}.links a,.badge{{width:100%;min-width:0}}h1{{font-size:24px}}}}
</style> </style>
</head> </head>
<body> <body>
@@ -464,6 +556,8 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
</div> </div>
<div class="headerActions"> <div class="headerActions">
<div class="badge"><span class="dot on"></span>Hub online</div> <div class="badge"><span class="dot on"></span>Hub online</div>
<div class="badge">login: {safe_username}</div>
<a class="btn" href="/logout">Выйти</a>
</div> </div>
</section> </section>
@@ -476,6 +570,19 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
<button class="primary">Добавить</button> <button class="primary">Добавить</button>
</form> </form>
<section class="settings">
<h2>Доступ к Hub</h2>
<p>Здесь можно поменять логин и пароль входа в веб-панель.</p>
<form id="authForm" class="authGrid">
<input name="username" value="{safe_username}" placeholder="Логин" autocomplete="username" required>
<input name="current_password" type="password" placeholder="Текущий пароль" autocomplete="current-password" required>
<input name="password" type="password" placeholder="Новый пароль" autocomplete="new-password">
<input name="password_confirm" type="password" placeholder="Повтор пароля" autocomplete="new-password">
<button class="primary">Сохранить</button>
</form>
<div id="authMsg" class="msg" hidden></div>
</section>
<section class="sectionHead"> <section class="sectionHead">
<div> <div>
<h2>Карточки роутеров</h2> <h2>Карточки роутеров</h2>
@@ -492,10 +599,8 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
<div class="hint muted">После добавления роутера открой <code>OpenWrt config</code>, вставь команды на роутере и перегенерируй server Xray config командой <code>owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json</code>.</div> <div class="hint muted">После добавления роутера открой <code>OpenWrt config</code>, вставь команды на роутере и перегенерируй server Xray config командой <code>owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json</code>.</div>
</main> </main>
<script> <script>
window.ADMIN_TOKEN = "{safe_token}";
window.ROUTERS = {routers_json}; window.ROUTERS = {routers_json};
const cards = document.getElementById('cards'); const cards = document.getElementById('cards');
const tokenParam = () => 'token=' + encodeURIComponent(window.ADMIN_TOKEN);
function ago(iso) {{ function ago(iso) {{
if (!iso) return 'never'; if (!iso) return 'never';
@@ -563,8 +668,8 @@ function render(list) {{
</div> </div>
<div class="actions"> <div class="actions">
${{adminButton}} ${{adminButton}}
<a class="btn good" href="${{escapeAttr(r.config_url)}}?${{tokenParam()}}">OpenWrt config</a> <a class="btn good" href="${{escapeAttr(r.config_url)}}">OpenWrt config</a>
<a class="btn" href="${{escapeAttr(r.xray_client_url)}}?${{tokenParam()}}">Client JSON</a> <a class="btn" href="${{escapeAttr(r.xray_client_url)}}">Client JSON</a>
<button class="bad" data-delete="${{escapeAttr(r.id)}}">Удалить</button> <button class="bad" data-delete="${{escapeAttr(r.id)}}">Удалить</button>
</div> </div>
</article>`; </article>`;
@@ -580,7 +685,7 @@ function escapeAttr(s) {{
}} }}
async function loadRouters() {{ async function loadRouters() {{
const res = await fetch('/api/routers?' + tokenParam(), {{cache: 'no-store'}}); const res = await fetch('/api/routers', {{cache: 'no-store'}});
if (res.ok) {{ if (res.ok) {{
const data = await res.json(); const data = await res.json();
window.ROUTERS = data.routers; window.ROUTERS = data.routers;
@@ -591,7 +696,7 @@ async function loadRouters() {{
document.getElementById('routerForm').addEventListener('submit', async (ev) => {{ document.getElementById('routerForm').addEventListener('submit', async (ev) => {{
ev.preventDefault(); ev.preventDefault();
const body = new URLSearchParams(new FormData(ev.currentTarget)); const body = new URLSearchParams(new FormData(ev.currentTarget));
const res = await fetch('/api/router?' + tokenParam(), {{method: 'POST', body}}); const res = await fetch('/api/router', {{method: 'POST', body}});
if (res.ok) {{ if (res.ok) {{
ev.currentTarget.reset(); ev.currentTarget.reset();
await loadRouters(); await loadRouters();
@@ -604,10 +709,30 @@ cards.addEventListener('click', async (ev) => {{
const id = ev.target?.dataset?.delete; const id = ev.target?.dataset?.delete;
if (!id) return; if (!id) return;
if (!confirm('Удалить роутер ' + id + '?')) return; if (!confirm('Удалить роутер ' + id + '?')) return;
const res = await fetch('/api/router/' + encodeURIComponent(id) + '/delete?' + tokenParam(), {{method: 'POST'}}); const res = await fetch('/api/router/' + encodeURIComponent(id) + '/delete', {{method: 'POST'}});
if (res.ok) await loadRouters(); if (res.ok) await loadRouters();
}}); }});
document.getElementById('authForm').addEventListener('submit', async (ev) => {{
ev.preventDefault();
const msg = document.getElementById('authMsg');
msg.hidden = true;
msg.className = 'msg';
const body = new URLSearchParams(new FormData(ev.currentTarget));
const res = await fetch('/api/auth', {{method: 'POST', body}});
const text = await res.text();
msg.hidden = false;
if (res.ok) {{
msg.textContent = text || 'Доступ обновлен';
ev.currentTarget.current_password.value = '';
ev.currentTarget.password.value = '';
ev.currentTarget.password_confirm.value = '';
}} else {{
msg.className = 'msg bad';
msg.textContent = text || 'Не удалось сохранить';
}}
}});
render(window.ROUTERS); render(window.ROUTERS);
setInterval(loadRouters, 5000); setInterval(loadRouters, 5000);
</script> </script>
@@ -615,16 +740,17 @@ setInterval(loadRouters, 5000);
</html>""" </html>"""
def login_html(): def login_html(error=""):
return """<!doctype html><html lang="ru"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>OpenWrt Remote Hub</title> error_html = f"<div class=\"err\">{html.escape(error)}</div>" if error else ""
<style>body{margin:0;background:#f5f7fb;color:#172033;font:14px/1.45 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}.box{max-width:380px;margin:12vh auto;background:#fff;border:1px solid #d9e1ec;border-radius:8px;padding:20px;box-shadow:0 12px 30px rgba(20,35,60,.06)}h1{margin:0 0 8px;font-size:24px}p{color:#687385}input,button{width:100%;border-radius:8px;padding:11px;margin-top:10px}input{border:1px solid #d9e1ec}button{border:0;background:#2563eb;color:#fff;font-weight:800}</style></head> return f"""<!doctype html><html lang="ru"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>OpenWrt Remote Hub</title>
<body><form class="box" method="get"><h1>OpenWrt Remote Hub</h1><p>Вставь ADMIN_TOKEN с VPS.</p><input name="token" type="password" autofocus><button>Открыть</button></form></body></html>""" <style>:root{{color-scheme:dark}}body{{min-height:100vh;margin:0;background:radial-gradient(circle at 20% 8%,rgba(168,85,247,.38),transparent 32%),radial-gradient(circle at 80% 8%,rgba(59,130,246,.28),transparent 32%),linear-gradient(145deg,#07040f,#120a24 48%,#05030a);color:#f7f2ff;font:14px/1.45 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;display:grid;place-items:center}}.box{{width:min(390px,calc(100vw - 28px));background:rgba(19,14,32,.9);border:1px solid rgba(169,126,255,.25);border-radius:8px;padding:22px;box-shadow:0 24px 70px rgba(0,0,0,.34);backdrop-filter:blur(10px)}}h1{{margin:0 0 6px;font-size:25px}}p{{margin:0 0 14px;color:#b9adc9}}label{{display:block;margin:10px 0 5px;font-weight:800}}input,button{{width:100%;box-sizing:border-box;border-radius:8px;padding:12px}}input{{border:1px solid rgba(169,126,255,.25);background:rgba(8,5,18,.72);color:#f7f2ff}}button{{margin-top:14px;border:0;background:#7c3aed;color:#fff;font-weight:900;cursor:pointer}}.err{{margin:10px 0 0;padding:10px;border-radius:8px;background:rgba(251,113,133,.16);color:#fecdd3;font-weight:750}}</style></head>
<body><form class="box" method="post" action="/login"><h1>OpenWrt Remote Hub</h1><p>Вход в панель роутеров</p>{error_html}<label>Логин</label><input name="username" autocomplete="username" autofocus required><label>Пароль</label><input name="password" type="password" autocomplete="current-password" required><button>Войти</button></form></body></html>"""
class App: class App:
def __init__(self, db_path, admin, agent, public_url): def __init__(self, db_path, session, agent, public_url):
self.db_path = Path(db_path) self.db_path = Path(db_path)
self.admin_token = admin self.session_token = session
self.agent_token = agent self.agent_token = agent
self.public_url = public_url.rstrip("/") self.public_url = public_url.rstrip("/")
@@ -651,15 +777,8 @@ class Handler(BaseHTTPRequestHandler):
return urllib.parse.parse_qs(self.parsed().query) return urllib.parse.parse_qs(self.parsed().query)
def admin_ok(self): def admin_ok(self):
query_token = self.query().get("token", [""])[0]
if secrets.compare_digest(query_token, self.app.admin_token):
return True
cookies = parse_cookies(self.headers.get("Cookie", "")) cookies = parse_cookies(self.headers.get("Cookie", ""))
return secrets.compare_digest(cookies.get("owrt_remote_admin", ""), self.app.admin_token) return secrets.compare_digest(cookies.get(SESSION_COOKIE, ""), self.app.session_token)
def admin_cookie_needed(self):
query_token = self.query().get("token", [""])[0]
return secrets.compare_digest(query_token, self.app.admin_token)
def agent_ok(self): def agent_ok(self):
auth = self.headers.get("Authorization", "") auth = self.headers.get("Authorization", "")
@@ -667,12 +786,10 @@ class Handler(BaseHTTPRequestHandler):
return secrets.compare_digest(auth[7:].strip(), self.app.agent_token) return secrets.compare_digest(auth[7:].strip(), self.app.agent_token)
return False return False
def send_bytes(self, status, body, content_type="text/plain; charset=utf-8", extra_headers=None, set_cookie=False): def send_bytes(self, status, body, content_type="text/plain; charset=utf-8", extra_headers=None):
self.send_response(status) self.send_response(status)
self.send_header("Content-Type", content_type) self.send_header("Content-Type", content_type)
self.send_header("Cache-Control", "no-store") self.send_header("Cache-Control", "no-store")
if set_cookie:
self.send_header("Set-Cookie", f"owrt_remote_admin={self.app.admin_token}; HttpOnly; SameSite=Lax; Path=/")
if extra_headers: if extra_headers:
for key, value in extra_headers: for key, value in extra_headers:
self.send_header(key, value) self.send_header(key, value)
@@ -681,11 +798,11 @@ class Handler(BaseHTTPRequestHandler):
self.wfile.write(body) self.wfile.write(body)
def send_text(self, status, text, content_type="text/plain; charset=utf-8"): def send_text(self, status, text, content_type="text/plain; charset=utf-8"):
self.send_bytes(status, text.encode("utf-8"), content_type, set_cookie=self.admin_cookie_needed()) self.send_bytes(status, text.encode("utf-8"), content_type)
def send_json(self, status, payload): def send_json(self, status, payload):
body = json.dumps(payload, ensure_ascii=False, separators=(",", ":")).encode("utf-8") body = json.dumps(payload, ensure_ascii=False, separators=(",", ":")).encode("utf-8")
self.send_bytes(status, body, "application/json; charset=utf-8", set_cookie=self.admin_cookie_needed()) self.send_bytes(status, body, "application/json; charset=utf-8")
def require_admin(self): def require_admin(self):
if self.admin_ok(): if self.admin_ok():
@@ -719,11 +836,65 @@ class Handler(BaseHTTPRequestHandler):
parsed = urllib.parse.parse_qs(body.decode("utf-8")) parsed = urllib.parse.parse_qs(body.decode("utf-8"))
return {k: v[-1] for k, v in parsed.items()} return {k: v[-1] for k, v in parsed.items()}
def session_cookie(self):
return f"{SESSION_COOKIE}={self.app.session_token}; HttpOnly; SameSite=Lax; Path=/"
def clear_session_cookie(self):
return f"{SESSION_COOKIE}=; HttpOnly; SameSite=Lax; Path=/; Max-Age=0"
def redirect(self, location, extra_headers=None):
self.send_response(302)
self.send_header("Location", location)
if extra_headers:
for key, value in extra_headers:
self.send_header(key, value)
self.end_headers()
def login(self):
payload = self.read_payload()
username = payload.get("username", "")
password = payload.get("password", "")
if verify_login(username, password):
self.redirect("/", [("Set-Cookie", self.session_cookie())])
return
self.send_bytes(401, login_html("Неверный логин или пароль").encode("utf-8"), "text/html; charset=utf-8")
def update_auth(self):
payload = self.read_payload()
auth = load_auth()
current_password = payload.get("current_password", "")
if not verify_login(auth.get("username", ""), current_password):
self.send_text(403, "Текущий пароль неверный")
return
username = payload.get("username", auth.get("username", "admin"))
new_password = payload.get("password", "")
confirm = payload.get("password_confirm", "")
if new_password:
if new_password != confirm:
self.send_text(400, "Новый пароль и повтор не совпадают")
return
if len(new_password) < 8:
self.send_text(400, "Новый пароль должен быть минимум 8 символов")
return
save_auth(username, new_password)
else:
clean = clean_username(username)
auth["username"] = clean
auth["updated_at"] = now_ts()
write_json_private(AUTH_FILE, auth)
self.send_text(200, "Доступ к Hub обновлен")
def do_GET(self): def do_GET(self):
path = self.parsed().path path = self.parsed().path
if path == "/health": if path == "/health":
self.send_json(200, {"ok": True}) self.send_json(200, {"ok": True})
return return
if path == "/login":
self.send_bytes(200, login_html().encode("utf-8"), "text/html; charset=utf-8")
return
if path == "/logout":
self.redirect("/login", [("Set-Cookie", self.clear_session_cookie())])
return
if path.startswith("/access/"): if path.startswith("/access/"):
self.proxy_access(path) self.proxy_access(path)
return return
@@ -734,9 +905,8 @@ class Handler(BaseHTTPRequestHandler):
routers = [row_to_router(r) for r in list_router_rows(conn)] routers = [row_to_router(r) for r in list_router_rows(conn)]
self.send_bytes( self.send_bytes(
200, 200,
dashboard_html(routers, self.app.admin_token).encode("utf-8"), dashboard_html(routers, current_username()).encode("utf-8"),
"text/html; charset=utf-8", "text/html; charset=utf-8",
set_cookie=self.admin_cookie_needed(),
) )
return return
if path == "/api/routers": if path == "/api/routers":
@@ -751,6 +921,9 @@ class Handler(BaseHTTPRequestHandler):
def do_POST(self): def do_POST(self):
path = self.parsed().path path = self.parsed().path
if path == "/login":
self.login()
return
if path == "/api/heartbeat": if path == "/api/heartbeat":
if not self.agent_ok(): if not self.agent_ok():
self.send_json(401, {"ok": False, "error": "bad agent token"}) self.send_json(401, {"ok": False, "error": "bad agent token"})
@@ -769,6 +942,9 @@ class Handler(BaseHTTPRequestHandler):
return return
if not self.require_admin(): if not self.require_admin():
return return
if path == "/api/auth":
self.update_auth()
return
if path == "/api/router": if path == "/api/router":
try: try:
payload = self.read_payload() payload = self.read_payload()
@@ -873,16 +1049,10 @@ class Handler(BaseHTTPRequestHandler):
resp_body, resp_body,
content_type or "application/octet-stream", content_type or "application/octet-stream",
resp_headers, resp_headers,
set_cookie=self.admin_cookie_needed(),
) )
except Exception as exc: except Exception as exc:
self.send_text(502, f"proxy error: {exc}") self.send_text(502, f"proxy error: {exc}")
def redirect(self, location):
self.send_response(302)
self.send_header("Location", location)
self.end_headers()
def rewrite_location(value, prefix, port): def rewrite_location(value, prefix, port):
if value.startswith("/"): if value.startswith("/"):
@@ -951,9 +1121,19 @@ def should_rewrite_body(content_type):
def cmd_init(args): def cmd_init(args):
with connect(args.db) as conn: with connect(args.db) as conn:
init_db(conn) init_db(conn)
auth = load_auth()
print(f"DB: {args.db}") print(f"DB: {args.db}")
print(f"ADMIN_TOKEN: {admin_token()}") print(f"HUB_LOGIN: {auth.get('username', 'admin')}")
print(f"AGENT_TOKEN: {agent_token()}") print(f"AGENT_TOKEN: {agent_token()}")
hint = STATE_DIR / "hub-login.txt"
if hint.exists():
print(f"HUB_PASSWORD_FILE: {hint}")
def cmd_set_login(args):
save_auth(args.username, args.password)
print(f"HUB_LOGIN: {args.username}")
print("HUB_PASSWORD: updated")
def cmd_add_router(args): def cmd_add_router(args):
@@ -1019,13 +1199,14 @@ def cmd_print_openwrt(args):
def cmd_serve(args): def cmd_serve(args):
app = App(args.db, admin_token(), agent_token(), args.public_url) app = App(args.db, session_token(), agent_token(), args.public_url)
with app.conn(): with app.conn():
pass pass
auth = load_auth()
server = ThreadingHTTPServer((args.host, args.port), Handler) server = ThreadingHTTPServer((args.host, args.port), Handler)
server.app = app server.app = app
print(f"{APP_NAME} listening on http://{args.host}:{args.port}") print(f"{APP_NAME} listening on http://{args.host}:{args.port}")
print(f"ADMIN_TOKEN: {app.admin_token}") print(f"HUB_LOGIN: {auth.get('username', 'admin')}")
print(f"AGENT_TOKEN: {app.agent_token}") print(f"AGENT_TOKEN: {app.agent_token}")
try: try:
server.serve_forever() server.serve_forever()
@@ -1041,6 +1222,11 @@ def parser():
init = sub.add_parser("init", help="initialize state and tokens") init = sub.add_parser("init", help="initialize state and tokens")
init.set_defaults(func=cmd_init) init.set_defaults(func=cmd_init)
auth = sub.add_parser("set-login", help="set dashboard username and password")
auth.add_argument("--username", required=True)
auth.add_argument("--password", required=True)
auth.set_defaults(func=cmd_set_login)
add = sub.add_parser("add-router", help="add or update router") add = sub.add_parser("add-router", help="add or update router")
add.add_argument("--id", required=True) add.add_argument("--id", required=True)
add.add_argument("--name", required=True) add.add_argument("--name", required=True)
+1 -2
View File
@@ -5,7 +5,7 @@ Wants=network-online.target
[Service] [Service]
Type=simple Type=simple
Environment=OWRT_REMOTE_BIND=127.0.0.1 Environment=OWRT_REMOTE_BIND=0.0.0.0
Environment=OWRT_REMOTE_PORT=8088 Environment=OWRT_REMOTE_PORT=8088
Environment=OWRT_REMOTE_STATE_DIR=/var/lib/owrt-remote Environment=OWRT_REMOTE_STATE_DIR=/var/lib/owrt-remote
ExecStart=/opt/owrt-remote/owrt-remote-hub.py serve ExecStart=/opt/owrt-remote/owrt-remote-hub.py serve
@@ -15,4 +15,3 @@ DynamicUser=no
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target