mirror of
https://github.com/hansjone/netx.git
synced 2026-10-09 05:30:46 +08:00
feat(ne): add Linux SSH bastion hop type
Support hop_vendor=linux via Paramiko direct-tcpip tunnel; ZTE CLI hop unchanged. UI hop type selector and distinct list badges. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
d395aa7174
commit
d3eae3351c
9 changed files with 232 additions and 59 deletions
|
|
@ -1,8 +1,16 @@
|
|||
import type { ReactNode } from "react";
|
||||
import { useI18n } from "../i18n";
|
||||
import { isAutoHopTemplate, zteHopTemplate } from "../utils/zteHop";
|
||||
import {
|
||||
HOP_VENDORS,
|
||||
isAutoHopTemplate,
|
||||
isLinuxHopVendor,
|
||||
patchHopVendorChange,
|
||||
zteHopTemplate,
|
||||
type HopVendor,
|
||||
} from "../utils/hopProxy";
|
||||
|
||||
export type HopProxyFieldsState = {
|
||||
hop_vendor: HopVendor;
|
||||
hop_host: string;
|
||||
hop_port: number;
|
||||
hop_protocol: string;
|
||||
|
|
@ -13,6 +21,7 @@ export type HopProxyFieldsState = {
|
|||
};
|
||||
|
||||
export const emptyHopProxyFields = (): HopProxyFieldsState => ({
|
||||
hop_vendor: "zte",
|
||||
hop_host: "",
|
||||
hop_port: 22,
|
||||
hop_protocol: "ssh",
|
||||
|
|
@ -62,11 +71,31 @@ export function HopProxyFields({
|
|||
hopPasswordOptional = false,
|
||||
}: Props) {
|
||||
const { t } = useI18n();
|
||||
const linux = isLinuxHopVendor(value.hop_vendor);
|
||||
|
||||
const set = (patch: Partial<HopProxyFieldsState>) => onChange(patch);
|
||||
|
||||
return (
|
||||
<div className="form-grid">
|
||||
<label className="form-grid__full">
|
||||
<FormLabel required>{t("managedNe.hop.type")}</FormLabel>
|
||||
<select
|
||||
value={value.hop_vendor}
|
||||
onChange={(e) => {
|
||||
const hop_vendor = e.target.value as HopVendor;
|
||||
set(patchHopVendorChange(hop_vendor, value));
|
||||
}}
|
||||
>
|
||||
{HOP_VENDORS.map((v) => (
|
||||
<option key={v} value={v}>
|
||||
{t(`managedNe.hop.vendor.${v}`)}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<span className="form-field-hint">
|
||||
{linux ? t("managedNe.hop.linuxHint") : t("managedNe.hop.zteHint")}
|
||||
</span>
|
||||
</label>
|
||||
<label>
|
||||
<FormLabel required>{t("managedNe.hop.host")}</FormLabel>
|
||||
<input required value={value.hop_host} onChange={(e) => set({ hop_host: e.target.value })} />
|
||||
|
|
@ -79,19 +108,21 @@ export function HopProxyFields({
|
|||
onChange={(e) => set({ hop_port: Number(e.target.value) || 22 })}
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
<FormLabel>{t("managedNe.hop.protocol")}</FormLabel>
|
||||
<select
|
||||
value={value.hop_protocol}
|
||||
onChange={(e) => {
|
||||
const hop_protocol = e.target.value;
|
||||
set({ hop_protocol, ...applyHopTemplate(value, hop_protocol, value.hop_vrf) });
|
||||
}}
|
||||
>
|
||||
<option value="ssh">ssh</option>
|
||||
<option value="telnet">telnet</option>
|
||||
</select>
|
||||
</label>
|
||||
{!linux ? (
|
||||
<label>
|
||||
<FormLabel>{t("managedNe.hop.protocol")}</FormLabel>
|
||||
<select
|
||||
value={value.hop_protocol}
|
||||
onChange={(e) => {
|
||||
const hop_protocol = e.target.value;
|
||||
set({ hop_protocol, ...applyHopTemplate(value, hop_protocol, value.hop_vrf) });
|
||||
}}
|
||||
>
|
||||
<option value="ssh">ssh</option>
|
||||
<option value="telnet">telnet</option>
|
||||
</select>
|
||||
</label>
|
||||
) : null}
|
||||
<label>
|
||||
<FormLabel required>{t("managedNe.hop.username")}</FormLabel>
|
||||
<input required value={value.hop_username} onChange={(e) => set({ hop_username: e.target.value })} />
|
||||
|
|
@ -110,25 +141,29 @@ export function HopProxyFields({
|
|||
onChange={(e) => set({ hop_password: e.target.value })}
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
<FormLabel>{t("managedNe.hop.vrf")}</FormLabel>
|
||||
<input
|
||||
value={value.hop_vrf}
|
||||
onChange={(e) => {
|
||||
const hop_vrf = e.target.value;
|
||||
set({ hop_vrf, ...applyHopTemplate(value, value.hop_protocol, hop_vrf) });
|
||||
}}
|
||||
/>
|
||||
</label>
|
||||
<label className="form-grid__full">
|
||||
<FormLabel>{t("managedNe.hop.commandTemplate")}</FormLabel>
|
||||
<input
|
||||
value={value.hop_command_template}
|
||||
onChange={(e) => set({ hop_command_template: e.target.value })}
|
||||
placeholder={zteHopTemplate(value.hop_protocol, value.hop_vrf)}
|
||||
/>
|
||||
<span className="form-field-hint">{t("managedNe.hop.templateHint")}</span>
|
||||
</label>
|
||||
{!linux ? (
|
||||
<>
|
||||
<label>
|
||||
<FormLabel>{t("managedNe.hop.vrf")}</FormLabel>
|
||||
<input
|
||||
value={value.hop_vrf}
|
||||
onChange={(e) => {
|
||||
const hop_vrf = e.target.value;
|
||||
set({ hop_vrf, ...applyHopTemplate(value, value.hop_protocol, hop_vrf) });
|
||||
}}
|
||||
/>
|
||||
</label>
|
||||
<label className="form-grid__full">
|
||||
<FormLabel>{t("managedNe.hop.commandTemplate")}</FormLabel>
|
||||
<input
|
||||
value={value.hop_command_template}
|
||||
onChange={(e) => set({ hop_command_template: e.target.value })}
|
||||
placeholder={zteHopTemplate(value.hop_protocol, value.hop_vrf)}
|
||||
/>
|
||||
<span className="form-field-hint">{t("managedNe.hop.templateHint")}</span>
|
||||
</label>
|
||||
</>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,8 +177,15 @@ const en = {
|
|||
passwordOptional: "leave blank to keep unchanged",
|
||||
},
|
||||
hop: {
|
||||
sectionTitle: "ZTE jump host",
|
||||
sectionTitle: "Jump host / proxy",
|
||||
type: "Jump type",
|
||||
enable: "Connect to target via jump host",
|
||||
vendor: {
|
||||
zte: "ZTE device (CLI jump)",
|
||||
linux: "Linux server (SSH tunnel)",
|
||||
},
|
||||
zteHint: "Run ssh/telnet on the ZTE device to reach the target; target credentials use secondary auth.",
|
||||
linuxHint: "SSH to the Linux bastion, then direct-tcpip tunnel to target IP:port (ProxyJump-style).",
|
||||
host: "Jump host",
|
||||
port: "Jump port",
|
||||
protocol: "Jump protocol",
|
||||
|
|
@ -188,7 +195,10 @@ const en = {
|
|||
commandTemplate: "Jump command template",
|
||||
templateHint:
|
||||
"ZTE CLI: telnet {target_ip}, telnet {target_ip} vrf {vrf}, ssh {target_ip}, ssh {target_ip} vrf {vrf}. Auto-suggested from jump protocol/VRF; same when left blank. Target credentials via secondary auth prompts.",
|
||||
badge: "hop",
|
||||
badge: {
|
||||
zte: "ZTE hop",
|
||||
linux: "Linux hop",
|
||||
},
|
||||
hostRequired: "Jump host is required",
|
||||
userRequired: "Jump username is required",
|
||||
passwordRequired: "Jump password is required",
|
||||
|
|
|
|||
|
|
@ -176,8 +176,15 @@ const zh = {
|
|||
passwordOptional: "留空则不修改",
|
||||
},
|
||||
hop: {
|
||||
sectionTitle: "ZTE 跳板机",
|
||||
sectionTitle: "跳板 / 代理",
|
||||
type: "跳板类型",
|
||||
enable: "经跳板登录目标网元",
|
||||
vendor: {
|
||||
zte: "ZTE 设备(CLI 跳登)",
|
||||
linux: "Linux 服务器(SSH 隧道)",
|
||||
},
|
||||
zteHint: "在 ZTE 设备上执行 ssh/telnet 命令跳转到目标,目标账号由二次认证输入。",
|
||||
linuxHint: "先 SSH 登录 Linux 跳板,经 direct-tcpip 隧道连接目标 IP:端口(等同 ProxyJump)。",
|
||||
host: "跳板地址",
|
||||
port: "跳板端口",
|
||||
protocol: "跳板协议",
|
||||
|
|
@ -187,7 +194,10 @@ const zh = {
|
|||
commandTemplate: "跳登命令模板",
|
||||
templateHint:
|
||||
"ZTE 常用:telnet {target_ip}、telnet {target_ip} vrf {vrf}、ssh {target_ip}、ssh {target_ip} vrf {vrf}。按跳板协议与 VRF 自动推荐;留空时后端同样规则。目标账号密码由二次认证提示输入。",
|
||||
badge: "跳板",
|
||||
badge: {
|
||||
zte: "ZTE跳板",
|
||||
linux: "Linux跳板",
|
||||
},
|
||||
hostRequired: "请填写跳板地址",
|
||||
userRequired: "请填写跳板用户名",
|
||||
passwordRequired: "请填写跳板密码",
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ import { useToast } from "../hooks/useToast";
|
|||
import type { ManagedNeItem } from "../types";
|
||||
import { pageCount } from "../utils/display";
|
||||
import { formatSystemTime } from "../utils/time";
|
||||
import { isAutoHopTemplate, zteHopTemplate } from "../utils/zteHop";
|
||||
import { isAutoHopTemplate, patchHopVendorChange, zteHopTemplate } from "../utils/hopProxy";
|
||||
import type { HopVendor } from "../utils/hopProxy";
|
||||
|
||||
type FormState = {
|
||||
name: string;
|
||||
|
|
@ -32,6 +33,7 @@ type FormState = {
|
|||
tags: string;
|
||||
remark: string;
|
||||
hop_enabled: boolean;
|
||||
hop_vendor: HopVendor;
|
||||
hop_host: string;
|
||||
hop_port: number;
|
||||
hop_protocol: string;
|
||||
|
|
@ -53,6 +55,7 @@ const emptyForm = (): FormState => ({
|
|||
tags: "",
|
||||
remark: "",
|
||||
hop_enabled: false,
|
||||
hop_vendor: "zte",
|
||||
hop_host: "",
|
||||
hop_port: 22,
|
||||
hop_protocol: "ssh",
|
||||
|
|
@ -149,7 +152,7 @@ export function NePage() {
|
|||
tags: form.tags,
|
||||
remark: form.remark,
|
||||
hop_enabled: form.hop_enabled,
|
||||
hop_vendor: "zte",
|
||||
hop_vendor: form.hop_vendor,
|
||||
hop_host: form.hop_host,
|
||||
hop_port: form.hop_port,
|
||||
hop_protocol: form.hop_protocol,
|
||||
|
|
@ -203,7 +206,7 @@ export function NePage() {
|
|||
const batchHopMutation = useMutation({
|
||||
mutationFn: () =>
|
||||
batchApplyHopManagedNe(selected, {
|
||||
hop_vendor: "zte",
|
||||
hop_vendor: batchHop.hop_vendor,
|
||||
hop_host: batchHop.hop_host.trim(),
|
||||
hop_port: batchHop.hop_port,
|
||||
hop_protocol: batchHop.hop_protocol,
|
||||
|
|
@ -265,6 +268,7 @@ export function NePage() {
|
|||
tags: row.tags,
|
||||
remark: row.remark,
|
||||
hop_enabled: row.hop_enabled,
|
||||
hop_vendor: (row.hop_vendor === "linux" ? "linux" : "zte") as HopVendor,
|
||||
hop_host: row.hop_host,
|
||||
hop_port: row.hop_port,
|
||||
hop_protocol: row.hop_protocol,
|
||||
|
|
@ -432,8 +436,11 @@ export function NePage() {
|
|||
<td>
|
||||
{row.ip_address}:{row.port}/{row.protocol}
|
||||
{row.hop_enabled ? (
|
||||
<span className="table-tag" title={`${row.hop_host}:${row.hop_port}`}>
|
||||
{t("managedNe.hop.badge")}
|
||||
<span
|
||||
className="table-tag"
|
||||
title={`${row.hop_host}:${row.hop_port} (${row.hop_vendor})`}
|
||||
>
|
||||
{t(`managedNe.hop.badge.${row.hop_vendor === "linux" ? "linux" : "zte"}`)}
|
||||
</span>
|
||||
) : null}
|
||||
</td>
|
||||
|
|
@ -597,7 +604,12 @@ export function NePage() {
|
|||
setForm((prev) => ({
|
||||
...prev,
|
||||
hop_enabled,
|
||||
...(hop_enabled ? applyHopTemplate(prev, prev.hop_protocol, prev.hop_vrf, true) : {}),
|
||||
...(hop_enabled
|
||||
? {
|
||||
...patchHopVendorChange(prev.hop_vendor, prev),
|
||||
...applyHopTemplate(prev, prev.hop_protocol, prev.hop_vrf, true),
|
||||
}
|
||||
: {}),
|
||||
}));
|
||||
}}
|
||||
/>
|
||||
|
|
@ -606,6 +618,7 @@ export function NePage() {
|
|||
{form.hop_enabled ? (
|
||||
<HopProxyFields
|
||||
value={{
|
||||
hop_vendor: form.hop_vendor,
|
||||
hop_host: form.hop_host,
|
||||
hop_port: form.hop_port,
|
||||
hop_protocol: form.hop_protocol,
|
||||
|
|
|
|||
26
web/src/utils/hopProxy.ts
Normal file
26
web/src/utils/hopProxy.ts
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
import { isAutoHopTemplate, zteHopTemplate } from "./zteHop";
|
||||
|
||||
export type HopVendor = "zte" | "linux";
|
||||
|
||||
export const HOP_VENDORS: HopVendor[] = ["zte", "linux"];
|
||||
|
||||
export function isLinuxHopVendor(vendor: string): boolean {
|
||||
return String(vendor || "").toLowerCase() === "linux";
|
||||
}
|
||||
|
||||
export function patchHopVendorChange(
|
||||
vendor: HopVendor,
|
||||
prev: { hop_protocol: string; hop_vrf: string; hop_command_template: string },
|
||||
): { hop_vendor: HopVendor; hop_protocol: string; hop_vrf: string; hop_command_template: string } {
|
||||
if (vendor === "linux") {
|
||||
return { hop_vendor: "linux", hop_protocol: "ssh", hop_vrf: "", hop_command_template: "" };
|
||||
}
|
||||
return {
|
||||
hop_vendor: "zte",
|
||||
hop_protocol: prev.hop_protocol || "ssh",
|
||||
hop_vrf: prev.hop_vrf,
|
||||
hop_command_template: zteHopTemplate(prev.hop_protocol || "ssh", prev.hop_vrf),
|
||||
};
|
||||
}
|
||||
|
||||
export { isAutoHopTemplate, zteHopTemplate };
|
||||
Loading…
Add table
Add a link
Reference in a new issue