Loading hosts...
- ) : hosts.length > 0 ? (
+ ) : filteredHosts.length > 0 ? (
- {hosts.map((hostWrapper, index) => {
+ {filteredHosts.map((hostWrapper, index) => {
const hostConfig = hostWrapper.config || {};
if (!hostConfig) {
diff --git a/src/Terminal.jsx b/src/apps/ssh/Terminal.jsx
similarity index 77%
rename from src/Terminal.jsx
rename to src/apps/ssh/Terminal.jsx
index 32f08215..86fe25c6 100644
--- a/src/Terminal.jsx
+++ b/src/apps/ssh/Terminal.jsx
@@ -4,9 +4,9 @@ import { FitAddon } from "@xterm/addon-fit";
import "@xterm/xterm/css/xterm.css";
import io from "socket.io-client";
import PropTypes from "prop-types";
-import theme from "./theme";
+import theme from "../../theme.js";
-export const NewTerminal = forwardRef(({ hostConfig, isVisible }, ref) => {
+export const NewTerminal = forwardRef(({ hostConfig, isVisible, setIsNoAuthHidden }, ref) => {
const terminalRef = useRef(null);
const socketRef = useRef(null);
const fitAddon = useRef(new FitAddon());
@@ -76,7 +76,11 @@ export const NewTerminal = forwardRef(({ hostConfig, isVisible }, ref) => {
fitAddon.current.fit();
resizeTerminal();
const { cols, rows } = terminalInstance.current;
- socket.emit("connectToHost", cols, rows, hostConfig);
+ if (!hostConfig.password && !hostConfig.rsaKey) {
+ setIsNoAuthHidden(false);
+ } else {
+ socket.emit("connectToHost", cols, rows, hostConfig);
+ }
});
socket.on("data", (data) => {
@@ -91,23 +95,41 @@ export const NewTerminal = forwardRef(({ hostConfig, isVisible }, ref) => {
});
terminalInstance.current.attachCustomKeyEventHandler((event) => {
- if (isPasting) return;
-
- isPasting = true;
- setTimeout(() => {
- isPasting = false;
- }, 200);
-
if ((event.ctrlKey || event.metaKey) && event.key === "v") {
+ if (isPasting) return false;
+ isPasting = true;
+
event.preventDefault();
navigator.clipboard.readText().then((text) => {
- socketRef.current.emit("data", text);
+ text = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+ const lines = text.split("\n");
+
+ if (socketRef.current) {
+ let index = 0;
+
+ const sendLine = () => {
+ if (index < lines.length) {
+ socketRef.current.emit("data", lines[index] + "\r");
+ index++;
+ setTimeout(sendLine, 10);
+ } else {
+ isPasting = false;
+ }
+ };
+
+ sendLine();
+ } else {
+ isPasting = false;
+ }
}).catch((err) => {
console.error("Failed to read clipboard contents:", err);
+ isPasting = false;
});
+
return false;
}
+
return true;
});
@@ -120,6 +142,10 @@ export const NewTerminal = forwardRef(({ hostConfig, isVisible }, ref) => {
}
});
+ socket.on("noAuthRequired", () => {
+ setIsNoAuthHidden(false);
+ });
+
socket.on("error", (err) => {
terminalInstance.current.write(`\r\n*** Error: ${err} ***\r\n`);
});
@@ -173,8 +199,10 @@ NewTerminal.propTypes = {
hostConfig: PropTypes.shape({
ip: PropTypes.string.isRequired,
user: PropTypes.string.isRequired,
- password: PropTypes.string.isRequired,
- port: PropTypes.string.isRequired,
+ password: PropTypes.string,
+ rsaKey: PropTypes.string,
+ port: PropTypes.number.isRequired,
}).isRequired,
isVisible: PropTypes.bool.isRequired,
+ setIsNoAuthHidden: PropTypes.func.isRequired,
};
\ No newline at end of file
diff --git a/src/User.jsx b/src/apps/user/User.jsx
similarity index 90%
rename from src/User.jsx
rename to src/apps/user/User.jsx
index 2c9fef84..b09655b0 100644
--- a/src/User.jsx
+++ b/src/apps/user/User.jsx
@@ -12,12 +12,7 @@ const socket = io(SOCKET_URL, {
autoConnect: false,
});
-export const User = forwardRef(({
- onLoginSuccess,
- onCreateSuccess,
- onDeleteSuccess,
- onFailure
- }, ref) => {
+export const User = forwardRef(({ onLoginSuccess, onCreateSuccess, onDeleteSuccess, onFailure }, ref) => {
const socketRef = useRef(socket);
const currentUser = useRef(null);
@@ -100,6 +95,28 @@ export const User = forwardRef(({
}
};
+ const loginAsGuest = async () => {
+ try {
+ const response = await new Promise((resolve) => {
+ socketRef.current.emit("loginAsGuest", resolve);
+ });
+
+ if (response?.success) {
+ currentUser.current = {
+ id: response.user.id,
+ username: response.user.username,
+ sessionToken: response.user.sessionToken,
+ };
+ localStorage.setItem("sessionToken", response.user.sessionToken);
+ onLoginSuccess(response.user);
+ } else {
+ throw new Error(response?.error || "Guest login failed");
+ }
+ } catch (error) {
+ onFailure(error.message);
+ }
+ }
+
const logoutUser = () => {
localStorage.removeItem("sessionToken");
currentUser.current = null;
@@ -236,6 +253,7 @@ export const User = forwardRef(({
useImperativeHandle(ref, () => ({
createUser,
loginUser,
+ loginAsGuest,
logoutUser,
deleteUser,
saveHost,
diff --git a/src/backend/database.cjs b/src/backend/database.cjs
index f9ab9bcb..f5bc9c87 100644
--- a/src/backend/database.cjs
+++ b/src/backend/database.cjs
@@ -35,7 +35,8 @@ const User = mongoose.model('User', userSchema);
const Host = mongoose.model('Host', hostSchema);
const getEncryptionKey = (userId, sessionToken) => {
- return crypto.scryptSync(`${userId}-${sessionToken}`, 'salt', 32);
+ const salt = process.env.SALT || 'default_salt';
+ return crypto.scryptSync(`${userId}-${sessionToken}`, salt, 32);
};
const encryptData = (data, userId, sessionToken) => {
@@ -130,6 +131,29 @@ io.of('/database.io').on('connection', (socket) => {
}
});
+ socket.on('loginAsGuest', async (callback) => {
+ try {
+ const username = `guest-${crypto.randomBytes(4).toString('hex')}`;
+ const sessionToken = crypto.randomBytes(64).toString('hex');
+
+ const user = await User.create({
+ username,
+ password: await bcrypt.hash(username, 10),
+ sessionToken
+ });
+
+ logger.info(`Guest user created: ${username}`);
+ callback({ success: true, user: {
+ id: user._id,
+ username: user.username,
+ sessionToken
+ }});
+ } catch (error) {
+ logger.error('Guest login error:', error);
+ callback({error: 'Guest login failed'});
+ }
+ });
+
socket.on('saveHostConfig', async ({ userId, sessionToken, hostConfig }, callback) => {
try {
if (!userId || !sessionToken) {
diff --git a/src/backend/ssh.cjs b/src/backend/ssh.cjs
index 8a6c542d..1a084b09 100644
--- a/src/backend/ssh.cjs
+++ b/src/backend/ssh.cjs
@@ -28,6 +28,7 @@ io.on("connection", (socket) => {
socket.on("connectToHost", (cols, rows, hostConfig) => {
if (!hostConfig || !hostConfig.ip || !hostConfig.user || (!hostConfig.password && !hostConfig.rsaKey) || !hostConfig.port) {
logger.error("Invalid hostConfig received:", hostConfig);
+ socket.emit("noAuthRequired");
return;
}
diff --git a/src/modals/AddHostModal.jsx b/src/modals/AddHostModal.jsx
index 665504f2..046c8b1d 100644
--- a/src/modals/AddHostModal.jsx
+++ b/src/modals/AddHostModal.jsx
@@ -12,11 +12,17 @@ import {
ModalDialog,
Select,
Option,
- Checkbox
+ Checkbox,
+ IconButton
} from '@mui/joy';
import theme from '/src/theme';
+import { useState } from 'react';
+import Visibility from '@mui/icons-material/Visibility';
+import VisibilityOff from '@mui/icons-material/VisibilityOff';
const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidden }) => {
+ const [showPassword, setShowPassword] = useState(false);
+
const handleFileChange = (e) => {
const file = e.target.files[0];
if (file) {
@@ -40,9 +46,34 @@ const AddHostModal = ({ isHidden, form, setForm, handleAddHost, setIsAddHostHidd
return true;
};
+ const handleSubmit = (event) => {
+ event.preventDefault();
+ if (isFormValid()) {
+ handleAddHost();
+ setForm({
+ name: '',
+ ip: '',
+ user: '',
+ password: '',
+ rsaKey: '',
+ port: 22,
+ authMethod: 'Select Auth',
+ rememberHost: false,
+ storePassword: true,
+ });
+ }
+ };
+
return (
- setIsAddHostHidden(true)}>
+ setIsAddHostHidden(true)}
+ sx={{
+ overflow: 'hidden',
+ display: 'flex',
+ justifyContent: 'center',
+ alignItems: 'center',
+ }}
+ >
Add Host
-