Use pty to properly capture wsssh stdin/stdout/stderr

wssshd.py

@@ -29,6 +29,8 @@ import os
 import threading
 import uuid
 import subprocess
+import pty
+import select
 from flask import Flask, render_template, request, redirect, url_for, flash, jsonify, send_from_directory
 from flask_login import LoginManager, UserMixin, login_user, login_required, logout_user, current_user
 from flask_sqlalchemy import SQLAlchemy
@@ -184,40 +186,47 @@ def connect_terminal(client_id):
     username = request.form.get('username', 'root')
     request_id = str(uuid.uuid4())
     command = ['wsssh', '-p', str(args.port), f'{username}@{client_id}.{args.domain}']
-    # Spawn wsssh process
+    # Spawn wsssh process with pty
+    master, slave = pty.openpty()
     proc = subprocess.Popen(
         command,
-        stdout=subprocess.PIPE,
-        stdin=subprocess.PIPE,
-        stderr=subprocess.STDOUT
+        stdin=slave,
+        stdout=slave,
+        stderr=slave,
+        preexec_fn=os.setsid
     )
+    os.close(slave)
 
     # Start a thread to read output
     output_buffer = []
     def read_output():
         output_buffer.append('Process started, reading output...\r\n')
         while proc.poll() is None:
-            try:
-                data = proc.stdout.read(1)  # Read byte by byte for real-time
-                if data:
-                    output_buffer.append(data.decode('utf-8', errors='ignore'))
-            except:
-                break
+            r, w, e = select.select([master], [], [], 0.1)
+            if master in r:
+                try:
+                    data = os.read(master, 1024)
+                    if data:
+                        output_buffer.append(data.decode('utf-8', errors='ignore'))
+                except:
+                    break
         # Read any remaining data
         try:
-            data = proc.stdout.read()
-            if data:
+            data = os.read(master, 1024)
+            while data:
                 output_buffer.append(data.decode('utf-8', errors='ignore'))
+                data = os.read(master, 1024)
         except:
             pass
         output_buffer.append('\r\nProcess finished.\r\n')
+        os.close(master)
 
     thread = threading.Thread(target=read_output, daemon=True)
     thread.start()
 
     if proc.poll() is not None:
         output_buffer.append(f'\r\nProcess failed to start, exit code: {proc.returncode}\r\n')
-    active_terminals[request_id] = {'client_id': client_id, 'username': username, 'proc': proc, 'output_buffer': output_buffer}
+    active_terminals[request_id] = {'client_id': client_id, 'username': username, 'proc': proc, 'output_buffer': output_buffer, 'master': master}
     return jsonify({'request_id': request_id, 'command': ' '.join(command)})
 
 
@@ -229,9 +238,12 @@ def terminal_data(client_id):
         data = request.form.get('data')
         if request_id in active_terminals:
             proc = active_terminals[request_id]['proc']
+            master = active_terminals[request_id]['master']
             if proc.poll() is None:  # Process is still running
-                proc.stdin.write(data.encode())
-                proc.stdin.flush()
+                try:
+                    os.write(master, data.encode())
+                except:
+                    pass
         return 'OK'
     else:
         request_id = request.args.get('request_id')