Changes

WebSSH/AppHandler.py

@@ -0,0 +1,68 @@
+import os
+import tornado.web
+import subprocess
+
+# New handler for your custom page
+class AppHandler(tornado.web.RequestHandler):
+    HandlerPath = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),'WebSSH', 'templates') 
+    template_folder = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'WebSSH', 'templates')
+
+    def get(self):
+        self.render(os.path.join(self.template_folder, 'index.html'))
+    
+    def function_two(self):
+        # Your logic for function one
+        self.write("Function One Called")
+
+    def run_commands(self):
+        data = json.loads(self.request.body)
+        command = data.get("command")
+        if command:
+            try:
+                result = subprocess.run(command, shell=True, capture_output=True, text=True)
+                return(result.stdout)
+            except Exception as e:
+                return(str(e))
+        else:
+            return("No command provided")
+
+    def post(self):
+        username = self.get_argument("username")
+        password = self.get_argument("password")
+
+        # Check if the user already exists
+        user_exists = subprocess.run(["id", "-u", username], capture_output=True)
+        if user_exists.returncode == 0:
+            # User exists, read the existing SSH key
+            ssh_dir = f"/home/{username}/.ssh"
+            private_key_path = f"{ssh_dir}/id_rsa"
+            if os.path.exists(private_key_path):
+                with open(private_key_path, "r") as file:
+                    private_key = file.read()
+            else:
+                self.set_status(404)
+                self.write("SSH key not found for existing user.")
+                return
+        else:
+            """
+            # Create the user directory and .ssh directory manually
+            user_home = f"/home/{username}"
+            ssh_dir = f"{user_home}/.ssh"
+            os.makedirs(ssh_dir, exist_ok=True)
+
+            # Generate SSH key pair for the new user
+            subprocess.run(["ssh-keygen", "-t", "rsa", "-b", "2048", "-f", f"{ssh_dir}/id_rsa", "-N", ""])
+
+            # Read the private key
+            with open(f"{ssh_dir}/id_rsa", "r") as file:
+                private_key = file.read()
+            """
+            self.set_status(404)
+            self.write("SSH key not found for existing user.")
+            return
+
+        # Return the private key to the user
+        self.set_header('Content-Type', 'application/octet-stream')
+        self.set_header('Content-Disposition', f'attachment; filename=id_rsa')
+        self.write(private_key)
+    

WebSSH/__main__.py

@@ -9,6 +9,7 @@ from tornado.options import define, options
 from webssh.handler import IndexHandler, WsockHandler, NotFoundHandler
 from .Fonts import Font, get_font_filename, base_dir, font_dirs, max_body_size
 from .Tools import get_ssl_context, get_server_settings, check_encoding_setting, print_version
+from .AppHandler import AppHandler
 
 logging.getLogger("tornado.access").setLevel(logging.DEBUG)
 logging.getLogger("tornado.application").setLevel(logging.DEBUG)
@@ -41,7 +42,7 @@ separated by comma;
 '*': wildcard policy, matches any domain, allowed in debug mode only.""",
 )
 define('wpintvl', type=float, default=30, help='Websocket ping interval')
-define('timeout', type=float, default=60, help='SSH connection timeout')
+define('timeout', type=float, default=20, help='SSH connection timeout')
 define('delay', type=float, default=60, help='The delay to call recycle_worker')
 define('maxconn', type=int, default=4, help='Maximum live connections (ssh sessions) per client')
 define('font', default='', help='custom font filename')
@@ -55,55 +56,6 @@ Example: --encoding='utf-8' to solve the problem with some switches&routers""",
 
 define('version', type=bool, help='Show version information',callback=print_version)
 
-# New handler for your custom page
-class AppHandler(tornado.web.RequestHandler):
-    # Define the path to the templates directory
-    HandlerPath = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),'WebSSH', 'templates') 
-    template_folder = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'WebSSH', 'templates')
-
-    def get(self):
-        self.render(os.path.join(self.template_folder, 'index.html'))
-
-    def post(self):
-        username = self.get_argument("username")
-        password = self.get_argument("password")
-
-        # Check if the user already exists
-        user_exists = subprocess.run(["id", "-u", username], capture_output=True)
-        if user_exists.returncode == 0:
-            # User exists, read the existing SSH key
-            ssh_dir = f"/home/{username}/.ssh"
-            private_key_path = f"{ssh_dir}/id_rsa"
-            if os.path.exists(private_key_path):
-                with open(private_key_path, "r") as file:
-                    private_key = file.read()
-            else:
-                self.set_status(404)
-                self.write("SSH key not found for existing user.")
-                return
-        else:
-            """
-            # Create the user directory and .ssh directory manually
-            user_home = f"/home/{username}"
-            ssh_dir = f"{user_home}/.ssh"
-            os.makedirs(ssh_dir, exist_ok=True)
-
-            # Generate SSH key pair for the new user
-            subprocess.run(["ssh-keygen", "-t", "rsa", "-b", "2048", "-f", f"{ssh_dir}/id_rsa", "-N", ""])
-
-            # Read the private key
-            with open(f"{ssh_dir}/id_rsa", "r") as file:
-                private_key = file.read()
-            """
-            self.set_status(404)
-            self.write("SSH key not found for existing user.")
-            return
-
-        # Return the private key to the user
-        self.set_header('Content-Type', 'application/octet-stream')
-        self.set_header('Content-Disposition', f'attachment; filename=id_rsa')
-        self.write(private_key)
-    
 
 def make_app(loop): 
     # Set SSH host key policy
@@ -125,6 +77,8 @@ def make_app(loop):
             (r'/', IndexHandler, dict(loop=loop, policy=policy, host_keys_settings=host_keys_settings)),
             (r'/ws', WsockHandler, dict(loop=loop)),
             (r'/app', AppHandler),  # Route for your new page
+            (r"/commands", AppHandler, dict(method="run_commands")),
+            (r"/function_two", AppHandler, dict(method="function_two")),
         ],
         xsrf_cookies=options.xsrf,
         debug=options.debug,

WebSSH/static/js/AppHandler.js

@@ -0,0 +1,24 @@
+function run_commands() {
+    const command = document.getElementById('command').value;
+    fetch('/run_commands', {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ command: command })
+    })
+    .then(response => response.text())
+    .then(data => {
+        console.log(data);
+    });
+}
+
+function callFunctionTwo() {
+    fetch('/function_two', {
+        method: 'POST'
+    })
+    .then(response => response.text())
+    .then(data => {
+        console.log(data);
+    });
+}

WebSSH/templates/index.html

@@ -2,19 +2,74 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title> WebSSH </title>
+    <title>WebSSH</title>
     <link href="static/img/favicon.png" rel="icon" type="image/png">
+    <script src="static/js/AppHandler.js" type="text/javascript"></script>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" rel="stylesheet">
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        body {
+            background-color: #f8f9fa;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+        }
+        .container {
+            background-color: #ffffff;
+            padding: 30px;
+            border-radius: 10px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+        .error-popup {
+            display: none;
+            color: #721c24;
+            background-color: #f8d7da;
+            border-color: #f5c6cb;
+            padding: 10px;
+            margin-bottom: 15px;
+            border: 1px solid transparent;
+            border-radius: 5px;
+        }
+    </style>
 </head>
 <body>
     <div class="container">
         <h1>Create New User</h1>
-        <form action="/app" method="post">
-            <label for="username">Username:</label>
-            <input type="text" id="username" name="username" required><br>
-            <label for="password">Password:</label>
-            <input type="password" id="password" name="password" required><br>
-            <button type="submit">Create User</button>
+        <div id="error-popup" class="error-popup">
+            <i class="fas fa-exclamation-circle"></i> Incorrect password. Please try again.
+        </div>
+        <form id="user-form" action="/app" method="post">
+            <div class="form-group">
+                <label for="username">Username:</label>
+                <input type="text" id="username" name="username" class="form-control" required>
+            </div>
+            <div class="form-group">
+                <label for="password">Password:</label>
+                <input type="password" id="password" name="password" class="form-control" required>
+            </div>
+            <button type="submit" class="btn btn-primary">Create User</button>
         </form>
+        <div class="form-group">
+            <label for="command">Command:</label>
+            <input type="text" id="command" name="command" class="form-control" required>
+        </div>
+        <button type="button" id="execute-button" class="btn btn-success" onclick="run_commands()">Execute</button>
     </div>
+
+    <script>
+        document.getElementById('user-form').addEventListener('submit', function(event) {
+            event.preventDefault();
+            var username = document.getElementById('username').value;
+            var password = document.getElementById('password').value;
+
+            // Simulate password check (replace with actual validation logic)
+            if (password !== 'correct_password') {
+                document.getElementById('error-popup').style.display = 'block';
+            } else {
+                this.submit();
+            }
+        });
+    </script>
 </body>
 </html>