diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index a8c88dd..4d960bb 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -911,6 +911,32 @@ def ws_send_frame(sock, payload, opcode=1): sock.sendall(head + payload) +def set_pty_size(fd, rows, cols): + try: + rows = max(8, min(80, int(rows or 24))) + cols = max(20, min(260, int(cols or 80))) + except Exception: + return False + try: + import fcntl + import termios + + fcntl.ioctl(fd, termios.TIOCSWINSZ, struct.pack("HHHH", rows, cols, 0, 0)) + return True + except Exception: + return False + + +def parse_resize_payload(payload): + try: + message = json.loads(payload.decode("utf-8", errors="ignore")) + except Exception: + return None + if not isinstance(message, dict) or message.get("type") != "resize": + return None + return message.get("rows"), message.get("cols") + + def dashboard_html(routers, username): routers_json = json.dumps(routers, ensure_ascii=False) safe_username = html.escape(username, quote=True) @@ -1829,6 +1855,115 @@ window.setTimeout(focusTerminal, 80); """ +def ssh_terminal_html_v2(row, ws_token): + router_id = row["id"] + safe_name = html.escape(row["name"] or router_id, quote=True) + 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)}" + session_path = f"/api/ssh/{quoted_id}/session?t={urllib.parse.quote(ws_token)}" + page = r""" + + + + +SSH __SAFE_NAME__ + + + + + + +
+
+

SSH · __SAFE_NAME__

+ Назад в Hub +
+
+
+ Terminal +
+ + + +
+
+
Загрузка терминала...
+
+ + + + +
+
+
+ + +""" + return ( + page.replace("__SAFE_NAME__", safe_name) + .replace("__WS_PATH_JSON__", json.dumps(ws_path)) + .replace("__CHECK_PATH_JSON__", json.dumps(check_path)) + .replace("__SESSION_PATH_JSON__", json.dumps(session_path)) + ) + + def login_html(error=""): error_html = f"
{html.escape(error)}
" if error else "" captcha_code, captcha_token = captcha_challenge() @@ -2118,7 +2253,7 @@ class Handler(BaseHTTPRequestHandler): ws_token = ssh_ws_token(self.app.session_token, router_id) self.send_bytes( 200, - ssh_terminal_html(row, ws_token).encode("utf-8"), + ssh_terminal_html_v2(row, ws_token).encode("utf-8"), "text/html; charset=utf-8", [("Set-Cookie", current_router_cookie(router_id))], ) @@ -2178,7 +2313,7 @@ class Handler(BaseHTTPRequestHandler): def ssh_args(self, port): env = os.environ.copy() - env["TERM"] = "dumb" + env["TERM"] = "xterm-256color" args = [ "ssh", "-tt", @@ -2285,6 +2420,8 @@ class Handler(BaseHTTPRequestHandler): return try: session = self.start_ssh_http_session(router_id, port) + query = self.query() + set_pty_size(session["fd"], query.get("rows", ["24"])[0], query.get("cols", ["80"])[0]) self.send_json(200, {"ok": True, "sid": session["id"], "router_id": router_id, "port": port}) except Exception as exc: self.send_json(500, {"ok": False, "error": str(exc)}) @@ -2325,6 +2462,17 @@ class Handler(BaseHTTPRequestHandler): except Exception as exc: self.send_json(500, {"ok": False, "error": str(exc)}) + def ssh_http_resize(self, sid, payload=None): + with SSH_HTTP_LOCK: + session = SSH_HTTP_SESSIONS.get(sid) + if not session: + self.send_json(404, {"ok": False, "error": "terminal session not found"}) + return + if payload is None: + payload = self.read_payload() + ok = set_pty_size(session["fd"], payload.get("rows", 24), payload.get("cols", 80)) + self.send_json(200, {"ok": bool(ok)}) + def ssh_http_write_short(self): payload = self.read_payload() sid = payload.get("sid", "") @@ -2362,6 +2510,9 @@ class Handler(BaseHTTPRequestHandler): if action == "write": self.ssh_http_write(sid) return + if action == "resize": + self.ssh_http_resize(sid) + return if action == "close": self.ssh_http_close(sid) return @@ -2411,6 +2562,11 @@ class Handler(BaseHTTPRequestHandler): if opcode == 9: ws_send_frame(self.connection, payload, opcode=10) continue + if opcode == 1 and payload: + resize = parse_resize_payload(payload) + if resize: + set_pty_size(fd, resize[0], resize[1]) + continue if opcode in (1, 2) and payload: os.write(fd, payload) except Exception as exc: