mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-20 23:20:46 +00:00
* fix: dial SFTP separately on network-device SSH sessions Huawei and Ruijie switches drop the shell when SFTP opens on the terminal TCP session. Use the existing dedicated login for network-device mode and network-vendor banners without marking those hosts single-channel bastions. Fixes #3631 Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: block follow-cwd probes on dedicated SFTP logins Network-device mode and vendor SSH banners already dial SFTP separately, but follow-terminal-cwd still opened an exec channel on the terminal transport. Gate that probe with the same dedicated-login decision. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: skip terminal pwd exec for network-vendor banners when opening SFTP Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
150 lines
5.6 KiB
TypeScript
150 lines
5.6 KiB
TypeScript
import assert from "node:assert/strict";
|
|
import { readFileSync } from "node:fs";
|
|
import test from "node:test";
|
|
import { remoteSoftwareRequiresSingleChannel } from "../../domain/singleChannelSshBanner.shared.mjs";
|
|
import { sftpRequiresDedicatedLogin } from "../../domain/sftpDedicatedLogin";
|
|
|
|
const sidePanelSource = readFileSync(new URL("../SftpSidePanel.tsx", import.meta.url), "utf8");
|
|
const slotSource = readFileSync(
|
|
new URL("../terminalLayer/terminalLayerSidePanelSlots.tsx", import.meta.url),
|
|
"utf8",
|
|
);
|
|
|
|
test("locate-path write skips sessions waiting on sensitive/password prompts", () => {
|
|
assert.match(
|
|
sidePanelSource,
|
|
/isTerminalSensitiveInputActive\(action\.sessionId\)[\s\S]*?writeToSession\(action\.sessionId, action\.data/,
|
|
);
|
|
assert.match(
|
|
sidePanelSource,
|
|
/if \(isTerminalSensitiveInputActive\(action\.sessionId\)\) return;/,
|
|
);
|
|
});
|
|
|
|
test("locate-path write requires an idle shell prompt before PTY injection", () => {
|
|
assert.match(
|
|
sidePanelSource,
|
|
/isTerminalReadyForCommandInjection\(action\.sessionId\)[\s\S]*?writeToSession\(action\.sessionId, action\.data/,
|
|
);
|
|
assert.match(
|
|
sidePanelSource,
|
|
/if \(!isTerminalReadyForCommandInjection\(action\.sessionId\)\) return;/,
|
|
);
|
|
});
|
|
|
|
test("locate-path uses the confirmed toolbar path rather than an optimistic navigate target", () => {
|
|
assert.match(sidePanelSource, /getNextSftpToolbarDisplayPath\(/);
|
|
assert.match(
|
|
sidePanelSource,
|
|
/path: confirmedLocatePathRef\.current \|\| connection\?\.currentPath/,
|
|
);
|
|
});
|
|
|
|
test("locate-path uses focused session fallback when SFTP cannot reuse the terminal", () => {
|
|
assert.match(sidePanelSource, /resolveLocateSftpPathSessionId\(\{\s*activeSessionId,\s*focusedSessionId,/);
|
|
assert.match(
|
|
slotSource,
|
|
/focusedSessionId=\{panelFocusedSessionId\}/,
|
|
);
|
|
});
|
|
|
|
test("single-channel SFTP opens a dedicated connection instead of the terminal channel", () => {
|
|
assert.match(
|
|
sidePanelSource,
|
|
/const dedicatedSftpLogin = sftpRequiresDedicatedLogin\(\{\s*host: activeHost,\s*remoteSshVersion: sftpBannerDecision\?\.sessionId === activeSessionId\s*\? sftpBannerDecision\.remoteSshVersion\s*: undefined,\s*\}\);/,
|
|
);
|
|
assert.doesNotMatch(sidePanelSource, /activeHost\.singleChannelSsh/);
|
|
assert.doesNotMatch(sidePanelSource, /sftpBannerDecision\.singleChannel/);
|
|
assert.match(sidePanelSource, /reuseTransport: false/);
|
|
assert.match(
|
|
sidePanelSource,
|
|
/const reuseTerminalTransport = !dedicatedSftpLogin &&/,
|
|
);
|
|
assert.match(
|
|
sidePanelSource,
|
|
/sourceSessionId: reuseTerminalTransport/,
|
|
);
|
|
});
|
|
|
|
test("network-device mode and network-vendor banners force dedicated SFTP", () => {
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({ host: { deviceType: "network" }, remoteSshVersion: "OpenSSH_9.6" }),
|
|
true,
|
|
);
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({ host: { deviceType: "network" } }),
|
|
true,
|
|
);
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({ host: { deviceType: "general" }, remoteSshVersion: "-" }),
|
|
true,
|
|
);
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({ host: { deviceType: "general" }, remoteSshVersion: "SSH-2.0--" }),
|
|
true,
|
|
);
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({ host: { deviceType: "general" }, remoteSshVersion: "SSH-2.0-RGOS_SSH" }),
|
|
true,
|
|
);
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({ host: { deviceType: "general" }, remoteSshVersion: "OpenSSH_9.6" }),
|
|
false,
|
|
);
|
|
assert.equal(remoteSoftwareRequiresSingleChannel("-"), false);
|
|
assert.equal(remoteSoftwareRequiresSingleChannel("SSH-2.0--"), false);
|
|
});
|
|
|
|
test("vendor banners block follow-terminal-cwd the same way bastions do", () => {
|
|
assert.match(
|
|
sidePanelSource,
|
|
/bannerRequiresSingleChannel=\{sftpRequiresDedicatedLogin\(\{\s*host: activeHost,\s*remoteSshVersion: sftpBannerDecision\?\.sessionId === activeSessionId\s*\? sftpBannerDecision\.remoteSshVersion\s*: undefined,\s*\}\)\}/,
|
|
);
|
|
assert.doesNotMatch(sidePanelSource, /remoteSoftwareRequiresSingleChannel/);
|
|
for (const remoteSshVersion of ["-", "SSH-2.0--", "BHostSSH_7.0"]) {
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({
|
|
host: { deviceType: "general" },
|
|
remoteSshVersion,
|
|
}),
|
|
true,
|
|
remoteSshVersion,
|
|
);
|
|
}
|
|
assert.equal(
|
|
sftpRequiresDedicatedLogin({
|
|
host: { deviceType: "network" },
|
|
remoteSshVersion: "OpenSSH_9.6",
|
|
}),
|
|
true,
|
|
);
|
|
});
|
|
|
|
test("opening SFTP skips the terminal pwd exec for network-vendor banners", () => {
|
|
const terminalSource = readFileSync(new URL("../Terminal.tsx", import.meta.url), "utf8");
|
|
const layerSource = readFileSync(new URL("../TerminalLayer.tsx", import.meta.url), "utf8");
|
|
|
|
const assertBannerPwdGuard = (source: string, fnName: string) => {
|
|
const start = source.indexOf(`const ${fnName} = useCallback`);
|
|
assert.ok(start >= 0, fnName);
|
|
const body = source.slice(start, start + 1600);
|
|
assert.match(body, /let skipBackendPwd = hostRestrictsExtraSshChannels\(host\);/);
|
|
assert.match(body, /getSessionRemoteInfo\?\./);
|
|
assert.match(body, /skipBackendPwd = !shouldProbeSessionCwd\(\{/);
|
|
assert.match(body, /classifyDistroId\(host\.distro\) === 'network-device'/);
|
|
assert.match(body, /remoteSshVersion: info\?\.remoteSshVersion/);
|
|
assert.match(body, /getSessionPwd: skipBackendPwd/);
|
|
};
|
|
|
|
assertBannerPwdGuard(terminalSource, "resolveSftpInitialPath");
|
|
assertBannerPwdGuard(layerSource, "getTerminalCwd");
|
|
assert.match(
|
|
terminalSource,
|
|
/import \{ classifyDistroId, hostRestrictsExtraSshChannels, shouldProbeSessionCwd \} from "\.\.\/domain\/host";/,
|
|
);
|
|
assert.match(
|
|
layerSource,
|
|
/import \{ classifyDistroId, hostRestrictsExtraSshChannels, shouldProbeSessionCwd \} from '\.\.\/domain\/host';/,
|
|
);
|
|
});
|