feat: add sudo password and add diagonal bg's
This commit is contained in:
@@ -701,6 +701,23 @@ const migrateSchema = () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Migration: Add sudo_password column to ssh_data table
|
||||||
|
try {
|
||||||
|
sqlite.prepare("SELECT sudo_password FROM ssh_data LIMIT 1").get();
|
||||||
|
} catch {
|
||||||
|
try {
|
||||||
|
sqlite.exec("ALTER TABLE ssh_data ADD COLUMN sudo_password TEXT");
|
||||||
|
databaseLogger.info("Added sudo_password column to ssh_data table", {
|
||||||
|
operation: "schema_migration",
|
||||||
|
});
|
||||||
|
} catch (alterError) {
|
||||||
|
databaseLogger.warn("Failed to add sudo_password column", {
|
||||||
|
operation: "schema_migration",
|
||||||
|
error: alterError,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// RBAC Phase 2: Roles tables
|
// RBAC Phase 2: Roles tables
|
||||||
try {
|
try {
|
||||||
sqlite.prepare("SELECT id FROM roles LIMIT 1").get();
|
sqlite.prepare("SELECT id FROM roles LIMIT 1").get();
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ export const sshData = sqliteTable("ssh_data", {
|
|||||||
key: text("key", { length: 8192 }),
|
key: text("key", { length: 8192 }),
|
||||||
key_password: text("key_password"),
|
key_password: text("key_password"),
|
||||||
keyType: text("key_type"),
|
keyType: text("key_type"),
|
||||||
|
sudoPassword: text("sudo_password"),
|
||||||
|
|
||||||
autostartPassword: text("autostart_password"),
|
autostartPassword: text("autostart_password"),
|
||||||
autostartKey: text("autostart_key", { length: 8192 }),
|
autostartKey: text("autostart_key", { length: 8192 }),
|
||||||
|
|||||||
@@ -243,6 +243,7 @@ router.post(
|
|||||||
key,
|
key,
|
||||||
keyPassword,
|
keyPassword,
|
||||||
keyType,
|
keyType,
|
||||||
|
sudoPassword,
|
||||||
pin,
|
pin,
|
||||||
enableTerminal,
|
enableTerminal,
|
||||||
enableTunnel,
|
enableTunnel,
|
||||||
@@ -315,6 +316,7 @@ router.post(
|
|||||||
terminalConfig: terminalConfig ? JSON.stringify(terminalConfig) : null,
|
terminalConfig: terminalConfig ? JSON.stringify(terminalConfig) : null,
|
||||||
forceKeyboardInteractive: forceKeyboardInteractive ? "true" : "false",
|
forceKeyboardInteractive: forceKeyboardInteractive ? "true" : "false",
|
||||||
notes: notes || null,
|
notes: notes || null,
|
||||||
|
sudoPassword: sudoPassword || null,
|
||||||
useSocks5: useSocks5 ? 1 : 0,
|
useSocks5: useSocks5 ? 1 : 0,
|
||||||
socks5Host: socks5Host || null,
|
socks5Host: socks5Host || null,
|
||||||
socks5Port: socks5Port || null,
|
socks5Port: socks5Port || null,
|
||||||
@@ -493,6 +495,7 @@ router.put(
|
|||||||
key,
|
key,
|
||||||
keyPassword,
|
keyPassword,
|
||||||
keyType,
|
keyType,
|
||||||
|
sudoPassword,
|
||||||
pin,
|
pin,
|
||||||
enableTerminal,
|
enableTerminal,
|
||||||
enableTunnel,
|
enableTunnel,
|
||||||
@@ -560,6 +563,7 @@ router.put(
|
|||||||
terminalConfig: terminalConfig ? JSON.stringify(terminalConfig) : null,
|
terminalConfig: terminalConfig ? JSON.stringify(terminalConfig) : null,
|
||||||
forceKeyboardInteractive: forceKeyboardInteractive ? "true" : "false",
|
forceKeyboardInteractive: forceKeyboardInteractive ? "true" : "false",
|
||||||
notes: notes || null,
|
notes: notes || null,
|
||||||
|
sudoPassword: sudoPassword || null,
|
||||||
useSocks5: useSocks5 ? 1 : 0,
|
useSocks5: useSocks5 ? 1 : 0,
|
||||||
socks5Host: socks5Host || null,
|
socks5Host: socks5Host || null,
|
||||||
socks5Port: socks5Port || null,
|
socks5Port: socks5Port || null,
|
||||||
|
|||||||
@@ -942,7 +942,9 @@
|
|||||||
"quickActionsOrder": "Quick action buttons will appear in the order listed above on the Server Stats page",
|
"quickActionsOrder": "Quick action buttons will appear in the order listed above on the Server Stats page",
|
||||||
"advancedAuthSettings": "Advanced Authentication Settings",
|
"advancedAuthSettings": "Advanced Authentication Settings",
|
||||||
"sudoPasswordAutoFill": "Sudo Password Auto-Fill",
|
"sudoPasswordAutoFill": "Sudo Password Auto-Fill",
|
||||||
"sudoPasswordAutoFillDesc": "Automatically offer to insert SSH password when sudo prompts for password"
|
"sudoPasswordAutoFillDesc": "Automatically offer to insert SSH password when sudo prompts for password",
|
||||||
|
"sudoPassword": "Sudo Password",
|
||||||
|
"sudoPasswordDesc": "Optional password for sudo commands (useful with key authentication)"
|
||||||
},
|
},
|
||||||
"terminal": {
|
"terminal": {
|
||||||
"title": "Terminal",
|
"title": "Terminal",
|
||||||
@@ -1617,6 +1619,7 @@
|
|||||||
"folder": "folder",
|
"folder": "folder",
|
||||||
"password": "password",
|
"password": "password",
|
||||||
"keyPassword": "key password",
|
"keyPassword": "key password",
|
||||||
|
"sudoPassword": "sudo password (optional)",
|
||||||
"notes": "add notes about this host...",
|
"notes": "add notes about this host...",
|
||||||
"expirationDate": "Select expiration date",
|
"expirationDate": "Select expiration date",
|
||||||
"pastePrivateKey": "Paste your private key here...",
|
"pastePrivateKey": "Paste your private key here...",
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export interface SSHHost {
|
|||||||
key?: string;
|
key?: string;
|
||||||
keyPassword?: string;
|
keyPassword?: string;
|
||||||
keyType?: string;
|
keyType?: string;
|
||||||
|
sudoPassword?: string;
|
||||||
forceKeyboardInteractive?: boolean;
|
forceKeyboardInteractive?: boolean;
|
||||||
|
|
||||||
autostartPassword?: string;
|
autostartPassword?: string;
|
||||||
@@ -95,6 +96,7 @@ export interface SSHHostData {
|
|||||||
key?: File | null;
|
key?: File | null;
|
||||||
keyPassword?: string;
|
keyPassword?: string;
|
||||||
keyType?: string;
|
keyType?: string;
|
||||||
|
sudoPassword?: string;
|
||||||
credentialId?: number | null;
|
credentialId?: number | null;
|
||||||
overrideCredentialUsername?: boolean;
|
overrideCredentialUsername?: boolean;
|
||||||
enableTerminal?: boolean;
|
enableTerminal?: boolean;
|
||||||
|
|||||||
@@ -285,6 +285,16 @@ function AppContent() {
|
|||||||
className={`fixed inset-0 bg-background z-[20000] transition-opacity duration-700 ${
|
className={`fixed inset-0 bg-background z-[20000] transition-opacity duration-700 ${
|
||||||
transitionPhase === "fadeOut" ? "opacity-100" : "opacity-0"
|
transitionPhase === "fadeOut" ? "opacity-100" : "opacity-0"
|
||||||
}`}
|
}`}
|
||||||
|
style={{
|
||||||
|
background: "#0e0e10",
|
||||||
|
backgroundImage: `repeating-linear-gradient(
|
||||||
|
45deg,
|
||||||
|
transparent,
|
||||||
|
transparent 35px,
|
||||||
|
rgba(255, 255, 255, 0.03) 35px,
|
||||||
|
rgba(255, 255, 255, 0.03) 37px
|
||||||
|
)`,
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{transitionPhase === "fadeOut" && (
|
{transitionPhase === "fadeOut" && (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { Button } from "@/components/ui/button";
|
|||||||
import {
|
import {
|
||||||
Form,
|
Form,
|
||||||
FormControl,
|
FormControl,
|
||||||
|
FormDescription,
|
||||||
FormField,
|
FormField,
|
||||||
FormItem,
|
FormItem,
|
||||||
FormLabel,
|
FormLabel,
|
||||||
|
|||||||
@@ -517,6 +517,7 @@ export function HostManagerEditor({
|
|||||||
autoMosh: z.boolean(),
|
autoMosh: z.boolean(),
|
||||||
moshCommand: z.string(),
|
moshCommand: z.string(),
|
||||||
sudoPasswordAutoFill: z.boolean(),
|
sudoPasswordAutoFill: z.boolean(),
|
||||||
|
sudoPassword: z.string().optional(),
|
||||||
})
|
})
|
||||||
.optional(),
|
.optional(),
|
||||||
forceKeyboardInteractive: z.boolean().optional(),
|
forceKeyboardInteractive: z.boolean().optional(),
|
||||||
@@ -2726,6 +2727,27 @@ export function HostManagerEditor({
|
|||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{form.watch("terminalConfig.sudoPasswordAutoFill") && (
|
||||||
|
<FormField
|
||||||
|
control={form.control}
|
||||||
|
name="terminalConfig.sudoPassword"
|
||||||
|
render={({ field }) => (
|
||||||
|
<FormItem>
|
||||||
|
<FormLabel>{t("hosts.sudoPassword")}</FormLabel>
|
||||||
|
<FormControl>
|
||||||
|
<PasswordInput
|
||||||
|
placeholder={t("placeholders.sudoPassword")}
|
||||||
|
{...field}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
<FormDescription>
|
||||||
|
{t("hosts.sudoPasswordDesc")}
|
||||||
|
</FormDescription>
|
||||||
|
</FormItem>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<label className="text-sm font-medium">
|
<label className="text-sm font-medium">
|
||||||
Environment Variables
|
Environment Variables
|
||||||
|
|||||||
@@ -666,10 +666,12 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
|
|||||||
// Sudo password prompt detection
|
// Sudo password prompt detection
|
||||||
const sudoPasswordPattern =
|
const sudoPasswordPattern =
|
||||||
/(?:\[sudo\] password for \S+:|sudo: a password is required)/;
|
/(?:\[sudo\] password for \S+:|sudo: a password is required)/;
|
||||||
|
const passwordToFill =
|
||||||
|
hostConfig.terminalConfig?.sudoPassword || hostConfig.password;
|
||||||
if (
|
if (
|
||||||
config.sudoPasswordAutoFill &&
|
config.sudoPasswordAutoFill &&
|
||||||
sudoPasswordPattern.test(msg.data) &&
|
sudoPasswordPattern.test(msg.data) &&
|
||||||
hostConfig.password &&
|
passwordToFill &&
|
||||||
!sudoPromptShownRef.current
|
!sudoPromptShownRef.current
|
||||||
) {
|
) {
|
||||||
sudoPromptShownRef.current = true;
|
sudoPromptShownRef.current = true;
|
||||||
@@ -683,7 +685,7 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
|
|||||||
webSocketRef.current.send(
|
webSocketRef.current.send(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
type: "input",
|
type: "input",
|
||||||
data: hostConfig.password + "\n",
|
data: passwordToFill + "\n",
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -769,10 +769,20 @@ export function Auth({
|
|||||||
if (dbHealthChecking && !dbConnectionFailed) {
|
if (dbHealthChecking && !dbConnectionFailed) {
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={`w-[420px] max-w-full p-6 flex flex-col bg-dark-bg border-2 border-dark-border rounded-md overflow-y-auto my-2 animate-in fade-in zoom-in-95 duration-300 ${className || ""}`}
|
className={`fixed inset-0 flex items-center justify-center ${className || ""}`}
|
||||||
style={{ maxHeight: "calc(100vh - 1rem)" }}
|
style={{
|
||||||
|
background: "#0e0e10",
|
||||||
|
backgroundImage: `repeating-linear-gradient(
|
||||||
|
45deg,
|
||||||
|
transparent,
|
||||||
|
transparent 35px,
|
||||||
|
rgba(255, 255, 255, 0.03) 35px,
|
||||||
|
rgba(255, 255, 255, 0.03) 37px
|
||||||
|
)`,
|
||||||
|
}}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
|
<div className="w-[420px] max-w-full p-6 flex flex-col bg-dark-bg border-2 border-dark-border rounded-md overflow-y-auto my-2 animate-in fade-in zoom-in-95 duration-300">
|
||||||
<div className="flex items-center justify-center h-32">
|
<div className="flex items-center justify-center h-32">
|
||||||
<div className="text-center">
|
<div className="text-center">
|
||||||
<div className="w-8 h-8 border-2 border-primary border-t-transparent rounded-full animate-spin mx-auto mb-4" />
|
<div className="w-8 h-8 border-2 border-primary border-t-transparent rounded-full animate-spin mx-auto mb-4" />
|
||||||
@@ -782,6 +792,7 @@ export function Auth({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user