Карточки роутеров
@@ -492,10 +599,8 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
После добавления роутера открой OpenWrt config, вставь команды на роутере и перегенерируй server Xray config командой owrt-remote-hub.py render-xray --out /etc/xray/owrt-remote.json.
@@ -615,16 +740,17 @@ setInterval(loadRouters, 5000);
"""
-def login_html():
- return """
OpenWrt Remote Hub
-
-
"""
+def login_html(error=""):
+ error_html = f"
{html.escape(error)}
" if error else ""
+ return f"""
OpenWrt Remote Hub
+
+
"""
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.admin_token = admin
+ self.session_token = session
self.agent_token = agent
self.public_url = public_url.rstrip("/")
@@ -651,15 +777,8 @@ class Handler(BaseHTTPRequestHandler):
return urllib.parse.parse_qs(self.parsed().query)
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", ""))
- return secrets.compare_digest(cookies.get("owrt_remote_admin", ""), self.app.admin_token)
-
- def admin_cookie_needed(self):
- query_token = self.query().get("token", [""])[0]
- return secrets.compare_digest(query_token, self.app.admin_token)
+ return secrets.compare_digest(cookies.get(SESSION_COOKIE, ""), self.app.session_token)
def agent_ok(self):
auth = self.headers.get("Authorization", "")
@@ -667,12 +786,10 @@ class Handler(BaseHTTPRequestHandler):
return secrets.compare_digest(auth[7:].strip(), self.app.agent_token)
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_header("Content-Type", content_type)
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:
for key, value in extra_headers:
self.send_header(key, value)
@@ -681,11 +798,11 @@ class Handler(BaseHTTPRequestHandler):
self.wfile.write(body)
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):
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):
if self.admin_ok():
@@ -719,11 +836,65 @@ class Handler(BaseHTTPRequestHandler):
parsed = urllib.parse.parse_qs(body.decode("utf-8"))
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):
path = self.parsed().path
if path == "/health":
self.send_json(200, {"ok": True})
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/"):
self.proxy_access(path)
return
@@ -734,9 +905,8 @@ class Handler(BaseHTTPRequestHandler):
routers = [row_to_router(r) for r in list_router_rows(conn)]
self.send_bytes(
200,
- dashboard_html(routers, self.app.admin_token).encode("utf-8"),
+ dashboard_html(routers, current_username()).encode("utf-8"),
"text/html; charset=utf-8",
- set_cookie=self.admin_cookie_needed(),
)
return
if path == "/api/routers":
@@ -751,6 +921,9 @@ class Handler(BaseHTTPRequestHandler):
def do_POST(self):
path = self.parsed().path
+ if path == "/login":
+ self.login()
+ return
if path == "/api/heartbeat":
if not self.agent_ok():
self.send_json(401, {"ok": False, "error": "bad agent token"})
@@ -769,6 +942,9 @@ class Handler(BaseHTTPRequestHandler):
return
if not self.require_admin():
return
+ if path == "/api/auth":
+ self.update_auth()
+ return
if path == "/api/router":
try:
payload = self.read_payload()
@@ -873,16 +1049,10 @@ class Handler(BaseHTTPRequestHandler):
resp_body,
content_type or "application/octet-stream",
resp_headers,
- set_cookie=self.admin_cookie_needed(),
)
except Exception as 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):
if value.startswith("/"):
@@ -951,9 +1121,19 @@ def should_rewrite_body(content_type):
def cmd_init(args):
with connect(args.db) as conn:
init_db(conn)
+ auth = load_auth()
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()}")
+ 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):
@@ -1019,13 +1199,14 @@ def cmd_print_openwrt(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():
pass
+ auth = load_auth()
server = ThreadingHTTPServer((args.host, args.port), Handler)
server.app = app
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}")
try:
server.serve_forever()
@@ -1041,6 +1222,11 @@ def parser():
init = sub.add_parser("init", help="initialize state and tokens")
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.add_argument("--id", required=True)
add.add_argument("--name", required=True)
diff --git a/vps/owrt-remote.service b/vps/owrt-remote.service
index ceaffee..e6e803e 100644
--- a/vps/owrt-remote.service
+++ b/vps/owrt-remote.service
@@ -5,7 +5,7 @@ Wants=network-online.target
[Service]
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_STATE_DIR=/var/lib/owrt-remote
ExecStart=/opt/owrt-remote/owrt-remote-hub.py serve
@@ -15,4 +15,3 @@ DynamicUser=no
[Install]
WantedBy=multi-user.target
-