mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-17 04:50:52 +00:00
* feat(vault): add host connection test to the host editor Add a 'Test' button next to Save in the host editor that opens a dialog reusing the terminal's connection progress/auth/host-key UI, and runs a headless connection probe: - Main process: netcatty:test-connection reuses startSSHSession in a testMode that authenticates then tears down without opening a shell, reports via netcatty:test:result, and supports cancellation (netcatty:test-connection:cancel). - Renderer: useHostConnectionTest hook + HostConnectionTestDialog component; single-credential auth (no agent/default-key fallback) with short test timeouts (8s TCP / 15s auth). - Reuses terminal chain progress, host-key verification, and auth prompts; success keeps the same dialog with retry/close. * fix(ssh): cancel test connections during chain/proxy dial Register the headless test-connection transport before connectThroughChain / createProxySocket runs, and update its pendingConn / chainConnections as hops and proxy sockets are established. This lets cancelTestConnection abort a slow/unreachable bastion or proxy dial instead of leaving it running until timeout. * fix(ssh): address host connection test review feedback - Route jump-host keyboard-interactive prompts through the external scope in test mode - Always offer keyboard-interactive for requiresMfa hosts in test mode, including key/certificate-only auth - Derive the renderer test deadline from the probe options and cancel the attempt on timeout - Run the macOS Local Network preflight before connection tests - Add regression tests for jump-host MFA, MFA auth order, test deadline, and macOS preflight Author: yangheng Model: claude-opus-5 --------- Co-authored-by: yangheng <492238647@qq.com>
154 lines
5.0 KiB
TypeScript
154 lines
5.0 KiB
TypeScript
import React, { useState } from "react";
|
|
import { createPortal } from "react-dom";
|
|
import { useI18n } from "../../application/i18n/I18nProvider";
|
|
import type { Host, SSHKey } from "../../types";
|
|
import { TerminalConnectionDialog } from "../terminal/TerminalConnectionDialog";
|
|
import type { TerminalAuthMethod } from "../terminal/TerminalAuthDialog";
|
|
import type { useHostConnectionTest } from "../../application/state/useHostConnectionTest";
|
|
|
|
type HostConnectionTest = ReturnType<typeof useHostConnectionTest>;
|
|
|
|
export interface HostConnectionTestDialogProps {
|
|
open: boolean;
|
|
onClose: () => void;
|
|
host: Host;
|
|
keys: SSHKey[];
|
|
test: HostConnectionTest;
|
|
}
|
|
|
|
/**
|
|
* Host-editor "test connection" overlay. It reuses the terminal's own
|
|
* connection dialog verbatim (progress bar, per-hop chain header, auth prompt,
|
|
* and host-key verification) and keeps it mounted on success so the final
|
|
* "Connected" state shows through the same dialog with retry/close.
|
|
*/
|
|
export const HostConnectionTestDialog: React.FC<HostConnectionTestDialogProps> = ({
|
|
open,
|
|
onClose,
|
|
host,
|
|
keys,
|
|
test,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const { state } = test;
|
|
const [showLogs, setShowLogs] = useState(false);
|
|
|
|
// Auth re-entry form state (shown when state.needsAuth is true).
|
|
const [authMethod, setAuthMethod] = useState<TerminalAuthMethod>("password");
|
|
const [authUsername, setAuthUsername] = useState(host.username || "root");
|
|
const [authPassword, setAuthPassword] = useState("");
|
|
const [authKeyId, setAuthKeyId] = useState<string | null>(null);
|
|
const [authPassphrase, setAuthPassphrase] = useState("");
|
|
const [showAuthPassphrase, setShowAuthPassphrase] = useState(false);
|
|
const [showAuthPassword, setShowAuthPassword] = useState(false);
|
|
|
|
const handleClose = () => {
|
|
if (state.status === "connecting") {
|
|
test.cancelTest();
|
|
}
|
|
setShowLogs(false);
|
|
onClose();
|
|
};
|
|
|
|
const authIsValid =
|
|
authMethod === "password" ? authPassword.length > 0 : Boolean(authKeyId);
|
|
|
|
const submitAuth = () => {
|
|
if (!authIsValid) return;
|
|
test.submitAuth({
|
|
authMethod,
|
|
username: authUsername,
|
|
...(authMethod === "password"
|
|
? { password: authPassword }
|
|
: { keyId: authKeyId ?? undefined, passphrase: authPassphrase || undefined }),
|
|
});
|
|
};
|
|
|
|
if (!open) return null;
|
|
|
|
const dialogStatus =
|
|
state.status === "connecting"
|
|
? "connecting"
|
|
: state.status === "connected"
|
|
? "connected"
|
|
: "disconnected";
|
|
|
|
return createPortal(
|
|
<div
|
|
className="fixed inset-0 z-50"
|
|
style={
|
|
{
|
|
// The terminal dialog's card/backdrop colors resolve through
|
|
// --terminal-ui-bg/--terminal-ui-fg (full colors set inside a
|
|
// terminal pane). Outside a terminal those variables are unset and
|
|
// the fallback `var(--background)` is only a raw HSL triplet, which
|
|
// is invalid inside color-mix() and silently drops the card border,
|
|
// background, and backdrop dim. Pin them to the app theme here so
|
|
// the reused dialog keeps its border/shadow/dim.
|
|
"--terminal-ui-bg": "hsl(var(--background))",
|
|
"--terminal-ui-fg": "hsl(var(--foreground))",
|
|
} as React.CSSProperties
|
|
}
|
|
>
|
|
<TerminalConnectionDialog
|
|
host={host}
|
|
status={dialogStatus}
|
|
error={state.error}
|
|
progressValue={state.progressValue}
|
|
chainProgress={state.chainProgress}
|
|
needsAuth={state.needsAuth}
|
|
showLogs={showLogs}
|
|
_setShowLogs={setShowLogs}
|
|
keys={keys}
|
|
authProps={{
|
|
authMethod,
|
|
setAuthMethod,
|
|
authUsername,
|
|
setAuthUsername,
|
|
authPassword,
|
|
setAuthPassword,
|
|
authKeyId,
|
|
setAuthKeyId,
|
|
authPassphrase,
|
|
setAuthPassphrase,
|
|
showAuthPassphrase,
|
|
setShowAuthPassphrase,
|
|
showAuthPassword,
|
|
setShowAuthPassword,
|
|
authRetryMessage: state.needsAuth
|
|
? t("hostConnectionTest.credentialsUnavailable")
|
|
: null,
|
|
onSubmit: submitAuth,
|
|
onSubmitWithoutSave: submitAuth,
|
|
onCancel: handleClose,
|
|
isValid: authIsValid,
|
|
}}
|
|
hostKeyVerification={
|
|
state.hostKeyVerification
|
|
? {
|
|
hostKeyInfo: state.hostKeyVerification.hostKeyInfo,
|
|
onClose: test.handleHostKeyClose,
|
|
onContinue: test.handleHostKeyContinue,
|
|
onAddAndContinue: test.handleHostKeyAddAndContinue,
|
|
}
|
|
: undefined
|
|
}
|
|
progressProps={{
|
|
timeLeft: state.timeLeft,
|
|
isAwaitingUserInput: state.isAwaitingUserInput,
|
|
isCancelling: state.isCancelling,
|
|
progressLogs: state.progressLogs,
|
|
onCancelConnect: handleClose,
|
|
onCloseSession: handleClose,
|
|
onRetry: () => void test.retry(),
|
|
reconnectLabel: t("hostConnectionTest.retry"),
|
|
closeLabel: t("common.close"),
|
|
}}
|
|
/>
|
|
</div>,
|
|
document.body,
|
|
);
|
|
};
|
|
|
|
export default HostConnectionTestDialog;
|