Improve mobile SSH and router xray apply

This commit is contained in:
kzolotarev95 committed 2026-06-29 23:37:23 +04:00
1 parent 4b0ada054b
commit 807a32a238
3 files changed
+151 -21

No files matched your search

+2
View File
@@ -185,6 +185,8 @@ sudo ss -lntp | grep ':8088'
Правильно, когда видно `0.0.0.0:8088` или `*:8088`. Если видно только `127.0.0.1:8088`, Hub доступен только внутри VPS. Если порт слушает правильно, но с телефона не открывается `http://YOUR_VPS_IP:8088/`, открой `8088/tcp` еще и в firewall личного кабинета VPS-провайдера.
Если по домашнему интернету работает, а через мобильного оператора нет, чаще всего оператор режет нестандартный порт `8088` или WebSocket. Надежный вариант для телефона: повесить Hub на домен через HTTPS/443, а внутри проксировать на `127.0.0.1:8088`.
Что за порты:
| Порт | Где | Для чего | Открывать наружу |
+70 -8
View File
@@ -2,11 +2,12 @@
KEY_FILE="${KEY_FILE:-/etc/owrt-remote/web.key}"
AGENT="${AGENT:-/usr/sbin/owrt-remote}"
OWRT_REMOTE_UI_VERSION="2026-06-29-ssh-terminal-v15"
OWRT_REMOTE_UI_VERSION="2026-06-29-xray-apply-v16"
PARAMS_FILE="${TMPDIR:-/tmp}/owrt-remote-cgi.$$"
RESULT_TITLE=""
RESULT_BODY=""
RESULT_KIND="info"
SHOW_XRAY_SETTINGS="0"
cleanup() {
rm -f "$PARAMS_FILE"
@@ -38,14 +39,15 @@ parse_params() {
value="${pair#*=}"
[ "$pair" = "$key" ] && value=""
key="$(url_decode "$key" | tr -d '\r\n\t')"
value="$(url_decode "$value" | tr '\r\n\t' ' ')"
[ -n "$key" ] && printf '%s\t%s\n' "$key" "$value" >>"$PARAMS_FILE"
done
IFS="$old_ifs"
}
param() {
awk -F ' ' -v k="$1" '$1 == k { print $2; exit }' "$PARAMS_FILE"
local raw
raw="$(awk -F ' ' -v k="$1" '$1 == k { print $2; exit }' "$PARAMS_FILE")"
url_decode "$raw"
}
has_param() {
@@ -131,13 +133,42 @@ save_config() {
fi
uci_set enabled "$enabled"
for field in router_id router_name role hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_port vless_uuid vless_encryption vless_flow reverse_tag admin_host admin_port public_url; do
for field in router_id router_name role hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_port vless_uuid vless_encryption vless_flow reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port public_url; do
uci_set "$field" "$(param "$field")"
done
uci commit owrtremote
set_result "Настройки сохранены" "Если менял Xray или VPS-поля, перезапусти сервис." "ok"
}
apply_xray_settings() {
local script script_file output rc
script="$(param xray_settings_script)"
output="${TMPDIR:-/tmp}/owrt-remote-apply.$$"
script_file="${TMPDIR:-/tmp}/owrt-remote-apply-script.$$"
rc=0
SHOW_XRAY_SETTINGS="1"
if [ -z "$(printf '%s' "$script" | tr -d '[:space:]')" ]; then
set_result "Xray настройки" "Вставь команды из OpenWrt config на VPS и нажми Применить." "warn"
return
fi
{
printf '%s\n' "#!/bin/sh"
printf '%s\n' "$script"
} >"$script_file"
chmod 600 "$script_file" 2>/dev/null || true
if sh "$script_file" >"$output" 2>&1; then
set_result "Xray настройки применены" "$(cat "$output")" "ok"
else
rc=$?
set_result "Ошибка применения Xray настроек" "$(cat "$output")
rc=$rc" "bad"
fi
rm -f "$script_file" "$output"
}
run_action() {
local action output rc
action="$1"
@@ -264,7 +295,7 @@ body::before{content:"";position:fixed;inset:-25%;z-index:0;pointer-events:none;
@keyframes auraSpin{from{transform:rotate(0deg) scale(1)}to{transform:rotate(360deg) scale(1.08)}}
.wrap{position:relative;z-index:1;max-width:1180px;margin:0 auto;padding:22px}.hero{display:flex;gap:18px;align-items:flex-start;justify-content:space-between;padding:20px 0 18px;border-bottom:1px solid var(--line)}
.brand{display:flex;gap:14px;align-items:center}.titleRow{display:flex;align-items:center;gap:12px;flex-wrap:wrap}
h1{margin:0;font-size:28px;line-height:1.2;letter-spacing:0}.sub{margin:4px 0 0;color:var(--muted)}.topActions,.links{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.topActions{justify-content:flex-end;padding-top:42px}.links{margin-top:8px}.vpnCard{display:inline-flex;align-items:center}.uiPill{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;width:132px;min-width:132px;min-height:36px;padding:8px 14px;box-sizing:border-box;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}.nethaven{border-color:rgba(34,211,238,.46);background:linear-gradient(110deg,rgba(14,165,233,.22),rgba(168,85,247,.24),rgba(34,197,94,.16));color:#ecfeff;box-shadow:0 14px 32px rgba(14,165,233,.18)}.nethaven::before{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgba(255,255,255,.24),transparent);transform:translateX(-120%);animation:bannerShine 5.8s ease-in-out infinite}.nethaven span{position:relative}.nethavenDot{position:relative;width:8px;height:8px;border-radius:50%;background:#22d3ee;box-shadow:0 0 14px #22d3ee;animation:pulseDot 2.8s ease-in-out infinite}.returnCard{display:inline-flex}.backBtn{width:auto;min-width:208px;background:#f59e0b;color:#160f06;box-shadow:0 10px 22px rgba(245,158,11,.22)}
h1{margin:0;font-size:28px;line-height:1.2;letter-spacing:0}.appBanner{position:relative;display:inline-flex;align-items:center;min-height:44px;padding:8px 18px;border:1px solid rgba(34,211,238,.38);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.18),rgba(124,58,237,.34),rgba(236,72,153,.18));box-shadow:0 16px 42px rgba(124,58,237,.24),inset 0 1px 0 rgba(255,255,255,.12);overflow:hidden}.appBanner::before{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgba(255,255,255,.22),transparent);transform:translateX(-120%);animation:bannerShine 6.2s ease-in-out infinite}.appBanner span{position:relative}.sub{margin:4px 0 0;color:var(--muted)}.topActions,.links{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.topActions{justify-content:flex-end;padding-top:42px}.links{margin-top:8px}.vpnCard{display:inline-flex;align-items:center}.uiPill{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;width:132px;min-width:132px;min-height:36px;padding:8px 14px;box-sizing:border-box;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}.nethaven{border-color:rgba(34,211,238,.46);background:linear-gradient(110deg,rgba(14,165,233,.22),rgba(168,85,247,.24),rgba(34,197,94,.16));color:#ecfeff;box-shadow:0 14px 32px rgba(14,165,233,.18)}.nethaven::before{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgba(255,255,255,.24),transparent);transform:translateX(-120%);animation:bannerShine 5.8s ease-in-out infinite}.nethaven span{position:relative}.nethavenDot{position:relative;width:8px;height:8px;border-radius:50%;background:#22d3ee;box-shadow:0 0 14px #22d3ee;animation:pulseDot 2.8s ease-in-out infinite}.returnCard{display:inline-flex}.backBtn{width:auto;min-width:208px;background:#f59e0b;color:#160f06;box-shadow:0 10px 22px rgba(245,158,11,.22)}
@keyframes bannerShine{0%,42%{transform:translateX(-120%)}70%,100%{transform:translateX(120%)}}@keyframes pulseDot{0%,100%{transform:scale(1);opacity:.72}50%{transform:scale(1.35);opacity:1}}
.pill{min-width:118px;background:var(--panel);color:var(--muted)}.dot{width:9px;height:9px;border-radius:50%;background:var(--amber)}.dot.good{background:var(--green)}.dot.bad{background:var(--red)}
.grid{display:grid;grid-template-columns:minmax(0,1.18fr) minmax(280px,.82fr);gap:16px;margin-top:18px}.panel{min-width:0;background:var(--panel);border:1px solid var(--line);border-radius:8px;padding:16px;box-shadow:0 18px 46px rgba(0,0,0,.28);backdrop-filter:blur(10px)}
@@ -273,8 +304,8 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
.check{display:flex;gap:10px;align-items:center;margin-bottom:12px;font-weight:700}.check input{width:18px;height:18px}.actions{display:flex;flex-wrap:wrap;gap:10px;margin-top:14px}.btn{border:1px solid rgba(255,255,255,.08);border-radius:8px;padding:10px 13px;font-weight:750;cursor:pointer;text-decoration:none;display:inline-flex;align-items:center;justify-content:center;background:rgba(255,255,255,.10);color:#f7f2ff}.btn.primary{background:var(--blue);color:#fff}.btn.good{background:var(--green);color:#07120a}.btn.bad{background:rgba(251,113,133,.18);color:#fecdd3}.btn.warn{background:rgba(245,158,11,.16);color:#fde68a;border:1px solid rgba(245,158,11,.34)}
.notice{max-height:280px;overflow:auto;margin-top:16px;border-radius:8px;padding:12px;border:1px solid var(--line);background:rgba(255,255,255,.08);white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace}.notice strong{display:block;margin-bottom:4px;font:700 14px/1.4 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}.notice.ok{border-color:rgba(34,197,94,.46);background:rgba(34,197,94,.12)}.notice.bad{border-color:rgba(251,113,133,.46);background:rgba(251,113,133,.12)}.notice.warn{border-color:rgba(245,158,11,.46);background:rgba(245,158,11,.12)}
.code{background:rgba(255,255,255,.06);border:1px solid var(--line);color:var(--text);border-radius:8px;padding:12px;overflow:auto;overflow-wrap:anywhere;min-height:120px;white-space:pre-wrap;font:12px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}
.helperText{margin:0 0 12px;color:var(--muted)}
@media(max-width:820px){.grid,.formgrid,.metrics{grid-template-columns:1fr}.hero{align-items:flex-start;flex-direction:column}.topActions{justify-content:flex-start;padding-top:0}.wrap{padding:14px}h1{font-size:24px}}
.helperText{margin:0 0 12px;color:var(--muted)}.xrayApply{margin-top:14px;padding:14px;border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055)}.xrayApply h3{margin:0 0 8px;font-size:16px}.scriptBox{width:100%;min-height:240px;resize:vertical;border:1px solid var(--line);border-radius:8px;background:rgba(8,5,18,.72);padding:12px;color:var(--text);font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:pre;overflow:auto}
@media(max-width:820px){.grid,.formgrid,.metrics{grid-template-columns:1fr}.hero{align-items:flex-start;flex-direction:column}.topActions{justify-content:flex-start;padding-top:0}.wrap{padding:14px}h1{font-size:24px}.appBanner{width:100%;justify-content:center;min-height:42px;padding:8px 12px}.actions .btn,.actions button{width:100%}}
</style>
</head>
<body>
@@ -283,7 +314,7 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
<div class="brand">
<div>
<div class="titleRow">
<h1>OpenWrt Remote Hub</h1>
<h1 class="appBanner"><span>OpenWrt Remote Hub</span></h1>
</div>
<div class="links">
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
@@ -325,11 +356,32 @@ EOF
<button class="btn" name="action" value="doctor">Проверка</button>
<button class="btn primary" name="action" value="install_xray_tmp">Поставить Xray в /tmp</button>
<a class="btn" href="?key=$(h "$key")&action=download_config">Скачать Xray config</a>
<button class="btn primary" name="action" value="show_xray_settings">Xray настройки</button>
</form>
EOF
if [ -n "$RESULT_TITLE" ]; then
printf '<div class="notice %s"><strong>%s</strong>\n%s</div>' "$(h "$RESULT_KIND")" "$(h "$RESULT_TITLE")" "$(h "$RESULT_BODY")"
fi
if [ "$SHOW_XRAY_SETTINGS" = "1" ]; then
cat <<EOF
<div class="xrayApply">
<h3>Xray настройки</h3>
<p class="helperText">Вставь сюда блок команд из OpenWrt config на VPS. Роутер сам применит UCI, пересоберет Xray config, включит сервис и отправит heartbeat.</p>
<form method="post">
<input type="hidden" name="key" value="$(h "$key")">
<textarea class="scriptBox" name="xray_settings_script" spellcheck="false" placeholder="uci -q delete owrtremote.main
uci set owrtremote.main=remote
uci set owrtremote.main.enabled='1'
...
owrt-remote heartbeat"></textarea>
<div class="actions">
<button class="btn good" name="action" value="apply_xray_settings">Применить настройки</button>
<button class="btn" name="action" value="show_xray_settings">Очистить поле</button>
</div>
</form>
</div>
EOF
fi
cat <<EOF
</div>
@@ -365,8 +417,12 @@ EOF
field vless_encryption "VLESS encryption" text "Для этой схемы оставь none. Меняй только если сам меняешь Xray-конфиг на VPS."
field vless_flow "VLESS flow" text "Обычно оставь пустым. Нужно только для специальных режимов Xray."
field reverse_tag "Reverse tag" text "Метка reverse-туннеля внутри Xray. Обычно оставь reverse-in, если на VPS не задавал другое."
field ssh_vless_uuid "SSH VLESS UUID" text "UUID отдельного SSH reverse-туннеля. Бери из OpenWrt config на VPS для этого роутера."
field ssh_reverse_tag "SSH reverse tag" text "Метка reverse-туннеля для SSH. Обычно reverse-in-ssh."
field admin_host "Admin host" text "Куда внутри роутера вести админку LuCI. Обычно 127.0.0.1, потому что uhttpd слушает локально."
field admin_port "Admin port" number "Порт LuCI/uhttpd внутри роутера. Обычно 80; если LuCI на другом порту, укажи его."
field ssh_host "SSH host" text "Куда внутри роутера вести SSH. Обычно 127.0.0.1."
field ssh_port "SSH port" number "Порт Dropbear/SSH внутри роутера. Обычно 22."
cat <<EOF
</div>
<div class="actions">
@@ -405,6 +461,12 @@ if [ "${REQUEST_METHOD:-GET}" = "POST" ]; then
save_config
run_action start
;;
show_xray_settings)
SHOW_XRAY_SETTINGS="1"
;;
apply_xray_settings)
apply_xray_settings
;;
start|stop|restart|heartbeat|doctor|install_xray_tmp)
run_action "$action"
;;
+79 -13
View File
@@ -2,6 +2,7 @@
import argparse
import base64
import datetime as dt
import hmac
import hashlib
import html
import http.client
@@ -10,6 +11,7 @@ import os
import secrets
import select
import signal
import socket
import sqlite3
import struct
import subprocess
@@ -715,6 +717,14 @@ def current_router_cookie(router_id):
return f"{ROUTER_COOKIE}={urllib.parse.quote(router_id)}; HttpOnly; SameSite=Lax; Path=/"
def ssh_ws_token(secret, router_id):
return hmac.new(
secret.encode("utf-8"),
f"ssh:{router_id}".encode("utf-8"),
hashlib.sha256,
).hexdigest()
def strip_access_prefix(path, router_id):
prefix = f"/access/{urllib.parse.quote(router_id)}"
if path == prefix:
@@ -796,18 +806,19 @@ body::before{{content:"";position:fixed;inset:-25%;z-index:0;pointer-events:none
@keyframes auraSpin{{from{{transform:rotate(0deg) scale(1)}}to{{transform:rotate(360deg) scale(1.08)}}}}
.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}}
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{{position:relative;justify-content:flex-end;padding-top:42px}}.badge{{background:var(--panel);color:var(--muted)}}.authToggle{{cursor:pointer}}.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}}.appBanner{{position:relative;display:inline-flex;align-items:center;min-height:44px;padding:8px 18px;border:1px solid rgba(34,211,238,.38);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.18),rgba(124,58,237,.34),rgba(236,72,153,.18));box-shadow:0 16px 42px rgba(124,58,237,.24),inset 0 1px 0 rgba(255,255,255,.12);overflow:hidden}}.appBanner::before{{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgba(255,255,255,.22),transparent);transform:translateX(-120%);animation:bannerShine 6.2s ease-in-out infinite}}.appBanner span{{position:relative}}.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{{position:relative;justify-content:flex-end;padding-top:42px}}.badge{{background:var(--panel);color:var(--muted)}}.authToggle{{cursor:pointer}}.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)}}
.authMenu{{position:absolute;right:0;top:calc(100% + 10px);z-index:5;width:min(520px,calc(100vw - 44px));padding:14px;background:linear-gradient(180deg,rgba(255,255,255,.09),rgba(255,255,255,.05)),rgba(19,14,32,.96);border:1px solid var(--line);border-radius:8px;box-shadow:0 24px 70px rgba(0,0,0,.36);backdrop-filter:blur(12px)}}.authMenu[hidden]{{display:none}}.authMenu h2{{margin:0 0 4px;font-size:18px}}.authMenu p{{margin:0 0 12px;color:var(--muted)}}.authGrid{{display:grid;grid-template-columns:1fr 1fr;gap:10px}}.authGrid .wide{{grid-column:1/-1}}.msg{{margin-top:10px;color:#bbf7d0;font-weight:750}}.msg.bad{{color:#fecdd3}}.formMsg{{margin:-8px 0 18px;padding:10px 12px;border:1px solid rgba(34,197,94,.34);border-radius:8px;background:rgba(34,197,94,.12);color:#bbf7d0;font-weight:800}}.formMsg.bad{{border-color:rgba(251,113,133,.4);background:rgba(251,113,133,.13);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}}.authToggle{{border-radius:999px;padding:8px 14px;background:var(--panel);color:var(--muted)}}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}}
.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.online{{border-color:rgba(34,197,94,.45);box-shadow:0 18px 46px rgba(0,0,0,.28),0 0 0 1px rgba(34,197,94,.10),0 0 34px rgba(34,197,94,.10)}}.card.online::after{{content:"";position:absolute;right:-42px;top:-42px;width:108px;height:108px;border-radius:50%;background:radial-gradient(circle,rgba(34,197,94,.26),transparent 68%);animation:onlineGlow 2.4s ease-in-out infinite}}.card.off{{border-color:rgba(251,113,133,.42);box-shadow:0 18px 46px rgba(0,0,0,.28),0 0 0 1px rgba(251,113,133,.08),0 0 30px rgba(251,113,133,.08)}}.card.off::after{{content:"";position:absolute;right:-42px;top:-42px;width:108px;height:108px;border-radius:50%;background:radial-gradient(circle,rgba(251,113,133,.22),transparent 68%);animation:offlineGlow 2.8s ease-in-out infinite}}.card.off::before{{background:var(--red)}}.card.warn::before{{background:var(--amber)}}.card.main{{grid-column:span 2}}
@keyframes onlineGlow{{0%,100%{{transform:scale(.9);opacity:.55}}50%{{transform:scale(1.08);opacity:1}}}}@keyframes offlineGlow{{0%,100%{{transform:scale(.88);opacity:.34}}50%{{transform:scale(1.08);opacity:.9}}}}
@keyframes bannerShine{{0%,45%{{transform:translateX(-120%)}}72%,100%{{transform:translateX(120%)}}}}
.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(34,197,94,.36);background:rgba(34,197,94,.14);padding:7px 10px;font-weight:900;font-size:12px;color:#bbf7d0}}.status i{{width:8px;height:8px;border-radius:50%;background:var(--green);box-shadow:0 0 13px var(--green);animation:statusPulse 1.6s ease-in-out infinite}}.status.off{{border-color:rgba(251,113,133,.36);background:rgba(251,113,133,.12);color:#fecdd3}}.status.off i{{background:var(--red);box-shadow:0 0 13px var(--red);animation:offlinePulse 1.9s ease-in-out infinite}}.status.warn i{{background:var(--amber);box-shadow:0 0 13px var(--amber)}}@keyframes statusPulse{{0%,100%{{transform:scale(1);opacity:.75}}50%{{transform:scale(1.45);opacity:1}}}}@keyframes offlinePulse{{0%,100%{{transform:scale(1);opacity:.5}}50%{{transform:scale(1.42);opacity:1}}}}.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.span2{{grid-column:span 2}}.metric.temp-ok strong{{color:#bbf7d0}}.metric.temp-warn strong{{color:#fde68a}}.metric.temp-bad strong{{color:#fecdd3}}.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,.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){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start;flex-direction:column}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.links,.headerActions,.summary{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.cards,.toolbar,.authGrid{{grid-template-columns:1fr}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.name{{white-space:normal;font-size:18px}}.sectionHead{{align-items:flex-start;flex-direction:column;margin:18px 0 10px}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}}}
@media(max-width:680px){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start;flex-direction:column}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.appBanner{{width:100%;justify-content:center;min-height:42px;padding:8px 12px}}.links,.headerActions,.summary{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.cards,.toolbar,.authGrid{{grid-template-columns:1fr}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.name{{white-space:normal;font-size:18px}}.sectionHead{{align-items:flex-start;flex-direction:column;margin:18px 0 10px}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}}}
@media(max-width:420px){{.links,.headerActions,.summary,.actions{{grid-template-columns:1fr}}.metrics{{grid-template-columns:1fr}}.metric.span2{{grid-column:span 1}}}}
</style>
</head>
@@ -816,7 +827,7 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
<section class="top">
<div class="brand">
<div>
<h1>OpenWrt Remote Hub</h1>
<h1 class="appBanner"><span>OpenWrt Remote Hub</span></h1>
<div class="links">
<a href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
<a href="https://github.com/kzolotarev95" target="_blank" rel="noopener noreferrer">GitHub</a>
@@ -1198,12 +1209,14 @@ setInterval(loadRouters, 5000);
</html>"""
def ssh_terminal_html(row):
def ssh_terminal_html(row, ws_token):
router_id = row["id"]
safe_id = html.escape(router_id, quote=True)
safe_name = html.escape(row["name"] or router_id, quote=True)
ssh_port = int(row["ssh_entry_port"] or 0)
ws_path = f"/ssh-ws/{urllib.parse.quote(router_id)}"
quoted_id = urllib.parse.quote(router_id)
ws_path = f"/ssh-ws/{quoted_id}?t={urllib.parse.quote(ws_token)}"
check_path = f"/api/ssh/{quoted_id}/check?t={urllib.parse.quote(ws_token)}"
return f"""<!doctype html>
<html lang="ru">
<head>
@@ -1310,13 +1323,33 @@ function sendCommandInput() {{
cmdInput.value = '';
term.focus();
}}
let wsOpened = false;
let diagnosticStarted = false;
async function explainTerminalError(source) {{
if (diagnosticStarted) return;
diagnosticStarted = true;
try {{
const res = await fetch('{check_path}', {{cache: 'no-store'}});
const data = await res.json();
if (data.tcp_ok) {{
write(`\\r\\n[${{source}}]\\r\\nSSH-порт на VPS доступен, но WebSocket не открылся. Если это только на мобильном интернете, оператор или firewall режет порт 8088/WebSocket. Лучший фикс: открыть Hub через HTTPS на 443.\\r\\n`);
}} else {{
write(`\\r\\n[${{source}}]\\r\\nSSH-туннель на VPS не отвечает: ${{data.error || 'порт закрыт'}}\\r\\nНажми в Hub: Обновить Xray VPS, потом Рестарт Xray VPS, и проверь heartbeat роутера.\\r\\n`);
}}
}} catch (e) {{
write(`\\r\\n[${{source}}]\\r\\nНе смог проверить SSH-туннель. Если страница открыта с мобильного интернета, проверь доступ к http://VPS_IP:8088/ и firewall VPS.\\r\\n`);
}}
}}
function connect() {{
const proto = location.protocol === 'https:' ? 'wss://' : 'ws://';
ws = new WebSocket(proto + location.host + '{ws_path}');
ws.onopen = () => {{}};
ws.onopen = () => {{ wsOpened = true; }};
ws.onmessage = (ev) => write(ev.data);
ws.onerror = () => write('\\r\\n[ошибка web-terminal]\\r\\n');
ws.onclose = () => write('\\r\\n[SSH соединение закрыто]\\r\\n');
ws.onerror = () => explainTerminalError('ошибка web-terminal');
ws.onclose = () => {{
if (wsOpened) write('\\r\\n[SSH соединение закрыто]\\r\\n');
else explainTerminalError('SSH соединение закрыто');
}};
}}
term.addEventListener('keydown', (ev) => {{
if (ev.ctrlKey && ev.key.toLowerCase() === 'c') {{ send('\\x03'); ev.preventDefault(); return; }}
@@ -1392,7 +1425,7 @@ body::before{{content:"";position:fixed;inset:-28%;pointer-events:none;backgroun
.login{{position:relative;z-index:1;width:min(360px,100%);padding:16px;border:1px solid var(--line);border-radius:8px;background:linear-gradient(180deg,rgba(255,255,255,.10),rgba(255,255,255,.045)),var(--panel);box-shadow:0 22px 64px rgba(0,0,0,.40);backdrop-filter:blur(14px)}}
.brand{{display:flex;gap:10px;align-items:center;margin-bottom:12px}}
.logo{{width:72px;height:34px;border-radius:8px;display:grid;place-items:center;background:linear-gradient(135deg,#22d3ee,#7c3aed 58%,#22c55e);box-shadow:0 12px 30px rgba(124,58,237,.28);font-size:12px;font-weight:950;color:white;letter-spacing:.1px}}
h1{{margin:0;font-size:23px;line-height:1.1;letter-spacing:0}}
h1{{margin:0;font-size:21px;line-height:1.1;letter-spacing:0}}.appBanner{{position:relative;display:inline-flex;align-items:center;min-height:38px;padding:7px 14px;border:1px solid rgba(34,211,238,.38);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.18),rgba(124,58,237,.34),rgba(236,72,153,.18));box-shadow:0 14px 34px rgba(124,58,237,.24),inset 0 1px 0 rgba(255,255,255,.12);overflow:hidden}}.appBanner::before{{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgba(255,255,255,.22),transparent);transform:translateX(-120%);animation:bannerShine 6.2s ease-in-out infinite}}.appBanner span{{position:relative}}@keyframes bannerShine{{0%,45%{{transform:translateX(-120%)}}72%,100%{{transform:translateX(120%)}}}}
p{{margin:3px 0 0;color:var(--muted)}}
label{{display:block;margin:10px 0 5px;font-weight:850;color:#ede9fe}}
input{{width:100%;border:1px solid var(--line);border-radius:8px;padding:11px 12px;background:rgba(8,5,18,.74);color:var(--text);outline:none;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}}
@@ -1408,7 +1441,7 @@ button:hover{{filter:brightness(1.06)}}
<div class="brand">
<div class="logo">OpenWrt</div>
<div>
<h1>Remote Hub</h1>
<h1 class="appBanner"><span>OpenWrt Remote Hub</span></h1>
<p>Вход в панель роутеров</p>
</div>
</div>
@@ -1471,6 +1504,12 @@ class Handler(BaseHTTPRequestHandler):
cookies = parse_cookies(self.headers.get("Cookie", ""))
return secrets.compare_digest(cookies.get(SESSION_COOKIE, ""), self.app.session_token)
def ssh_token_ok(self, router_id):
token = self.query().get("t", [""])[0]
if not token:
return False
return secrets.compare_digest(token, ssh_ws_token(self.app.session_token, router_id))
def agent_ok(self):
auth = self.headers.get("Authorization", "")
if auth.startswith("Bearer "):
@@ -1593,19 +1632,20 @@ class Handler(BaseHTTPRequestHandler):
if int(row["ssh_entry_port"] or 0) <= 0:
self.send_text(400, "router has no ssh_entry_port")
return
ws_token = ssh_ws_token(self.app.session_token, router_id)
self.send_bytes(
200,
ssh_terminal_html(row).encode("utf-8"),
ssh_terminal_html(row, ws_token).encode("utf-8"),
"text/html; charset=utf-8",
[("Set-Cookie", current_router_cookie(router_id))],
)
def ssh_ws(self):
if not self.admin_ok():
router_id = self.router_id_from_path("/ssh-ws/")
if not (self.admin_ok() or self.ssh_token_ok(router_id)):
self.send_response(403)
self.end_headers()
return
router_id = self.router_id_from_path("/ssh-ws/")
with self.app.conn() as conn:
row = get_router(conn, router_id)
if not row:
@@ -1630,6 +1670,29 @@ class Handler(BaseHTTPRequestHandler):
self.close_connection = True
self.run_ssh_session(router_id, port)
def ssh_check(self):
router_id = self.router_id_from_path("/api/ssh/")
if router_id.endswith("/check"):
router_id = router_id[:-6].rstrip("/")
if not (self.admin_ok() or self.ssh_token_ok(router_id)):
self.send_json(403, {"ok": False, "error": "not authorized", "tcp_ok": False})
return
with self.app.conn() as conn:
row = get_router(conn, router_id)
if not row:
self.send_json(404, {"ok": False, "error": "router not found", "tcp_ok": False})
return
port = int(row["ssh_entry_port"] or 0)
if port <= 0:
self.send_json(200, {"ok": False, "error": "router has no ssh_entry_port", "tcp_ok": False})
return
try:
with socket.create_connection(("127.0.0.1", port), timeout=3):
pass
self.send_json(200, {"ok": True, "router_id": router_id, "port": port, "tcp_ok": True})
except Exception as exc:
self.send_json(200, {"ok": False, "router_id": router_id, "port": port, "tcp_ok": False, "error": str(exc)})
def run_ssh_session(self, router_id, port):
try:
import pty
@@ -1724,6 +1787,9 @@ class Handler(BaseHTTPRequestHandler):
if path == "/logout":
self.redirect("/login", [("Set-Cookie", self.clear_session_cookie())])
return
if path.startswith("/api/ssh/") and path.endswith("/check"):
self.ssh_check()
return
if path.startswith("/ssh-ws/"):
self.ssh_ws()
return