diff --git a/vps/install-vps.sh b/vps/install-vps.sh index 673c365..fe1377b 100755 --- a/vps/install-vps.sh +++ b/vps/install-vps.sh @@ -2,7 +2,7 @@ set -u APP_NAME="OpenWrt Remote Hub" -INSTALLER_VERSION="2026-08-13-passkey-v1" +INSTALLER_VERSION="2026-08-15-branding-v1" RAW_BASE="${RAW_URL:-https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main}" STATE_DIR="${OWRT_REMOTE_STATE_DIR:-/var/lib/owrt-remote}" HUB_LOGIN="${HUB_LOGIN:-admin}" @@ -97,11 +97,16 @@ install_xray_binary() { install_files() { cache_bust="$(date +%s)" - $SUDO mkdir -p /opt/owrt-remote "$STATE_DIR" /etc/xray + $SUDO mkdir -p /opt/owrt-remote/static "$STATE_DIR" /etc/xray $SUDO wget -O /opt/owrt-remote/owrt-remote-hub.py "$RAW_BASE/vps/owrt-remote-hub.py?v=$cache_bust" $SUDO wget -O /opt/owrt-remote/owrt-remote-run.sh "$RAW_BASE/vps/owrt-remote-run.sh?v=$cache_bust" $SUDO wget -O /etc/systemd/system/owrt-remote.service "$RAW_BASE/vps/owrt-remote.service?v=$cache_bust" $SUDO wget -O /opt/owrt-remote/enable-https.sh "$RAW_BASE/vps/enable-https.sh?v=$cache_bust" + $SUDO wget -O /opt/owrt-remote/static/favicon.ico "$RAW_BASE/vps/static/favicon.ico?v=$cache_bust" + $SUDO wget -O /opt/owrt-remote/static/favicon-32.png "$RAW_BASE/vps/static/favicon-32.png?v=$cache_bust" + $SUDO wget -O /opt/owrt-remote/static/favicon-192.png "$RAW_BASE/vps/static/favicon-192.png?v=$cache_bust" + $SUDO wget -O /opt/owrt-remote/static/favicon-512.png "$RAW_BASE/vps/static/favicon-512.png?v=$cache_bust" + $SUDO wget -O /opt/owrt-remote/static/apple-touch-icon.png "$RAW_BASE/vps/static/apple-touch-icon.png?v=$cache_bust" $SUDO chmod +x /opt/owrt-remote/owrt-remote-hub.py /opt/owrt-remote/owrt-remote-run.sh /opt/owrt-remote/enable-https.sh } diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index db4ae91..92085bc 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -24,7 +24,9 @@ import tarfile import tempfile import threading import time +import urllib.error import urllib.parse +import urllib.request import uuid from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer from pathlib import Path @@ -61,6 +63,14 @@ except Exception: APP_NAME = "OpenWrt Remote Hub" RAW_REPO_BASE = "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main" +APP_DIR = Path(__file__).resolve().parent +STATIC_DIR = APP_DIR / "static" +BRAND_THEME_COLOR = "#24192f" +FAVICON_ICO_FILE = STATIC_DIR / "favicon.ico" +FAVICON_PNG_32_FILE = STATIC_DIR / "favicon-32.png" +FAVICON_PNG_192_FILE = STATIC_DIR / "favicon-192.png" +FAVICON_PNG_512_FILE = STATIC_DIR / "favicon-512.png" +APPLE_TOUCH_ICON_FILE = STATIC_DIR / "apple-touch-icon.png" 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"))) AUTH_FILE = STATE_DIR / "hub-auth.json" @@ -88,6 +98,9 @@ SESSION_COOKIE = "owrt_remote_session" ROUTER_COOKIE = "owrt_remote_router" SESSION_TTL_SECONDS = int(os.environ.get("OWRT_REMOTE_SESSION_TTL", str(30 * 24 * 60 * 60))) CAPTCHA_TTL_SECONDS = 600 +CAPTCHA_MODE_DIGITS = "digits" +CAPTCHA_MODE_RECAPTCHA = "recaptcha" +RECAPTCHA_VERIFY_URL = "https://www.google.com/recaptcha/api/siteverify" AUTH_CHALLENGE_TTL_SECONDS = 300 TOTP_PERIOD_SECONDS = 30 TOTP_DIGITS = 6 @@ -123,6 +136,19 @@ BACKUP_STATE_FILES = ( XRAY_WAN_RECONNECT_FILE, TRAFFIC_COUNTERS_FILE, ) +SOCIAL_PROVIDERS = { + "github": { + "label": "GitHub", + "authorize_url": "https://github.com/login/oauth/authorize", + "token_url": "https://github.com/login/oauth/access_token", + }, + "vk": { + "label": "VK ID", + "authorize_url": "https://id.vk.ru/authorize", + "token_url": "https://id.vk.ru/oauth2/auth", + "api_url": "https://id.vk.ru/oauth2/user_info", + }, +} def now_ts(): @@ -382,6 +408,140 @@ def sanitize_ssh_key_record(item): } +def social_provider_label(provider): + return SOCIAL_PROVIDERS.get(str(provider or "").strip().lower(), {}).get("label", "OAuth") + + +def default_social_provider_state(provider=""): + return { + "client_id": "", + "client_secret": "", + "accounts": [], + } + + +def social_provider_secret_label(provider): + provider = str(provider or "").strip().lower() + if provider == "vk": + return "Service Token" + return "Client Secret" + + +def social_provider_secret_required(provider): + provider = str(provider or "").strip().lower() + return provider != "vk" + + +def social_provider_configured(provider, item): + provider = str(provider or "").strip().lower() + item = dict(item or {}) + if not item.get("client_id"): + return False + if social_provider_secret_required(provider): + return bool(item.get("client_secret")) + return True + + +def social_provider_setup_message(provider): + label = social_provider_label(provider) + if social_provider_secret_required(provider): + return f"Сначала сохрани client_id и {social_provider_secret_label(provider).lower()} для {label}" + return f"Сначала сохрани client_id для {label}" + + +def sanitize_social_account_record(provider, item): + item = dict(item or {}) + account_id = str(item.get("id") or "").strip() + if not account_id: + return None + login = str(item.get("login") or "").strip()[:120] + name = str(item.get("name") or "").strip()[:160] + email = str(item.get("email") or "").strip()[:160] + label = str(item.get("label") or "").strip()[:160] + if not label: + label = name or login or email or f"{social_provider_label(provider)} #{account_id}" + return { + "id": account_id, + "label": label, + "login": login, + "name": name, + "email": email, + "profile_url": str(item.get("profile_url") or "").strip()[:500], + "avatar_url": str(item.get("avatar_url") or "").strip()[:500], + "linked_at": int(item.get("linked_at") or now_ts()), + "last_used_at": int(item.get("last_used_at") or 0), + } + + +def sanitize_social_provider_state(provider, item): + clean = default_social_provider_state(provider) + item = dict(item or {}) + clean["client_id"] = str(item.get("client_id") or "").strip()[:240] + clean["client_secret"] = str(item.get("client_secret") or "").strip()[:512] + seen = set() + accounts = [] + for row in item.get("accounts", []) if isinstance(item.get("accounts"), list) else []: + account = sanitize_social_account_record(provider, row) + if not account or account["id"] in seen: + continue + seen.add(account["id"]) + accounts.append(account) + clean["accounts"] = accounts + return clean + + +def social_provider_enabled(provider, item): + item = dict(item or {}) + return bool(social_provider_configured(provider, item) and item.get("accounts")) + + +def social_public_meta(auth=None): + auth = normalize_auth_state(auth or load_auth()) + social = auth.get("social", {}) + result = {} + for provider in SOCIAL_PROVIDERS: + item = sanitize_social_provider_state(provider, social.get(provider)) + result[provider] = { + "label": social_provider_label(provider), + "configured": social_provider_configured(provider, item), + "linked_count": len(item.get("accounts", [])), + "enabled": social_provider_enabled(provider, item), + } + return result + + +def default_captcha_state(): + return { + "mode": CAPTCHA_MODE_DIGITS, + "site_key": "", + "secret_key": "", + } + + +def sanitize_captcha_mode(value): + value = str(value or "").strip().lower() + return CAPTCHA_MODE_RECAPTCHA if value == CAPTCHA_MODE_RECAPTCHA else CAPTCHA_MODE_DIGITS + + +def sanitize_captcha_state(item): + clean = default_captcha_state() + item = dict(item or {}) + clean["mode"] = sanitize_captcha_mode(item.get("mode")) + clean["site_key"] = str(item.get("site_key") or "").strip()[:240] + clean["secret_key"] = str(item.get("secret_key") or "").strip()[:512] + return clean + + +def effective_captcha_state(auth=None): + auth = normalize_auth_state(auth or load_auth()) + state = sanitize_captcha_state(auth.get("captcha")) + configured = bool(state.get("site_key") and state.get("secret_key")) + effective_mode = CAPTCHA_MODE_RECAPTCHA if state.get("mode") == CAPTCHA_MODE_RECAPTCHA and configured else CAPTCHA_MODE_DIGITS + state["configured"] = configured + state["effective_mode"] = effective_mode + return state + + def normalize_auth_state(data): raw = dict(data or {}) state = { @@ -420,26 +580,49 @@ def normalize_auth_state(data): ssh_keys.append(clean) state["passkeys"] = passkeys state["ssh_keys"] = ssh_keys + state["captcha"] = sanitize_captcha_state(raw.get("captcha")) + social_state = {} + raw_social = raw.get("social") if isinstance(raw.get("social"), dict) else {} + for provider in SOCIAL_PROVIDERS: + social_state[provider] = sanitize_social_provider_state(provider, raw_social.get(provider)) + state["social"] = social_state return state def public_auth_meta(auth=None): auth = normalize_auth_state(auth or load_auth()) + captcha = effective_captcha_state(auth) + passkey_info = passkey_inventory(auth) return { "username": auth.get("username", "admin"), "totp_enabled": bool(auth.get("totp", {}).get("enabled")), "passkeys_supported": passkey_supported(), - "passkey_count": len(auth.get("passkeys", [])), + "passkey_count": len(passkey_info.get("credentials", [])), + "passkey_invalid_count": int(passkey_info.get("invalid_count", 0)), "ssh_key_count": len(auth.get("ssh_keys", [])), "ed25519_enabled": bool(auth.get("ssh_keys", [])), "ssh_keys": [{"id": item.get("id", ""), "label": item.get("label", "SSH ED25519")} for item in auth.get("ssh_keys", [])], + "captcha": { + "mode": captcha.get("effective_mode", CAPTCHA_MODE_DIGITS), + "configured": bool(captcha.get("configured")), + "site_key": captcha.get("site_key", "") if captcha.get("configured") else "", + }, + "social": social_public_meta(auth), } def admin_auth_meta(auth=None): auth = normalize_auth_state(auth or load_auth()) + captcha = effective_captcha_state(auth) return { **public_auth_meta(auth), + "captcha": { + "mode": sanitize_captcha_mode(auth.get("captcha", {}).get("mode")), + "effective_mode": captcha.get("effective_mode", CAPTCHA_MODE_DIGITS), + "configured": bool(captcha.get("configured")), + "site_key": auth.get("captcha", {}).get("site_key", ""), + "secret_key": auth.get("captcha", {}).get("secret_key", ""), + }, "passkeys": [ { "id": item.get("id", ""), @@ -459,6 +642,18 @@ def admin_auth_meta(auth=None): } for item in auth.get("ssh_keys", []) ], + "social": { + provider: { + "label": social_provider_label(provider), + "client_id": auth.get("social", {}).get(provider, {}).get("client_id", ""), + "client_secret": auth.get("social", {}).get(provider, {}).get("client_secret", ""), + "configured": social_provider_configured(provider, auth.get("social", {}).get(provider, {})), + "linked_count": len(auth.get("social", {}).get(provider, {}).get("accounts", [])), + "enabled": social_provider_enabled(provider, auth.get("social", {}).get(provider, {})), + "accounts": list(auth.get("social", {}).get(provider, {}).get("accounts", [])), + } + for provider in SOCIAL_PROVIDERS + }, } @@ -472,6 +667,10 @@ def auth_method_label(value): return "Password + 2FA" if value == "password": return "Password" + if value == "github": + return "GitHub" + if value == "vk": + return "VK ID" return "Auth" @@ -507,15 +706,24 @@ def update_auth_state(mutator): return save_auth_state(result if isinstance(result, dict) else current) -def passkey_credentials(auth=None): +def passkey_inventory(auth=None): auth = normalize_auth_state(auth or load_auth()) - rows = [] + credentials = [] + invalid_count = 0 for item in auth.get("passkeys", []): try: - rows.append(AttestedCredentialData(b64url_decode(item.get("credential_data", "")))) + credentials.append(AttestedCredentialData(b64url_decode(item.get("credential_data", "")))) except Exception: - continue - return rows + invalid_count += 1 + return { + "credentials": credentials, + "stored_count": len(auth.get("passkeys", [])), + "invalid_count": invalid_count, + } + + +def passkey_credentials(auth=None): + return passkey_inventory(auth).get("credentials", []) def find_passkey_record(auth, credential_id): @@ -534,6 +742,98 @@ def find_ssh_key_record(auth, key_id): return None +def find_social_account_record(auth, provider, account_id): + wanted = str(account_id or "").strip() + if not wanted: + return None + social = normalize_auth_state(auth).get("social", {}) + for item in social.get(str(provider or "").strip().lower(), {}).get("accounts", []): + if item.get("id") == wanted: + return item + return None + + +def upsert_social_account(auth, provider, account): + clean = normalize_auth_state(auth) + provider = str(provider or "").strip().lower() + if provider not in SOCIAL_PROVIDERS: + raise ValueError("unknown provider") + account_row = sanitize_social_account_record(provider, account) + if not account_row: + raise ValueError("account is empty") + items = [] + replaced = False + for current in clean.get("social", {}).get(provider, {}).get("accounts", []): + if current.get("id") == account_row["id"]: + merged = dict(current) + merged.update(account_row) + merged["linked_at"] = int(current.get("linked_at") or account_row.get("linked_at") or now_ts()) + merged["last_used_at"] = int(current.get("last_used_at") or account_row.get("last_used_at") or 0) + items.append(sanitize_social_account_record(provider, merged)) + replaced = True + else: + items.append(current) + if not replaced: + items.append(account_row) + clean["social"][provider]["accounts"] = [item for item in items if item] + return clean + + +def remove_social_account(auth, provider, account_id): + clean = normalize_auth_state(auth) + provider = str(provider or "").strip().lower() + clean["social"][provider]["accounts"] = [ + item for item in clean.get("social", {}).get(provider, {}).get("accounts", []) if item.get("id") != str(account_id or "").strip() + ] + return clean + + +def touch_social_account_last_used(auth, provider, account_id): + clean = normalize_auth_state(auth) + provider = str(provider or "").strip().lower() + now = now_ts() + for item in clean.get("social", {}).get(provider, {}).get("accounts", []): + if item.get("id") == str(account_id or "").strip(): + item["last_used_at"] = now + break + return clean + + +def oauth_fetch_json(url, method="GET", headers=None, data=None): + payload = None + header_map = {str(key): str(value) for key, value in dict(headers or {}).items()} + if data is not None: + if isinstance(data, (bytes, bytearray)): + payload = bytes(data) + elif isinstance(data, dict): + payload = urllib.parse.urlencode(data).encode("utf-8") + if not any(str(key).lower() == "content-type" for key in header_map): + header_map["Content-Type"] = "application/x-www-form-urlencoded" + else: + payload = str(data).encode("utf-8") + request = urllib.request.Request(url, data=payload, method=str(method or "GET").upper()) + base_headers = {"User-Agent": f"{APP_NAME}/1.0", "Accept": "application/json"} + for key, value in header_map.items(): + request.add_header(str(key), str(value)) + for key, value in base_headers.items(): + if not request.has_header(key): + request.add_header(key, value) + try: + with urllib.request.urlopen(request, timeout=15) as response: + body = response.read().decode("utf-8", "replace") + return json.loads(body or "{}") + except urllib.error.HTTPError as exc: + body = exc.read().decode("utf-8", "replace") + try: + detail = json.loads(body or "{}") + except Exception: + detail = {"error": body[:400] or exc.reason} + message = detail.get("error_description") or detail.get("error") or detail.get("message") or exc.reason + raise ValueError(str(message or "OAuth HTTP error")) + except Exception as exc: + raise ValueError(str(exc)) + + def origin_from_parts(scheme, host): scheme = str(scheme or "").strip().lower() host = str(host or "").strip() @@ -1306,6 +1606,15 @@ def b64url(raw): return base64.urlsafe_b64encode(raw).decode("ascii").rstrip("=") +def make_pkce_verifier(): + verifier = secrets.token_urlsafe(64) + return verifier[:96] + + +def make_pkce_challenge(verifier): + return b64url(hashlib.sha256(str(verifier or "").encode("utf-8")).digest()) + + def load_push_subscriptions(): ensure_state() if not PUSH_SUBSCRIPTIONS_FILE.exists(): @@ -1588,14 +1897,26 @@ def web_manifest_json(): "start_url": "/", "scope": "/", "display": "standalone", - "background_color": "#10081c", - "theme_color": "#7c3aed", + "background_color": BRAND_THEME_COLOR, + "theme_color": BRAND_THEME_COLOR, "description": "Удаленный доступ к OpenWrt через свой VPS", "icons": [ { - "src": "/favicon.svg", - "sizes": "any", - "type": "image/svg+xml", + "src": "/favicon-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "any maskable", + }, + { + "src": "/favicon-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "any maskable", + }, + { + "src": "/apple-touch-icon.png", + "sizes": "180x180", + "type": "image/png", "purpose": "any maskable", } ], @@ -1605,6 +1926,25 @@ def web_manifest_json(): ) +def branding_head_tags(include_manifest=True): + parts = [ + '', + '', + '', + ] + if include_manifest: + parts.append('') + parts.extend( + [ + f'', + '', + '', + '', + ] + ) + return "\n".join(parts) + + def favicon_svg(): return """ @@ -1768,6 +2108,96 @@ def verify_captcha(token, answer): return False +def verify_recaptcha_token(secret_key, response_token, remote_ip="", expected_hostname=""): + secret_key = str(secret_key or "").strip() + response_token = str(response_token or "").strip() + if not secret_key or not response_token: + return False, "Подтверди Google reCAPTCHA" + payload = { + "secret": secret_key, + "response": response_token, + } + if remote_ip: + payload["remoteip"] = str(remote_ip).strip() + try: + result = oauth_fetch_json(RECAPTCHA_VERIFY_URL, method="POST", data=payload) + except Exception as exc: + return False, f"Не удалось проверить Google reCAPTCHA: {exc}" + if not result.get("success"): + errors = result.get("error-codes", []) + detail = ", ".join(str(item) for item in errors if str(item).strip()) + if "timeout-or-duplicate" in errors: + return False, "Google reCAPTCHA устарела, попробуй еще раз" + return False, f"Google reCAPTCHA отклонена{': ' + detail if detail else ''}" + actual_hostname = str(result.get("hostname") or "").strip().lower() + expected_hostname = str(expected_hostname or "").strip().lower() + if expected_hostname and actual_hostname and actual_hostname != expected_hostname: + return False, f"Google reCAPTCHA выдана для другого хоста: {actual_hostname}" + return True, "" + + +def login_recaptcha_script(auth=None): + state = effective_captcha_state(auth) + if state.get("effective_mode") != CAPTCHA_MODE_RECAPTCHA: + return "" + return '' + + +def legacy_login_captcha_html(auth=None): + state = effective_captcha_state(auth) + if state.get("effective_mode") == CAPTCHA_MODE_RECAPTCHA: + safe_site_key = html.escape(state.get("site_key", ""), quote=True) + return f""" + +
+
Google reCAPTCHA проверяется на сервере после отправки формы.
""" + captcha_code, captcha_token = captcha_challenge() + safe_captcha_token = html.escape(captcha_token, quote=True) + safe_captcha_code = html.escape(captcha_code, quote=True) + return f""" + +
{safe_captcha_code}
+ + + """ + + +def modern_login_captcha_html(auth=None): + state = effective_captcha_state(auth) + if state.get("effective_mode") == CAPTCHA_MODE_RECAPTCHA: + safe_site_key = html.escape(state.get("site_key", ""), quote=True) + return f""" +
+
Капча: подтверди, что ты не робот
+
+
""" + captcha_code, captcha_token = captcha_challenge() + safe_captcha_token = html.escape(captcha_token, quote=True) + safe_captcha_code = html.escape(captcha_code, quote=True) + return f""" +
+
Капча: введи эти цифры
+
+ +
{safe_captcha_code}
+
+
+ + +
+
+ """ + + def clean_router_id(value): value = (value or "").strip() out = [] @@ -2996,9 +3426,7 @@ def dashboard_html(routers, username, sessions=None, notifications=None): - - - +{branding_head_tags()} {APP_NAME} +{recaptcha_script}
@@ -8586,7 +9367,7 @@ button:hover{{filter:brightness(1.06)}}
{error_html} -

OpenWrt Remote Hub v102

+

OpenWrt Remote Hub v103

@@ -8597,11 +9378,7 @@ button:hover{{filter:brightness(1.06)}} - -
{safe_captcha_code}
- - - + {captcha_html}
Резервная ветка: `Password + 2FA`. Основные альтернативы справа: `Passkey` и `ED25519`.
@@ -8649,7 +9426,6 @@ button:hover{{filter:brightness(1.06)}}
ED25519

Вход по SSH ED25519

-

Запроси challenge, подпиши его своим SSH ED25519 ключом и вставь ASCII signature.

@@ -8658,10 +9434,7 @@ button:hover{{filter:brightness(1.06)}}
-
Пример: -ssh-keygen -Y sign -f ~/.ssh/id_ed25519 -n owrt-remote-hub challenge.txt - -Подпиши текст challenge и вставь содержимое файла `.sig` сюда.
+ Мануал как создать Ssh key
Сначала добавь SSH ED25519 ключ в меню доступа внутри панели.
@@ -8687,7 +9460,7 @@ const flowPasskeyState = document.getElementById('flowPasskeyState'); const flowEd25519State = document.getElementById('flowEd25519State'); const flowPasswordState = document.getElementById('flowPasswordState'); const flowSessionState = document.getElementById('flowSessionState'); -let loginAuthMeta = {{}}; +let loginAuthMeta = {initial_login_meta_json}; let sshTicket = ''; function normalizeLoginUi() {{ @@ -8751,6 +9524,21 @@ function encodeAssertion(assertion) {{ }}; }} +function isCompactSshLogin() {{ + return window.matchMedia ? window.matchMedia('(max-width: 760px)').matches : window.innerWidth <= 760; +}} + +function updateSshHintText(sshCount) {{ + if (!sshHint) return; + if (!sshCount) {{ + sshHint.textContent = 'Сначала добавь SSH ED25519 ключ в меню доступа внутри панели.'; + return; + }} + sshHint.textContent = isCompactSshLogin() + ? 'SSH ED25519 вход доступен на полном экране. На телефоне здесь оставлена только подсказка.' + : 'Нажми Получить challenge, затем вставь подпись и нажми Проверить подпись.'; +}} + function updateLoginMeta() {{ if (loginAuthMeta.totp_enabled) {{ hubOtp.required = true; @@ -8799,7 +9587,7 @@ function refreshLoginFlowMeta() {{ }} else {{ sshChallengeBtn.disabled = false; sshVerifyBtn.disabled = !sshTicket; - sshHint.textContent = 'Запроси challenge, подпиши его SSH ED25519 ключом и вставь ASCII signature.'; + sshHint.textContent = 'Нажми Получить challenge, затем вставь подпись и нажми Проверить подпись.'; setFlowBadge(flowEd25519State, `ED25519: ${{sshCount}}`, 'ready'); }} const readyMethods = 1 + (passkeyCount ? 1 : 0) + (sshCount ? 1 : 0); @@ -8879,6 +9667,940 @@ loadLoginMeta(); """ +def login_html(error=""): + error_html = f"
{html.escape(error)}
" if error else "" + auth = normalize_auth_state(load_auth()) + initial_login_meta_json = json.dumps(public_auth_meta(auth), ensure_ascii=False).replace(" + + + + +{branding_head_tags()} +OpenWrt Remote Hub + + + +
+
+
+ +
+
+
+ +
+

Вход в систему

+

Авторизуйся для доступа к панели и защищённым сценариям управления.

+
+
+ {error_html} +
+ + +
+
+
+ +
+ +
+
+ + + + + Безопасное соединение. Данные и альтернативные методы авторизации защищены. +
+
+
+
+
+
+ + +""" + + +def ssh_key_manual_html(): + return """ + + + + +{branding_head_tags(include_manifest=False)} +Мануал: SSH key для Hub + + + +
+
+
+

Мануал: как создать SSH key для Hub

+ Открыть логин Hub +
+

PowerShell команды выполняются на вашем ПК с Windows, не на VPS. В Hub вы вставляете публичный ключ, потом challenge и затем подпись.

+

Важно: файл id_ed25519_hub это приватный ключ, его никому не показывать. В Hub вставляется только файл .pub.

+
+ +
+
+

1. Открой PowerShell на Windows

+

Нажмите Пуск, введите PowerShell и откройте Windows PowerShell.

+
+ +
+

2. Создай SSH-ключ на своем ПК

+

Выполни команду ниже. Потом можно просто два раза нажать Enter, если не хочешь ставить passphrase на ключ.

+
+
+ PowerShell + +
+
ssh-keygen -t ed25519 -a 100 -f $env:USERPROFILE\\.ssh\\id_ed25519_hub -C "hub-login"
+
+

После этого появятся файлы C:\\Users\\ВАШЕ_ИМЯ\\.ssh\\id_ed25519_hub и C:\\Users\\ВАШЕ_ИМЯ\\.ssh\\id_ed25519_hub.pub.

+
+ +
+

3. Покажи публичный ключ и скопируй его целиком

+

Нужна вся строка вида ssh-ed25519 AAAA... hub-login.

+
+
+ PowerShell + +
+
Get-Content $env:USERPROFILE\\.ssh\\id_ed25519_hub.pub
+
+
+ +
+

4. Добавь публичный ключ в Hub

+

Открой Hub, зайди в Доступ к Hub, блок SSH ED25519. Введи текущий пароль от Hub, укажи метку, например Windows-PC, вставь строку из файла .pub и нажми Добавить SSH ED25519.

+
+ +
+

5. Получи challenge на экране логина Hub

+

Нажми Получить challenge, скопируй текст и сохрани его в файл на Windows ПК. Проще всего открыть Блокнот этой командой:

+
+
+ PowerShell + +
+
notepad $env:TEMP\\hub-challenge.txt
+
+

Вставь туда challenge из Hub, сохрани файл и закрой Блокнот.

+
+ +
+

6. Подпиши challenge приватным ключом

+

Подписывать нужно файлом без .pub, то есть именно приватным ключом id_ed25519_hub.

+
+
+ PowerShell + +
+
ssh-keygen -Y sign -f $env:USERPROFILE\\.ssh\\id_ed25519_hub -n owrt-remote-hub $env:TEMP\\hub-challenge.txt
+
+

После этого рядом появится файл C:\\Users\\ВАШЕ_ИМЯ\\AppData\\Local\\Temp\\hub-challenge.txt.sig.

+
+ +
+

7. Покажи подпись и скопируй весь блок

+

Нужен весь текст от -----BEGIN SSH SIGNATURE----- до -----END SSH SIGNATURE-----.

+
+
+ PowerShell + +
+
Get-Content $env:TEMP\\hub-challenge.txt.sig
+
+
+ +
+

8. Вставь подпись обратно в Hub

+

Вернись на экран логина, вставь весь блок подписи в поле SSH signature и нажми Проверить подпись. Если все ок, Hub впустит без пароля.

+
+ +
+

Если команда ssh-keygen не работает

+

Проверь, установлен ли OpenSSH Client в Windows.

+
+
+ PowerShell + +
+
ssh -V
+
+
+
+
+ + +""" + + +_base_login_html = login_html + + +def login_html(error=""): + auth = normalize_auth_state(load_auth()) + page = _base_login_html(error) + state = effective_captcha_state(auth) + if state.get("effective_mode") != CAPTCHA_MODE_RECAPTCHA: + return page + replacement = modern_login_captcha_html(auth) + page, count = re.subn( + r'
.*?', + replacement, + page, + count=1, + flags=re.S, + ) + if count and ".captchaSectionRecaptcha" not in page: + page = page.replace( + ".captchaRefresh:active{transform:translateY(1px)}", + ".captchaRefresh:active{transform:translateY(1px)}" + ".captchaSectionRecaptcha{gap:12px}" + ".captchaHint{color:var(--muted);font-size:12px;line-height:1.45}" + ".recaptchaBox{display:flex;justify-content:center;overflow-x:auto;padding:4px 0}", + 1, + ) + script = login_recaptcha_script(auth) + if script and script not in page: + page = page.replace("", f"{script}\n", 1) + return page + + class App: def __init__(self, db_path, session, agent, public_url): self.db_path = Path(db_path) @@ -9066,6 +10788,14 @@ class Handler(BaseHTTPRequestHandler): def send_text(self, status, text, content_type="text/plain; charset=utf-8"): self.send_bytes(status, text.encode("utf-8"), content_type) + def send_local_asset(self, file_path, content_type): + try: + body = Path(file_path).read_bytes() + except FileNotFoundError: + self.send_text(404, "asset not found") + return + self.send_bytes(200, body, 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") @@ -9160,6 +10890,27 @@ class Handler(BaseHTTPRequestHandler): raise ValueError("Текущий пароль неверный") return auth + def verify_login_captcha(self, payload, auth=None): + auth = normalize_auth_state(auth or load_auth()) + state = effective_captcha_state(auth) + if state.get("effective_mode") == CAPTCHA_MODE_RECAPTCHA: + token = ( + (payload or {}).get("g-recaptcha-response") + or (payload or {}).get("recaptcha_token") + or "" + ) + return verify_recaptcha_token( + state.get("secret_key", ""), + token, + remote_ip=self.client_ip(), + expected_hostname=self.request_host_name(), + ) + captcha_token = (payload or {}).get("captcha_token", "") + captcha_answer = (payload or {}).get("captcha_answer", "") + if verify_captcha(captcha_token, captcha_answer): + return True, "" + return False, "Неверная капча" + def create_login_session(self, username="", auth_method="password"): token, session = make_hub_session( username or current_username(), @@ -9192,6 +10943,233 @@ class Handler(BaseHTTPRequestHandler): [("Set-Cookie", self.session_cookie(token))], ) + def social_callback_url(self, provider): + provider = str(provider or "").strip().lower() + base = public_url_origin(self.app.public_url) or self.request_origin() + if not base: + raise ValueError("Не удалось определить внешний URL Hub для OAuth callback") + return f"{base}/oauth/{provider}/callback" + + def social_provider_config(self, provider, auth=None): + provider = str(provider or "").strip().lower() + if provider not in SOCIAL_PROVIDERS: + raise ValueError("Неизвестный OAuth provider") + auth = normalize_auth_state(auth or load_auth()) + return sanitize_social_provider_state(provider, auth.get("social", {}).get(provider)) + + def social_flow_authorize_url(self, provider, state, redirect_uri, flow=None): + provider = str(provider or "").strip().lower() + cfg = self.social_provider_config(provider) + if not social_provider_configured(provider, cfg): + raise ValueError(social_provider_setup_message(provider)) + flow = dict(flow or {}) + if provider == "github": + query = { + "client_id": cfg["client_id"], + "redirect_uri": redirect_uri, + "scope": "read:user user:email", + "state": state, + "allow_signup": "false", + } + elif provider == "vk": + code_verifier = str(flow.get("code_verifier") or "").strip() + if not code_verifier: + raise ValueError("VK ID flow не подготовлен") + query = { + "client_id": cfg["client_id"], + "redirect_uri": redirect_uri, + "response_type": "code", + "scope": "email vkid.personal_info", + "state": state, + "code_challenge": make_pkce_challenge(code_verifier), + "code_challenge_method": "S256", + } + else: + raise ValueError("Неизвестный OAuth provider") + return f"{SOCIAL_PROVIDERS[provider]['authorize_url']}?{urllib.parse.urlencode(query)}" + + def oauth_popup_html(self, title, message, provider="", ok=False): + tone = "ok" if ok else "bad" + provider = str(provider or "").strip().lower() + payload = json.dumps({"type": "owrt-social-linked", "provider": provider, "ok": bool(ok)}, ensure_ascii=False) + safe_title = html.escape(title or APP_NAME) + safe_message = html.escape(message or "") + return f""" + + + + +{branding_head_tags(include_manifest=False)} +{safe_title} + + + + + + +""" + + def social_login_error_page(self, message): + safe_message = html.escape(message or "Не удалось завершить OAuth вход") + return f""" + + + + +{branding_head_tags(include_manifest=False)} +OAuth ошибка + + + + + +""" + + def exchange_social_code(self, provider, code, redirect_uri, flow=None, flow_state="", device_id=""): + provider = str(provider or "").strip().lower() + cfg = self.social_provider_config(provider) + flow = dict(flow or {}) + if provider == "github": + token = oauth_fetch_json( + SOCIAL_PROVIDERS[provider]["token_url"], + method="POST", + headers={ + "Accept": "application/json", + "Content-Type": "application/x-www-form-urlencoded", + }, + data={ + "client_id": cfg["client_id"], + "client_secret": cfg["client_secret"], + "code": code, + "redirect_uri": redirect_uri, + }, + ) + access_token = str(token.get("access_token") or "").strip() + if not access_token: + raise ValueError(token.get("error_description") or token.get("error") or "GitHub не вернул access token") + profile = oauth_fetch_json( + "https://api.github.com/user", + headers={ + "Accept": "application/vnd.github+json", + "Authorization": f"Bearer {access_token}", + }, + ) + emails = oauth_fetch_json( + "https://api.github.com/user/emails", + headers={ + "Accept": "application/vnd.github+json", + "Authorization": f"Bearer {access_token}", + }, + ) + primary_email = "" + if isinstance(emails, list): + for row in emails: + if row.get("primary"): + primary_email = str(row.get("email") or "").strip() + break + if not primary_email and emails: + primary_email = str(emails[0].get("email") or "").strip() + account_id = str(profile.get("id") or "").strip() + if not account_id: + raise ValueError("GitHub не вернул ID пользователя") + return { + "id": account_id, + "label": str(profile.get("name") or profile.get("login") or primary_email or account_id), + "login": str(profile.get("login") or "").strip(), + "name": str(profile.get("name") or "").strip(), + "email": primary_email, + "profile_url": str(profile.get("html_url") or "").strip(), + "avatar_url": str(profile.get("avatar_url") or "").strip(), + } + if provider == "vk": + code_verifier = str(flow.get("code_verifier") or "").strip() + if not code_verifier: + raise ValueError("VK ID flow истек. Запусти вход еще раз") + device_id = str(device_id or "").strip() + if not device_id: + raise ValueError("VK ID не вернул device_id") + token_payload = { + "grant_type": "authorization_code", + "client_id": cfg["client_id"], + "code": code, + "redirect_uri": redirect_uri, + "code_verifier": code_verifier, + "device_id": device_id, + "state": str(flow_state or "").strip(), + } + service_token = str(cfg.get("client_secret") or "").strip() + if service_token: + token_payload["service_token"] = service_token + token = oauth_fetch_json( + SOCIAL_PROVIDERS[provider]["token_url"], + method="POST", + headers={"Accept": "application/json"}, + data=token_payload, + ) + access_token = str(token.get("access_token") or "").strip() + if not access_token: + raise ValueError(token.get("error_description") or token.get("error") or "VK ID не вернул access token") + token_state = str(token.get("state") or "").strip() + if token_state and token_state != str(flow_state or "").strip(): + raise ValueError("VK ID вернул неожиданный state") + profile = oauth_fetch_json( + SOCIAL_PROVIDERS[provider]["api_url"], + method="POST", + headers={"Accept": "application/json"}, + data={ + "client_id": cfg["client_id"], + "access_token": access_token, + }, + ) + user = profile.get("user") if isinstance(profile.get("user"), dict) else {} + account_id = str(token.get("user_id") or user.get("user_id") or "").strip() + if not account_id: + raise ValueError("VK ID не вернул ID пользователя") + first_name = str(user.get("first_name") or "").strip() + last_name = str(user.get("last_name") or "").strip() + full_name = " ".join(part for part in (first_name, last_name) if part).strip() + email = str(user.get("email") or "").strip() + return { + "id": account_id, + "label": full_name or email or f"VK ID {account_id}", + "login": "", + "name": full_name, + "email": email, + "profile_url": f"https://vk.com/id{account_id}", + "avatar_url": str(user.get("avatar") or "").strip(), + } + raise ValueError("Неизвестный OAuth provider") + def serve_acme_challenge(self, path): prefix = "/.well-known/acme-challenge/" token = urllib.parse.unquote(path[len(prefix):]) @@ -9234,6 +11212,22 @@ class Handler(BaseHTTPRequestHandler): return self.send_bytes(401, login_html(error_text or "Неверный логин или пароль").encode("utf-8"), "text/html; charset=utf-8") + def login(self): + payload = self.read_payload() + username = payload.get("username", "") + password = payload.get("password", "") + otp = payload.get("otp", "") + captcha_ok, captcha_error = self.verify_login_captcha(payload) + if not captcha_ok: + self.send_bytes(401, login_html(captcha_error or "Неверная капча").encode("utf-8"), "text/html; charset=utf-8") + return + ok, error_text, auth, auth_method = verify_password_login(username, password, otp) + if ok: + token, _ = self.create_login_session(auth.get("username", username), auth_method) + self.redirect("/", [("Set-Cookie", self.session_cookie(token))]) + return + self.send_bytes(401, login_html(error_text or "Неверный логин или пароль").encode("utf-8"), "text/html; charset=utf-8") + def update_auth(self): payload = self.read_payload() auth = load_auth() @@ -9258,11 +11252,216 @@ class Handler(BaseHTTPRequestHandler): save_auth_state(auth) self.send_text(200, "Доступ к Hub обновлен") + def update_auth(self): + payload = self.read_payload() + auth = normalize_auth_state(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", "") + captcha_mode = sanitize_captcha_mode(payload.get("captcha_mode")) + captcha_site_key = str(payload.get("captcha_site_key") or "").strip() + captcha_secret_key = str(payload.get("captcha_secret_key") or "").strip() + if new_password: + if new_password != confirm: + self.send_text(400, "Новый пароль и повтор не совпадают") + return + if len(new_password) < MIN_PASSWORD_LENGTH: + self.send_text(400, f"Новый пароль должен быть минимум {MIN_PASSWORD_LENGTH} символа") + return + if captcha_mode == CAPTCHA_MODE_RECAPTCHA and not (captcha_site_key and captcha_secret_key): + self.send_text(400, "Для Google reCAPTCHA нужны Site Key и Secret Key") + return + auth["username"] = clean_username(username) + if new_password: + auth["password"] = password_digest(new_password) + auth["captcha"] = sanitize_captcha_state( + { + "mode": captcha_mode, + "site_key": captcha_site_key, + "secret_key": captcha_secret_key, + } + ) + auth["updated_at"] = now_ts() + save_auth_state(auth) + self.send_text(200, "Доступ к Hub обновлен") + + def build_auth_meta(self, admin=False): + meta = admin_auth_meta() if admin else public_auth_meta() + social = meta.get("social") if isinstance(meta.get("social"), dict) else {} + for provider, item in social.items(): + if not isinstance(item, dict): + continue + item["redirect_uri"] = self.social_callback_url(provider) + return meta + def auth_meta(self): if self.admin_ok(): - self.send_json(200, {"ok": True, "auth": admin_auth_meta()}) + self.send_json(200, {"ok": True, "auth": self.build_auth_meta(admin=True)}) return - self.send_json(200, {"ok": True, "auth": public_auth_meta()}) + self.send_json(200, {"ok": True, "auth": self.build_auth_meta(admin=False)}) + + def save_social_provider_config(self, provider): + try: + payload = self.read_payload() + auth = self.require_current_password(payload) + provider = str(provider or "").strip().lower() + if provider not in SOCIAL_PROVIDERS: + raise ValueError("Неизвестный OAuth provider") + client_id = str(payload.get("client_id") or "").strip() + client_secret = str(payload.get("client_secret") or "").strip() + + def mutator(current): + current = normalize_auth_state(current) + current["social"][provider]["client_id"] = client_id + current["social"][provider]["client_secret"] = client_secret + return current + + save_auth_state(mutator(auth)) + self.send_json( + 200, + { + "ok": True, + "auth": self.build_auth_meta(admin=True), + "message": f"{social_provider_label(provider)} сохранен", + }, + ) + except ValueError as exc: + self.send_json(400, {"ok": False, "error": str(exc)}) + except Exception as exc: + self.send_json(500, {"ok": False, "error": str(exc)}) + + def begin_social_link(self, provider): + try: + payload = self.read_payload() + auth = self.require_current_password(payload) + provider = str(provider or "").strip().lower() + redirect_uri = self.social_callback_url(provider) + cfg = self.social_provider_config(provider, auth) + if not social_provider_configured(provider, cfg): + raise ValueError(social_provider_setup_message(provider)) + flow_payload = { + "provider": provider, + "mode": "link", + "redirect_uri": redirect_uri, + } + if provider == "vk": + flow_payload["code_verifier"] = make_pkce_verifier() + ticket = put_auth_flow(f"oauth-{provider}", flow_payload) + self.send_json( + 200, + { + "ok": True, + "url": self.social_flow_authorize_url(provider, ticket, redirect_uri, flow=flow_payload), + }, + ) + except ValueError as exc: + self.send_json(400, {"ok": False, "error": str(exc)}) + except Exception as exc: + self.send_json(500, {"ok": False, "error": str(exc)}) + + def unlink_social_account(self, provider): + try: + payload = self.read_payload() + auth = self.require_current_password(payload) + provider = str(provider or "").strip().lower() + account_id = str(payload.get("id") or "").strip() + if not account_id: + raise ValueError("Не указан аккаунт для отвязки") + if not find_social_account_record(auth, provider, account_id): + raise ValueError("Аккаунт уже отвязан") + updated = save_auth_state(remove_social_account(auth, provider, account_id)) + self.send_json( + 200, + { + "ok": True, + "auth": self.build_auth_meta(admin=True), + "message": f"{social_provider_label(provider)} отвязан", + }, + ) + except ValueError as exc: + self.send_json(400, {"ok": False, "error": str(exc)}) + except Exception as exc: + self.send_json(500, {"ok": False, "error": str(exc)}) + + def start_social_login(self, provider): + provider = str(provider or "").strip().lower() + try: + redirect_uri = self.social_callback_url(provider) + cfg = self.social_provider_config(provider) + if not social_provider_configured(provider, cfg): + raise ValueError(social_provider_setup_message(provider)) + if not cfg.get("accounts"): + raise ValueError(f"Для {social_provider_label(provider)} пока нет привязанных аккаунтов") + flow_payload = { + "provider": provider, + "mode": "login", + "redirect_uri": redirect_uri, + } + if provider == "vk": + flow_payload["code_verifier"] = make_pkce_verifier() + ticket = put_auth_flow(f"oauth-{provider}", flow_payload) + self.redirect(self.social_flow_authorize_url(provider, ticket, redirect_uri, flow=flow_payload)) + except ValueError as exc: + self.send_bytes(400, self.social_login_error_page(str(exc)).encode("utf-8"), "text/html; charset=utf-8") + except Exception as exc: + self.send_bytes(500, self.social_login_error_page(str(exc)).encode("utf-8"), "text/html; charset=utf-8") + + def finish_social_callback(self, provider): + provider = str(provider or "").strip().lower() + params = self.query() + flow_state = str(params.get("state", [""])[0] or "") + error_code = str(params.get("error", [""])[0] or "") + error_text = str(params.get("error_description", [""])[0] or params.get("error_reason", [""])[0] or error_code or "") + flow = None + try: + flow = pop_auth_flow(flow_state, f"oauth-{provider}") + if not flow: + raise ValueError("OAuth сессия истекла или уже была использована") + if error_code: + raise ValueError(error_text or f"{social_provider_label(provider)} вернул ошибку авторизации") + code = str(params.get("code", [""])[0] or "").strip() + if not code: + raise ValueError("OAuth provider не вернул код авторизации") + device_id = str(params.get("device_id", [""])[0] or "").strip() + account = self.exchange_social_code( + provider, + code, + str(flow.get("redirect_uri") or self.social_callback_url(provider)), + flow=flow, + flow_state=flow_state, + device_id=device_id, + ) + if flow.get("mode") == "link": + updated = save_auth_state(upsert_social_account(load_auth(), provider, account)) + message = f"{social_provider_label(provider)} аккаунт {account.get('label') or account.get('id')} привязан" + self.send_bytes( + 200, + self.oauth_popup_html(social_provider_label(provider), message, provider=provider, ok=True).encode("utf-8"), + "text/html; charset=utf-8", + ) + return + auth = load_auth() + linked = find_social_account_record(auth, provider, account.get("id")) + if not linked: + raise ValueError("Этот аккаунт не привязан к Hub. Сначала привяжи его в разделе Доступ к Hub.") + save_auth_state(touch_social_account_last_used(auth, provider, account.get("id"))) + token, _ = self.create_login_session(current_username(), auth_method=provider) + self.redirect("/", [("Set-Cookie", self.session_cookie(token))]) + except ValueError as exc: + if (flow or {}).get("mode") == "link": + self.send_bytes( + 400, + self.oauth_popup_html(social_provider_label(provider), str(exc), provider=provider, ok=False).encode("utf-8"), + "text/html; charset=utf-8", + ) + return + self.send_bytes(400, self.social_login_error_page(str(exc)).encode("utf-8"), "text/html; charset=utf-8") + except Exception as exc: + self.send_bytes(500, self.social_login_error_page(str(exc)).encode("utf-8"), "text/html; charset=utf-8") def totp_setup(self): try: @@ -9417,8 +11616,11 @@ class Handler(BaseHTTPRequestHandler): def begin_passkey_login(self): try: auth = load_auth() - credentials = passkey_credentials(auth) + passkey_info = passkey_inventory(auth) + credentials = passkey_info.get("credentials", []) if not credentials: + if passkey_info.get("invalid_count"): + raise ValueError("Сохраненный passkey поврежден или записан в старом формате. Удали его в меню доступа и зарегистрируй заново") raise ValueError("Для входа Passkey пока не зарегистрирован") server = self.build_webauthn_server() options, state = server.authenticate_begin( @@ -9439,8 +11641,11 @@ class Handler(BaseHTTPRequestHandler): if not flow: raise ValueError("Passkey-челлендж истек, начни вход заново") auth = load_auth() - credentials = passkey_credentials(auth) + passkey_info = passkey_inventory(auth) + credentials = passkey_info.get("credentials", []) if not credentials: + if passkey_info.get("invalid_count"): + raise ValueError("Сохраненный passkey поврежден или записан в старом формате. Удали его в меню доступа и зарегистрируй заново") raise ValueError("Passkey не зарегистрирован") server = self.build_webauthn_server() credential = server.authenticate_complete(flow.get("state"), credentials, response) @@ -10913,14 +13118,24 @@ exit 127 if path == "/health": self.send_json(200, {"ok": True}) return + if path == "/favicon.ico": + self.send_local_asset(FAVICON_ICO_FILE, "image/x-icon") + return + if path == "/favicon-32.png": + self.send_local_asset(FAVICON_PNG_32_FILE, "image/png") + return + if path == "/favicon-192.png": + self.send_local_asset(FAVICON_PNG_192_FILE, "image/png") + return + if path == "/favicon-512.png": + self.send_local_asset(FAVICON_PNG_512_FILE, "image/png") + return + if path == "/apple-touch-icon.png": + self.send_local_asset(APPLE_TOUCH_ICON_FILE, "image/png") + return if path == "/favicon.svg": self.send_bytes(200, favicon_svg().encode("utf-8"), "image/svg+xml; charset=utf-8") return - if path == "/favicon.ico": - self.send_response(302) - self.send_header("Location", "/favicon.svg") - self.end_headers() - return if path == "/sw.js": self.send_bytes( 200, @@ -10935,12 +13150,27 @@ exit 127 if path == "/api/auth/meta": self.auth_meta() return + if path == "/oauth/github/start": + self.start_social_login("github") + return + if path == "/oauth/vk/start": + self.start_social_login("vk") + return + if path == "/oauth/github/callback": + self.finish_social_callback("github") + return + if path == "/oauth/vk/callback": + self.finish_social_callback("vk") + return if path.startswith("/.well-known/acme-challenge/"): self.serve_acme_challenge(path) return if path == "/login": self.send_bytes(200, login_html().encode("utf-8"), "text/html; charset=utf-8") return + if path == "/ssh-key-manual/": + self.send_bytes(200, ssh_key_manual_html().encode("utf-8"), "text/html; charset=utf-8") + return if path == "/logout": revoke_hub_session(token=self.current_session_token()) self.redirect("/login", [("Set-Cookie", self.clear_session_cookie())]) @@ -11173,6 +13403,24 @@ exit 127 if path == "/api/auth/ssh-keys/remove": self.remove_ssh_key() return + if path == "/api/auth/social/github/save": + self.save_social_provider_config("github") + return + if path == "/api/auth/social/vk/save": + self.save_social_provider_config("vk") + return + if path == "/api/auth/social/github/link": + self.begin_social_link("github") + return + if path == "/api/auth/social/vk/link": + self.begin_social_link("vk") + return + if path == "/api/auth/social/github/unlink": + self.unlink_social_account("github") + return + if path == "/api/auth/social/vk/unlink": + self.unlink_social_account("vk") + return if path == "/api/session/client-hint": payload = self.read_payload() session = update_hub_session_client_hint(self.current_session_token(), payload.get("client_hint", "")) diff --git a/vps/static/apple-touch-icon.png b/vps/static/apple-touch-icon.png new file mode 100644 index 0000000..31628e6 Binary files /dev/null and b/vps/static/apple-touch-icon.png differ diff --git a/vps/static/favicon-192.png b/vps/static/favicon-192.png new file mode 100644 index 0000000..ea7a451 Binary files /dev/null and b/vps/static/favicon-192.png differ diff --git a/vps/static/favicon-32.png b/vps/static/favicon-32.png new file mode 100644 index 0000000..5d60eb3 Binary files /dev/null and b/vps/static/favicon-32.png differ diff --git a/vps/static/favicon-512.png b/vps/static/favicon-512.png new file mode 100644 index 0000000..f6ed6b3 Binary files /dev/null and b/vps/static/favicon-512.png differ diff --git a/vps/static/favicon.ico b/vps/static/favicon.ico new file mode 100644 index 0000000..3a20fdd Binary files /dev/null and b/vps/static/favicon.ico differ