Chnages

WebSSH/AppHandler.py

@@ -16,25 +16,10 @@ class AppHandler(tornado.web.RequestHandler):
         # Your logic for function one
         self.write("Function One Called")
 
-    def run_commands(self):
-        data = json.loads(self.body)
-        command = data.get("command")
-        print(f"Command: {command}")
-        if command:
-            try:
-                result = subprocess.run(command, shell=True, capture_output=True, text=True)
-                print(f"Result: {result}")
-                return(result.stdout)
-            except Exception as e:
-                return(str(e))
-        else:
-            return("No command provided")
-
-    
-    def get_privatekey(self):
-        data = json.loads(self.body)
-        username = data.get("username")
-        password = data.get("password")
+    def post(self):
+        #data = json.loads(self.body)
+        username = self.get_argumentt("username")
+        password = self.get_argument("password")
         print(f"Username: {username}, Password: {password}")
         if not username or not password:
             self.set_status(400)
@@ -47,6 +32,7 @@ class AppHandler(tornado.web.RequestHandler):
             # 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()
@@ -63,4 +49,18 @@ class AppHandler(tornado.web.RequestHandler):
         self.set_header('Content-Type', 'application/octet-stream')
         self.set_header('Content-Disposition', f'attachment; filename=id_rsa')
         self.write(private_key)
-    
+"""    
+def run_commands(self):
+        data = json.loads(self.body)
+        command = data.get("command")
+        print(f"Command: {command}")
+        if command:
+            try:
+                result = subprocess.run(command, shell=True, capture_output=True, text=True)
+                print(f"Result: {result}")
+                return(result.stdout)
+            except Exception as e:
+                return(str(e))
+        else:
+            return("No command provided")
+"""

WebSSH/AppHandler2.py

@@ -0,0 +1,48 @@
+# 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)

WebSSH/__main__.py

@@ -77,8 +77,6 @@ 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.run_commands),
-            (r"/get_key", AppHandler.get_privatekey),
         ],
         xsrf_cookies=options.xsrf,
         debug=options.debug,

WebSSH/templates/index.html

@@ -4,7 +4,6 @@
     <meta charset="UTF-8">
     <title>WebSSH</title>
     <link href="static/img/favicon.png" rel="icon" type="image/png">
-    <script src="static/js/app.js"></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>
@@ -40,6 +39,7 @@
         </div>
 
         <div class="user-container">
+        <form action="/app" method="post">
             <h1>Create New User</h1>
             <div class="form-group">
                 <label for="username">Username:</label>
@@ -49,13 +49,14 @@
                 <label for="password">Password:</label>
                 <input type="password" id="password" name="password" class="form-control" required>
             </div>
-            <button type="submit" class="btn btn-primary" onclick="get_privatekey()">Get Key</button>
+            <button type="submit" class="btn btn-primary" >Get Key</button>
+        </form>
         </div>
 
         <div class="command-container">
             <div class="form-group">
                 <label for="command">Command:</label>
-                <input type="text" id="command" name="command" class="form-control" required>
+                <input type="text" id="command" name="command" class="form-control" placeholder="Not Implemented yet" required>
             </div>
             <button type="button" id="execute-button" class="btn btn-success" onclick="run_commands()">Execute</button>
         </div>