Ethica/Termix
1
0
Fork 0
mirror of https://github.com/Termix-SSH/Termix.git synced 2026-07-15 21:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve backend build errors, preserve sudo file read buffers, and format code (#798)

Browse Source 
* fix: resolve backend TypeScript build errors and preserve sudo file read buffers

* style: format code

* fix: ssh2 ESM import failure

---------

Co-authored-by: LukeGus <bugattiguy527@gmail.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
TomyJan
2026-05-21 02:18:42 +08:00
committed by GitHub
parent 21f24a8386
commit 3375733789
14 changed files with 176 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/docker-compose.yml
-1
View File
@@ -1,4 +1,3 @@
services:
services: services:
termix: termix:
image: ghcr.io/lukegus/termix:latest image: ghcr.io/lukegus/termix:latest
electron/main.cjs
+31 -10
View File
@@ -563,12 +563,21 @@ async function clearElectronJwtCookiesAtStartup() {
function getBackendPaths() { function getBackendPaths() {
if (isDev) { if (isDev) {
const backendDir = path.join(appRoot, "dist", "backend", "backend"); const backendDir = path.join(appRoot, "dist", "backend", "backend");
return { entryPath: path.join(backendDir, "starter.js"), backendCwd: backendDir }; return {
entryPath: path.join(backendDir, "starter.js"),
backendCwd: backendDir,
};
} }
// fork() does not go through Electron's asar redirector — use the unpacked path // fork() does not go through Electron's asar redirector — use the unpacked path
const unpackedRoot = appRoot.replace(/app\.asar(?!\.unpacked)/, "app.asar.unpacked"); const unpackedRoot = appRoot.replace(
/app\.asar(?!\.unpacked)/,
"app.asar.unpacked",
);
const backendDir = path.join(unpackedRoot, "dist", "backend", "backend"); const backendDir = path.join(unpackedRoot, "dist", "backend", "backend");
return { entryPath: path.join(backendDir, "starter.js"), backendCwd: backendDir }; return {
entryPath: path.join(backendDir, "starter.js"),
backendCwd: backendDir,
};
} }
function getBackendDataDir() { function getBackendDataDir() {
@@ -606,7 +615,8 @@ function startBackendServer() {
logToFile(" backendCwd exists:", fs.existsSync(backendCwd)); logToFile(" backendCwd exists:", fs.existsSync(backendCwd));
backendProcess = fork(entryPath, [], { backendProcess = fork(entryPath, [], {
cwd: fs.existsSync(backendCwd) && fs.statSync(backendCwd).isDirectory() cwd:
fs.existsSync(backendCwd) && fs.statSync(backendCwd).isDirectory()
? backendCwd ? backendCwd
: dataDir, : dataDir,
env: { env: {
@@ -1089,7 +1099,9 @@ ipcMain.handle("get-embedded-server-status", () => {
}); });
// OIDC System Browser Authentication (RFC 8252) // OIDC System Browser Authentication (RFC 8252)
ipcMain.handle("oidc-system-browser-auth", async (_event, authUrl, callbackPort) => { ipcMain.handle(
"oidc-system-browser-auth",
async (_event, authUrl, callbackPort) => {
const http = require("http"); const http = require("http");
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -1101,13 +1113,18 @@ ipcMain.handle("oidc-system-browser-auth", async (_event, authUrl, callbackPort)
const token = url.searchParams.get("token"); const token = url.searchParams.get("token");
res.writeHead(200, { "Content-Type": "text/html" }); res.writeHead(200, { "Content-Type": "text/html" });
res.end(`<html><body><h2>${success === "true" ? "Authentication successful!" : "Authentication failed."}</h2><p>You can close this tab and return to Termix.</p><script>window.close()</script></body></html>`); res.end(
`<html><body><h2>${success === "true" ? "Authentication successful!" : "Authentication failed."}</h2><p>You can close this tab and return to Termix.</p><script>window.close()</script></body></html>`,
);
server.close(); server.close();
if (success === "true") { if (success === "true") {
resolve({ success: true, token }); resolve({ success: true, token });
} else { } else {
resolve({ success: false, error: error || "Authentication failed" }); resolve({
success: false,
error: error || "Authentication failed",
});
} }
} }
}); });
@@ -1117,12 +1134,16 @@ ipcMain.handle("oidc-system-browser-auth", async (_event, authUrl, callbackPort)
}); });
// Timeout after 5 minutes // Timeout after 5 minutes
setTimeout(() => { setTimeout(
() => {
server.close(); server.close();
reject(new Error("OIDC authentication timed out")); reject(new Error("OIDC authentication timed out"));
}, 5 * 60 * 1000); },
5 * 60 * 1000,
);
}); });
}); },
);
ipcMain.handle("get-server-config", () => { ipcMain.handle("get-server-config", () => {
try { try {
index.html
+3 -1
View File
@@ -47,7 +47,9 @@
</style> </style>
</head> </head>
<body> <body>
<script>window.__TERMIX_BASE_PATH__ = "";</script> <script>
window.__TERMIX_BASE_PATH__ = "";
</script>
<div id="root"></div> <div id="root"></div>
<script type="module" src="/src/main.tsx"></script> <script type="module" src="/src/main.tsx"></script>
</body> </body>
src/backend/ssh/docker.ts
+5 -6
View File
@@ -139,10 +139,7 @@ async function resolveJumpHost(
): Promise<JumpHostConfig | null> { ): Promise<JumpHostConfig | null> {
try { try {
const hostResults = await SimpleDBOps.select( const hostResults = await SimpleDBOps.select(
getDb() getDb().select().from(hosts).where(eq(hosts.id, hostId)),
.select()
.from(hosts)
.where(eq(hosts.id, hostId)),
"ssh_data", "ssh_data",
userId, userId,
); );
@@ -160,8 +157,10 @@ async function resolveJumpHost(
const { SharedCredentialManager } = const { SharedCredentialManager } =
await import("../utils/shared-credential-manager.js"); await import("../utils/shared-credential-manager.js");
const sharedCredManager = SharedCredentialManager.getInstance(); const sharedCredManager = SharedCredentialManager.getInstance();
const sharedCred = const sharedCred = await sharedCredManager.getSharedCredentialForUser(
await sharedCredManager.getSharedCredentialForUser(hostId, userId); hostId,
userId,
);
if (sharedCred) { if (sharedCred) {
return { return {
...host, ...host,
src/backend/ssh/file-manager.ts
+36 -11
View File
@@ -454,21 +454,33 @@ function execWithSudo(
command: string, command: string,
sudoPassword: string, sudoPassword: string,
): Promise<{ stdout: string; stderr: string; code: number }> { ): Promise<{ stdout: string; stderr: string; code: number }> {
return execWithSudoBuffer(session, command, sudoPassword).then((result) => ({
stdout: result.stdout.toString("utf8"),
stderr: result.stderr,
code: result.code,
}));
}
function execWithSudoBuffer(
session: SSHSession,
command: string,
sudoPassword: string,
): Promise<{ stdout: Buffer; stderr: string; code: number }> {
return new Promise((resolve) => { return new Promise((resolve) => {
const escapedPassword = sudoPassword.replace(/'/g, "'\"'\"'"); const escapedPassword = sudoPassword.replace(/'/g, "'\"'\"'");
const sudoCommand = `echo '${escapedPassword}' | sudo -S ${command} 2>&1`; const sudoCommand = `echo '${escapedPassword}' | sudo -S ${command} 2>&1`;
execChannel(session, sudoCommand, (err, stream) => { execChannel(session, sudoCommand, (err, stream) => {
if (err) { if (err) {
resolve({ stdout: "", stderr: err.message, code: 1 }); resolve({ stdout: Buffer.alloc(0), stderr: err.message, code: 1 });
return; return;
} }
let stdout = ""; const stdoutChunks: Buffer[] = [];
let stderr = ""; let stderr = "";
stream.on("data", (chunk: Buffer) => { stream.on("data", (chunk: Buffer) => {
stdout += chunk.toString(); stdoutChunks.push(chunk);
}); });
stream.stderr.on("data", (chunk: Buffer) => { stream.stderr.on("data", (chunk: Buffer) => {
@@ -476,12 +488,22 @@ function execWithSudo(
}); });
stream.on("close", (code: number) => { stream.on("close", (code: number) => {
stdout = stdout.replace(/\[sudo\] password for .+?:\s*/g, ""); let stdout = Buffer.concat(stdoutChunks);
const sudoPromptMatch = stdout
.toString("utf8", 0, Math.min(stdout.length, 256))
.match(/^\[sudo\] password for .+?:\s*/);
if (sudoPromptMatch) {
stdout = stdout.subarray(Buffer.byteLength(sudoPromptMatch[0]));
}
resolve({ stdout, stderr, code: code || 0 }); resolve({ stdout, stderr, code: code || 0 });
}); });
stream.on("error", (streamErr: Error) => { stream.on("error", (streamErr: Error) => {
resolve({ stdout, stderr: streamErr.message, code: 1 }); resolve({
stdout: Buffer.concat(stdoutChunks),
stderr: streamErr.message,
code: 1,
});
}); });
}); });
}); });
@@ -3098,22 +3120,25 @@ app.get("/ssh/file_manager/ssh/readFile", (req, res) => {
.includes("permission denied"); .includes("permission denied");
if (isPermissionDenied && sshConn.sudoPassword) { if (isPermissionDenied && sshConn.sudoPassword) {
execWithSudo( execWithSudoBuffer(
sshConn, sshConn,
`cat '${escapedPath}'`, `cat '${escapedPath}'`,
sshConn.sudoPassword, sshConn.sudoPassword,
) )
.then(({ stdout, stderr, code: sudoCode }) => { .then((result) => {
if (sudoCode !== 0) { if (result.code !== 0) {
return res.status(403).json({ return res.status(403).json({
error: `Permission denied: ${stderr}`, error: `Permission denied: ${result.stderr || result.stdout.toString("utf8")}`,
needsSudo: true, needsSudo: true,
}); });
} }
const sudoData = Buffer.from(stdout, "utf8");
const sudoData = result.stdout;
const isBinary = detectBinary(sudoData); const isBinary = detectBinary(sudoData);
res.json({ res.json({
content: isBinary ? sudoData.toString("base64") : stdout, content: isBinary
? sudoData.toString("base64")
: sudoData.toString("utf8"),
isBinary, isBinary,
size: sudoData.length, size: sudoData.length,
}); });
src/backend/ssh/host-resolver.ts
+9 -6
View File
@@ -83,13 +83,12 @@ export async function resolveHostById(
.select() .select()
.from(hostAccess) .from(hostAccess)
.where( .where(
and( and(eq(hostAccess.hostId, hostId), eq(hostAccess.userId, userId)),
eq(hostAccess.hostId, hostId),
eq(hostAccess.userId, userId),
),
) )
.limit(1); .limit(1);
const overrideCredId = accessRecords[0]?.overrideCredentialId as number | null; const overrideCredId = accessRecords[0]?.overrideCredentialId as
| number
| null;
if (overrideCredId) { if (overrideCredId) {
const userCreds = await SimpleDBOps.select( const userCreds = await SimpleDBOps.select(
db db
@@ -113,7 +112,11 @@ export async function resolveHostById(
if (!host.overrideCredentialUsername) { if (!host.overrideCredentialUsername) {
host.username = cred.username; host.username = cred.username;
} }
host.authType = cred.key ? "key" : cred.password ? "password" : "none"; host.authType = cred.key
? "key"
: cred.password
? "password"
: "none";
return host as unknown as SSHHost; return host as unknown as SSHHost;
} }
} }
src/backend/ssh/server-stats.ts
+5 -6
View File
@@ -75,10 +75,7 @@ async function resolveJumpHost(
): Promise<JumpHostConfig | null> { ): Promise<JumpHostConfig | null> {
try { try {
const hostResults = await SimpleDBOps.select( const hostResults = await SimpleDBOps.select(
getDb() getDb().select().from(hosts).where(eq(hosts.id, hostId)),
.select()
.from(hosts)
.where(eq(hosts.id, hostId)),
"ssh_data", "ssh_data",
userId, userId,
); );
@@ -96,8 +93,10 @@ async function resolveJumpHost(
const { SharedCredentialManager } = const { SharedCredentialManager } =
await import("../utils/shared-credential-manager.js"); await import("../utils/shared-credential-manager.js");
const sharedCredManager = SharedCredentialManager.getInstance(); const sharedCredManager = SharedCredentialManager.getInstance();
const sharedCred = const sharedCred = await sharedCredManager.getSharedCredentialForUser(
await sharedCredManager.getSharedCredentialForUser(hostId, userId); hostId,
userId,
);
if (sharedCred) { if (sharedCred) {
return { return {
...host, ...host,
src/backend/ssh/terminal.ts
+14 -15
View File
@@ -1,15 +1,14 @@
import { WebSocketServer, WebSocket, type RawData } from "ws"; import { WebSocketServer, WebSocket, type RawData } from "ws";
import ssh2pkg from "ssh2"; import ssh2Pkg, {
const { Client, BaseAgent, utils: ssh2Utils } = ssh2pkg; type Client as SSHClientType,
import type { type ClientChannel,
Client as ClientType, type PseudoTtyOptions,
ClientChannel, type ParsedKey,
PseudoTtyOptions, type SignCallback,
ParsedKey, type SigningRequestOptions,
SignCallback, type IdentityCallback,
SigningRequestOptions,
IdentityCallback,
} from "ssh2"; } from "ssh2";
const { Client, BaseAgent, utils: ssh2Utils } = ssh2Pkg;
import net from "net"; import net from "net";
import dgram from "dgram"; import dgram from "dgram";
import { SSH_ALGORITHMS } from "../utils/ssh-algorithms.js"; import { SSH_ALGORITHMS } from "../utils/ssh-algorithms.js";
@@ -273,13 +272,13 @@ async function createJumpHostChain(
jumpHosts: Array<{ hostId: number }>, jumpHosts: Array<{ hostId: number }>,
userId: string, userId: string,
socks5Config?: SOCKS5Config | null, socks5Config?: SOCKS5Config | null,
): Promise<ClientType | null> { ): Promise<SSHClientType | null> {
if (!jumpHosts || jumpHosts.length === 0) { if (!jumpHosts || jumpHosts.length === 0) {
return null; return null;
} }
let currentClient: ClientType | null = null; let currentClient: SSHClientType | null = null;
const clients: ClientType[] = []; const clients: SSHClientType[] = [];
try { try {
const jumpHostConfigs = await Promise.all( const jumpHostConfigs = await Promise.all(
@@ -560,9 +559,9 @@ wss.on("connection", async (ws: WebSocket, req) => {
}); });
let currentSessionId: string | null = null; let currentSessionId: string | null = null;
let sshConn: ClientType | null = null; let sshConn: SSHClientType | null = null;
let sshStream: ClientChannel | null = null; let sshStream: ClientChannel | null = null;
let lastJumpClient: ClientType | null = null; let lastJumpClient: SSHClientType | null = null;
let keyboardInteractiveFinish: ((responses: string[]) => void) | null = null; let keyboardInteractiveFinish: ((responses: string[]) => void) | null = null;
let totpPromptSent = false; let totpPromptSent = false;
let totpTimeout: NodeJS.Timeout | null = null; let totpTimeout: NodeJS.Timeout | null = null;
src/backend/ssh/tmux-helper.ts
+4 -1
View File
@@ -124,7 +124,10 @@ export async function waitForTmuxSession(
const deadline = Date.now() + timeoutMs; const deadline = Date.now() + timeoutMs;
while (Date.now() < deadline) { while (Date.now() < deadline) {
try { try {
await execCommand(conn, `tmux has-session -t ${shellEscape(sessionName)} 2>/dev/null`); await execCommand(
conn,
`tmux has-session -t ${shellEscape(sessionName)} 2>/dev/null`,
);
return sessionName; return sessionName;
} catch { } catch {
// session not ready yet // session not ready yet
src/backend/starter.ts
+2 -3
View File
@@ -199,9 +199,8 @@ import {
operation: "shutdown", operation: "shutdown",
}); });
try { try {
const { saveMemoryDatabaseToFile } = await import( const { saveMemoryDatabaseToFile } =
"./database/db/index.js" await import("./database/db/index.js");
);
await saveMemoryDatabaseToFile(); await saveMemoryDatabaseToFile();
systemLogger.info("Database saved to disk before exit", { systemLogger.info("Database saved to disk before exit", {
operation: "shutdown_db_saved", operation: "shutdown_db_saved",
src/ui/auth/Auth.tsx
+22 -3
View File
@@ -654,13 +654,32 @@ export function Auth({ onLogin }: AuthProps) {
setOidcLoading(true); setOidcLoading(true);
try { try {
if (isElectron()) { if (isElectron()) {
const electronAPI = (window as unknown as { electronAPI?: { oidcSystemBrowserAuth?: (authUrl: string, port: number) => Promise<{ success: boolean; token?: string; error?: string }> } }).electronAPI; const electronAPI = (
window as unknown as {
electronAPI?: {
oidcSystemBrowserAuth?: (
authUrl: string,
port: number,
) => Promise<{
success: boolean;
token?: string;
error?: string;
}>;
};
}
).electronAPI;
if (electronAPI?.oidcSystemBrowserAuth) { if (electronAPI?.oidcSystemBrowserAuth) {
const callbackPort = 17832 + Math.floor(Math.random() * 100); const callbackPort = 17832 + Math.floor(Math.random() * 100);
const authResponse = await getOIDCAuthorizeUrl(rememberMe, callbackPort); const authResponse = await getOIDCAuthorizeUrl(
rememberMe,
callbackPort,
);
const { auth_url: authUrl } = authResponse; const { auth_url: authUrl } = authResponse;
if (!authUrl) throw new Error(t("errors.invalidAuthUrl")); if (!authUrl) throw new Error(t("errors.invalidAuthUrl"));
const result = await electronAPI.oidcSystemBrowserAuth(authUrl, callbackPort); const result = await electronAPI.oidcSystemBrowserAuth(
authUrl,
callbackPort,
);
if (result.success && result.token) { if (result.success && result.token) {
localStorage.setItem("jwt_token", result.token); localStorage.setItem("jwt_token", result.token);
window.location.reload(); window.location.reload();
src/ui/dashboard/DashboardTab.tsx
+10 -2
View File
@@ -737,7 +737,11 @@ function CardItem({
/> />
)} )}
{slot.id === "quick_actions" && ( {slot.id === "quick_actions" && (
<QuickActionsCard onOpenSingletonTab={onOpenSingletonTab} hosts={hosts} onOpenTab={onOpenTab} /> <QuickActionsCard
onOpenSingletonTab={onOpenSingletonTab}
hosts={hosts}
onOpenTab={onOpenTab}
/>
)} )}
{slot.id === "host_status" && ( {slot.id === "host_status" && (
<HostStatusCard <HostStatusCard
@@ -1395,7 +1399,11 @@ export function DashboardTab({
/> />
)} )}
{slot.id === "quick_actions" && ( {slot.id === "quick_actions" && (
<QuickActionsCard onOpenSingletonTab={onOpenSingletonTab} hosts={hosts} onOpenTab={onOpenTab} /> <QuickActionsCard
onOpenSingletonTab={onOpenSingletonTab}
hosts={hosts}
onOpenTab={onOpenTab}
/>
)} )}
{slot.id === "host_status" && ( {slot.id === "host_status" && (
<HostStatusCard <HostStatusCard
src/ui/features/guacamole/GuacamoleDisplay.tsx
+5 -1
View File
@@ -395,7 +395,11 @@ export const GuacamoleDisplay = forwardRef<
Guacamole.AudioPlayer.getInstance(stream, mimetype); Guacamole.AudioPlayer.getInstance(stream, mimetype);
}; };
client.onfile = (stream: Guacamole.InputStream, mimetype: string, filename: string) => { client.onfile = (
stream: Guacamole.InputStream,
mimetype: string,
filename: string,
) => {
const reader = new Guacamole.BlobReader(stream, mimetype); const reader = new Guacamole.BlobReader(stream, mimetype);
reader.onend = () => { reader.onend = () => {
const blob = reader.getBlob(); const blob = reader.getBlob();
src/ui/features/terminal/Terminal.tsx
+4 -2
View File
@@ -1981,7 +1981,8 @@ const TerminalInner = forwardRef<TerminalHandle, SSHTerminalProps>(
const clipboardAddon = new ClipboardAddon(undefined, clipboardProvider); const clipboardAddon = new ClipboardAddon(undefined, clipboardProvider);
const unicode11Addon = new Unicode11Addon(); const unicode11Addon = new Unicode11Addon();
const webLinksAddon = new WebLinksAddon((_event, uri) => { const webLinksAddon = new WebLinksAddon((_event, uri) => {
const url = uri.startsWith("http://") || uri.startsWith("https://") const url =
uri.startsWith("http://") || uri.startsWith("https://")
? uri ? uri
: `https://${uri}`; : `https://${uri}`;
window.open(url, "_blank"); window.open(url, "_blank");
@@ -2148,7 +2149,8 @@ const TerminalInner = forwardRef<TerminalHandle, SSHTerminalProps>(
} }
const persistenceEnabled = const persistenceEnabled =
localStorage.getItem("enableTerminalSessionPersistence") !== "false"; localStorage.getItem("enableTerminalSessionPersistence") !==
"false";
if ( if (
!persistenceEnabled && !persistenceEnabled &&
sessionIdRef.current && sessionIdRef.current &&