From 0d464cdf566a752d8bd3504247f8067a1ac96846 Mon Sep 17 00:00:00 2001
From: Karmaa <bugattiguy527@gmail.com>
Date: Thu, 6 Mar 2025 17:52:27 -0600
Subject: [PATCH] Added RSA support for authentication. Furthered preparations
 for release.

---
 README.md              |  7 ++--
 src/AddHostModal.jsx   | 94 +++++++++++++++++++++++++++++++++++++-----
 src/App.jsx            |  9 ++--
 src/backend/server.cjs |  5 ++-
 4 files changed, 95 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 9d372d91..da81863b 100644
--- a/README.md
+++ b/README.md
@@ -13,21 +13,20 @@
 <br />
 <p align="center">
   <a href="https://github.com/LukeGus/Termix">
-    <img alt="Termimx Banner" src=./repo-images/TermixLogo.png style="width: 125px; height: auto;">  </a>
+    <img alt="Termix Banner" src=./repo-images/TermixLogo.png style="width: 125px; height: auto;">  </a>
 </p>
 
 # Overview
 Termix is an open-source forever free self-hosted SSH (other protocols planned, see [Planned Features](#planned-features)) server management panel inspired by [Nexterm](https://github.com/gnmyt/Nexterm). Its purpose is to provide an all-in-one docker-hosted web solution to manage your servers in one easy place. I'm using this project to help me learn [React](https://github.com/facebook/react), [Vite](https://github.com/vitejs/vite-plugin-react), and [Docker](https://www.docker.com) but also because I could never settle on a server management software that I enjoyed to use.
 
 > [!WARNING]  
-> This app is in the VERY early stages of development. Expect bugs, data loss, and unexplainable issues! For that reason, I recommend you securely tunnel your connection through a VPN.
+> This app is in the VERY early stages of development. Expect bugs, data loss, and unexplainable issues! For that reason, I recommend you securely tunnel your connection to Termix through a VPN.
 
 # Features
-- SSH (password auth only)
+- SSH
 - Split Screen (Up to 4) & Tab System
 
 # Planned Features
-- Key Auth for SSH
 - VNC
 - RDP
 - SFTP (build in file transfer)
diff --git a/src/AddHostModal.jsx b/src/AddHostModal.jsx
index 5e3d976e..b7c65dc6 100644
--- a/src/AddHostModal.jsx
+++ b/src/AddHostModal.jsx
@@ -1,9 +1,32 @@
 import PropTypes from 'prop-types';
 import { CssVarsProvider } from '@mui/joy/styles';
-import { Modal, Button, FormControl, FormLabel, Input, Stack, DialogTitle, DialogContent, ModalDialog } from '@mui/joy';
+import { Modal, Button, FormControl, FormLabel, Input, Stack, DialogTitle, DialogContent, ModalDialog, Select, Option } from '@mui/joy';
 import theme from './theme';
 
 const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidden }) => {
+    const handleFileChange = (e) => {
+        const file = e.target.files[0];
+        if (file) {
+            if (file.name.endsWith('.rsa') || file.name.endsWith('.key') || file.name.endsWith('.pem') || file.name.endsWith('.der') || file.name.endsWith('.p8') || file.name.endsWith('.ssh')) {
+                const reader = new FileReader();
+                reader.onload = (event) => {
+                    setForm({ ...form, rsaKey: event.target.result });
+                };
+                reader.readAsText(file);
+            } else {
+                alert("Please upload a valid RSA private key file.");
+            }
+        }
+    };
+
+    const isFormValid = () => {
+        if (form.authMethod === 'Select Auth') return false;
+        if (!form.ip || !form.user || !form.port) return false;
+        if (form.authMethod === 'rsaKey' && !form.rsaKey) return false;
+        if (form.authMethod === 'password' && !form.password) return false;
+        return true;
+    };
+
     return (
         <CssVarsProvider theme={theme}>
             <Modal open={!isHidden} onClose={() => setIsAddHostHidden(true)}>
@@ -22,7 +45,7 @@ const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidd
                         <form
                             onSubmit={(event) => {
                                 event.preventDefault();
-                                handleAddHost();
+                                if (isFormValid()) handleAddHost();
                             }}
                         >
                             <Stack spacing={2}>
@@ -44,6 +67,7 @@ const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidd
                                         value={form.ip}
                                         onChange={(e) => setForm({ ...form, ip: e.target.value })}
                                         required
+                                        error={!form.ip ? "Please provide an IP address" : ""}
                                         sx={{
                                             backgroundColor: theme.palette.general.primary,
                                             color: theme.palette.text.primary,
@@ -56,6 +80,7 @@ const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidd
                                         value={form.user}
                                         onChange={(e) => setForm({ ...form, user: e.target.value })}
                                         required
+                                        error={form.user ? "" : "Please provide a username"}
                                         sx={{
                                             backgroundColor: theme.palette.general.primary,
                                             color: theme.palette.text.primary,
@@ -63,18 +88,64 @@ const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidd
                                     />
                                 </FormControl>
                                 <FormControl>
-                                    <FormLabel>Host Password</FormLabel>
-                                    <Input
-                                        type="password"
-                                        value={form.password}
-                                        onChange={(e) => setForm({ ...form, password: e.target.value })}
+                                    <FormLabel>Authentication Method</FormLabel>
+                                    <Select
+                                        value={form.authMethod}
+                                        onChange={(e, newValue) => setForm({ ...form, authMethod: newValue })}
                                         required
+                                        displayEmpty
+                                        error={!form.authMethod || form.authMethod === 'Select Auth'}
                                         sx={{
-                                            backgroundColor: theme.palette.general.primary,
+                                            backgroundColor: !form.authMethod || form.authMethod === 'Select Auth' ? theme.palette.general.tertiary : theme.palette.general.primary,
                                             color: theme.palette.text.primary,
+                                            '&:hover': {
+                                                backgroundColor: theme.palette.general.disabled,
+                                            },
                                         }}
-                                    />
+                                    >
+                                        <Option value="" disabled>
+                                            Select Auth
+                                        </Option>
+                                        <Option value="password">Password</Option>
+                                        <Option value="rsaKey">RSA Key</Option>
+                                    </Select>
                                 </FormControl>
+                                {form.authMethod === 'password' && (
+                                    <FormControl>
+                                        <FormLabel>Host Password</FormLabel>
+                                        <Input
+                                            type="password"
+                                            value={form.password}
+                                            onChange={(e) => setForm({ ...form, password: e.target.value })}
+                                            required
+                                            error={form.password ? "" : "Please provide a password"}
+                                            sx={{
+                                                backgroundColor: theme.palette.general.primary,
+                                                color: theme.palette.text.primary,
+                                            }}
+                                        />
+                                    </FormControl>
+                                )}
+                                {form.authMethod === 'rsaKey' && (
+                                    <FormControl>
+                                        <FormLabel>RSA Key</FormLabel>
+                                        <Input
+                                            type="file"
+                                            onChange={handleFileChange}
+                                            required
+                                            error={!form.rsaKey ? "Please upload a valid RSA private key file" : ""}
+                                            sx={{
+                                                backgroundColor: theme.palette.general.primary,
+                                                color: theme.palette.text.primary,
+                                                padding: 1,
+                                                textAlign: 'center',
+                                                width: '100%',
+                                                minWidth: 'auto',
+                                                minHeight: 'auto',
+                                            }}
+                                        />
+                                    </FormControl>
+                                )}
                                 <FormControl>
                                     <FormLabel>Host Port</FormLabel>
                                     <Input
@@ -92,6 +163,7 @@ const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidd
                                 </FormControl>
                                 <Button
                                     type="submit"
+                                    disabled={!isFormValid()}
                                     sx={{
                                         backgroundColor: theme.palette.general.primary,
                                         '&:hover': {
@@ -116,8 +188,10 @@ AddHostModal.propTypes = {
         name: PropTypes.string,
         ip: PropTypes.string.isRequired,
         user: PropTypes.string.isRequired,
-        password: PropTypes.string.isRequired,
+        password: PropTypes.string,
+        rsaKey: PropTypes.string,
         port: PropTypes.number.isRequired,
+        authMethod: PropTypes.string.isRequired,
     }).isRequired,
     setForm: PropTypes.func.isRequired,
     handleAddHost: PropTypes.func.isRequired,
diff --git a/src/App.jsx b/src/App.jsx
index 079a07e9..6459b95b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -80,14 +80,15 @@ function App() {
     }, [splitTabIds]);
 
     const handleAddHost = () => {
-        if (form.ip && form.user && form.password && form.port) {
+        if (form.ip && form.user && ((form.authMethod === 'password' && form.password) || (form.authMethod === 'rsaKey' && form.rsaKey)) && form.port) {
             const newTerminal = {
                 id: nextId,
                 title: form.name || form.ip,
                 hostConfig: {
                     ip: form.ip,
                     user: form.user,
-                    password: form.password,
+                    password: form.authMethod === 'password' ? form.password : undefined,
+                    rsaKey: form.authMethod === 'rsaKey' ? form.rsaKey : undefined,
                     port: Number(form.port),
                 },
                 terminalRef: null,
@@ -96,7 +97,7 @@ function App() {
             setActiveTab(nextId);
             setNextId(nextId + 1);
             setIsAddHostHidden(true);
-            setForm({ name: "", ip: "", user: "", password: "", port: 22 });
+            setForm({ name: "", ip: "", user: "", password: "", rsaKey: "", port: 22, authMethod: "password" });
         } else {
             alert("Please fill out all fields.");
         }
@@ -133,7 +134,7 @@ function App() {
         } else if (splitTabIds.length > 1) {
             return "grid grid-cols-2 grid-rows-2 gap-4 h-full overflow-hidden";
         }
-        return "flex flex-col h-full";
+        return "flex flex-col h-full gap-4";
     };
 
     return (
diff --git a/src/backend/server.cjs b/src/backend/server.cjs
index 6dd56b19..94d9ab55 100644
--- a/src/backend/server.cjs
+++ b/src/backend/server.cjs
@@ -18,13 +18,13 @@ io.on("connection", (socket) => {
     let stream = null;
 
     socket.on("connectToHost", (cols, rows, hostConfig) => {
-        if (!hostConfig || !hostConfig.ip || !hostConfig.user || !hostConfig.password || !hostConfig.port) {
+        if (!hostConfig || !hostConfig.ip || !hostConfig.user || (!hostConfig.password && !hostConfig.rsaKey) || !hostConfig.port) {
             console.error("Invalid hostConfig received:", hostConfig);
             return;
         }
 
         console.log("Received hostConfig:", hostConfig);
-        const { ip, port, user, password } = hostConfig;
+        const { ip, port, user, password, rsaKey } = hostConfig;
 
         const conn = new SSHClient();
         conn
@@ -89,6 +89,7 @@ io.on("connection", (socket) => {
                 port: port,
                 username: user,
                 password: password,
+                privateKey: rsaKey ? Buffer.from(rsaKey) : undefined,
             });
     });