mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-20 07:04:53 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fd82eec223 |
No files matched your search
@@ -73,6 +73,12 @@ function normalizePassword(password) {
|
||||
return typeof password === "string" ? password : "";
|
||||
}
|
||||
|
||||
// A lone Enter wakes silent serial consoles. It is not a takeover until the
|
||||
// detector has already sent a username or password.
|
||||
function isWakeOnlyNewline(data) {
|
||||
return data === "\r" || data === "\n" || data === "\r\n";
|
||||
}
|
||||
|
||||
function createTelnetAutoLogin(options = {}) {
|
||||
const username = normalizeUsername(options.username);
|
||||
const password = normalizePassword(options.password);
|
||||
@@ -207,7 +213,10 @@ function createTelnetAutoLogin(options = {}) {
|
||||
notifyIncomplete();
|
||||
}
|
||||
},
|
||||
handleUserInput() {
|
||||
handleUserInput(data) {
|
||||
if (!sentUsername && !sentPassword && isWakeOnlyNewline(data)) {
|
||||
return;
|
||||
}
|
||||
disabled = true;
|
||||
clearExpiryTimer();
|
||||
notifyUserInput();
|
||||
|
||||
@@ -505,3 +505,67 @@ test("telnet auto-login keeps observing login prompts that arrive after expiry",
|
||||
assert.equal(incomplete, 1);
|
||||
assert.deepEqual(writes, []);
|
||||
});
|
||||
|
||||
test("telnet auto-login ignores a wake-only newline before any credentials are sent", () => {
|
||||
const writes = [];
|
||||
let cancelCount = 0;
|
||||
const autoLogin = createTelnetAutoLogin({
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
write: (data) => writes.push(data),
|
||||
onUserInput: () => { cancelCount += 1; },
|
||||
});
|
||||
|
||||
// Silent serial consoles need an Enter to reveal login:. That nudge is not
|
||||
// a takeover while the detector has not yet answered a prompt.
|
||||
autoLogin.handleUserInput("\r");
|
||||
autoLogin.handleUserInput("\n");
|
||||
autoLogin.handleUserInput("\r\n");
|
||||
autoLogin.handleText("login: ");
|
||||
autoLogin.handleText("\r\nPassword: ");
|
||||
|
||||
assert.equal(cancelCount, 0);
|
||||
assert.deepEqual(writes, ["admin\r", "secret\r"]);
|
||||
});
|
||||
|
||||
test("telnet auto-login still disables on real interactive input", () => {
|
||||
for (const data of ["a", "\x03", "admin\r"]) {
|
||||
const writes = [];
|
||||
let cancelCount = 0;
|
||||
const autoLogin = createTelnetAutoLogin({
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
write: (chunk) => writes.push(chunk),
|
||||
onUserInput: () => { cancelCount += 1; },
|
||||
});
|
||||
|
||||
autoLogin.handleUserInput(data);
|
||||
autoLogin.handleUserInput(data);
|
||||
autoLogin.handleText("login: ");
|
||||
autoLogin.handleText("\r\nPassword: ");
|
||||
|
||||
assert.equal(cancelCount, 1, `expected takeover for ${JSON.stringify(data)}`);
|
||||
assert.deepEqual(writes, []);
|
||||
}
|
||||
});
|
||||
|
||||
test("telnet auto-login treats Enter as takeover after credentials were sent", () => {
|
||||
const writes = [];
|
||||
let cancelCount = 0;
|
||||
const autoLogin = createTelnetAutoLogin({
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
write: (data) => writes.push(data),
|
||||
onUserInput: () => { cancelCount += 1; },
|
||||
});
|
||||
|
||||
autoLogin.handleText("login: ");
|
||||
assert.deepEqual(writes, ["admin\r"]);
|
||||
|
||||
autoLogin.handleUserInput("\r");
|
||||
autoLogin.handleUserInput("\n");
|
||||
autoLogin.handleText("\r\nPassword: ");
|
||||
|
||||
assert.equal(cancelCount, 1);
|
||||
assert.deepEqual(writes, ["admin\r"]);
|
||||
});
|
||||
@@ -1714,7 +1714,7 @@ function writeToSessionNow(payload, data, logRewrite = payload.logRewrite) {
|
||||
&& !payload.automated
|
||||
&& !isTerminalReportSequence(data)
|
||||
) {
|
||||
session.autoLogin?.handleUserInput();
|
||||
session.autoLogin?.handleUserInput(data);
|
||||
}
|
||||
|
||||
// Encode keystrokes with the SAME charset the output path decodes with so
|
||||
@@ -1843,7 +1843,7 @@ function writeToSessionWithInterception(
|
||||
&& !payload.automated
|
||||
&& !isTerminalReportSequence(data)
|
||||
) {
|
||||
expectedSession.autoLogin?.handleUserInput();
|
||||
expectedSession.autoLogin?.handleUserInput(data);
|
||||
}
|
||||
const writeIfCurrent = (nextData) => {
|
||||
const current = sessions.get(payload.sessionId);
|
||||
|
||||
@@ -1,6 +1,36 @@
|
||||
const test = require("node:test");
|
||||
const assert = require("node:assert/strict");
|
||||
const terminalBridge = require("./terminalBridge.cjs");
|
||||
const { createTelnetAutoLogin } = require("./telnetAutoLogin.cjs");
|
||||
|
||||
function serialSessionWithAutoLogin() {
|
||||
const portWrites = [];
|
||||
const credentialWrites = [];
|
||||
let cancelCount = 0;
|
||||
const session = {
|
||||
type: "serial",
|
||||
protocol: "serial",
|
||||
encoding: "utf-8",
|
||||
serialPort: {
|
||||
write(data) {
|
||||
portWrites.push(Buffer.isBuffer(data) ? data.toString("utf8") : String(data));
|
||||
return true;
|
||||
},
|
||||
},
|
||||
};
|
||||
session.autoLogin = createTelnetAutoLogin({
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
write: (data) => credentialWrites.push(data),
|
||||
onUserInput: () => { cancelCount += 1; },
|
||||
});
|
||||
return {
|
||||
session,
|
||||
portWrites,
|
||||
credentialWrites,
|
||||
cancelCount: () => cancelCount,
|
||||
};
|
||||
}
|
||||
|
||||
test("serial auto-login cancels on interactive user input but not automated writes", () => {
|
||||
let userInputs = 0;
|
||||
@@ -121,3 +151,92 @@ test("serial auto-login cancels at input ingress before a slow interceptor resol
|
||||
terminalBridge.cleanupAllSessions();
|
||||
}
|
||||
});
|
||||
|
||||
test("serial wake Enter does not cancel auto-login at interceptor ingress", async () => {
|
||||
const { session, credentialWrites, cancelCount } = serialSessionWithAutoLogin();
|
||||
let intercepted = "";
|
||||
terminalBridge.init({
|
||||
sessions: new Map([["s", session]]),
|
||||
electronModule: {},
|
||||
terminalDataPipeline: {
|
||||
has: () => true,
|
||||
interceptInput: async (_sessionId, data) => {
|
||||
await new Promise((resolve) => setTimeout(resolve, 20));
|
||||
intercepted = data;
|
||||
return data;
|
||||
},
|
||||
},
|
||||
});
|
||||
try {
|
||||
terminalBridge.writeToSession({}, { sessionId: "s", data: "\r" });
|
||||
// The ingress check runs before the interceptor. A wake Enter must leave
|
||||
// the detector armed for a prompt that arrives during that wait.
|
||||
assert.equal(cancelCount(), 0);
|
||||
await new Promise((resolve) => setTimeout(resolve, 40));
|
||||
assert.equal(intercepted, "\r");
|
||||
assert.equal(cancelCount(), 0);
|
||||
session.autoLogin.handleText("login: ");
|
||||
session.autoLogin.handleText("\r\nPassword: ");
|
||||
assert.deepEqual(credentialWrites, ["admin\r", "secret\r"]);
|
||||
} finally {
|
||||
terminalBridge.cleanupAllSessions();
|
||||
}
|
||||
});
|
||||
|
||||
test("serial wake Enter does not cancel auto-login before credentials are sent", () => {
|
||||
const { session, portWrites, credentialWrites, cancelCount } = serialSessionWithAutoLogin();
|
||||
terminalBridge.init({ sessions: new Map([["s", session]]), electronModule: {} });
|
||||
try {
|
||||
terminalBridge.writeToSession({}, { sessionId: "s", data: "\r" });
|
||||
session.autoLogin.handleText("login: ");
|
||||
session.autoLogin.handleText("\r\nPassword: ");
|
||||
|
||||
assert.equal(cancelCount(), 0);
|
||||
assert.deepEqual(portWrites, ["\r"]);
|
||||
assert.deepEqual(credentialWrites, ["admin\r", "secret\r"]);
|
||||
} finally {
|
||||
terminalBridge.cleanupAllSessions();
|
||||
}
|
||||
});
|
||||
|
||||
test("serial interactive input and line-mode notification still cancel auto-login", () => {
|
||||
const typed = serialSessionWithAutoLogin();
|
||||
terminalBridge.init({ sessions: new Map([["typed", typed.session]]), electronModule: {} });
|
||||
try {
|
||||
terminalBridge.writeToSession({}, { sessionId: "typed", data: "a" });
|
||||
typed.session.autoLogin.handleText("login: ");
|
||||
typed.session.autoLogin.handleText("\r\nPassword: ");
|
||||
assert.equal(typed.cancelCount(), 1);
|
||||
assert.deepEqual(typed.credentialWrites, []);
|
||||
} finally {
|
||||
terminalBridge.cleanupAllSessions();
|
||||
}
|
||||
|
||||
const notified = serialSessionWithAutoLogin();
|
||||
terminalBridge.init({ sessions: new Map([["notified", notified.session]]), electronModule: {} });
|
||||
try {
|
||||
terminalBridge.notifySessionUserInput({}, { sessionId: "notified" });
|
||||
notified.session.autoLogin.handleText("login: ");
|
||||
assert.equal(notified.cancelCount(), 1);
|
||||
assert.deepEqual(notified.credentialWrites, []);
|
||||
} finally {
|
||||
terminalBridge.cleanupAllSessions();
|
||||
}
|
||||
});
|
||||
|
||||
test("serial Enter after credentials were sent still cancels auto-login", () => {
|
||||
const { session, credentialWrites, cancelCount } = serialSessionWithAutoLogin();
|
||||
terminalBridge.init({ sessions: new Map([["s", session]]), electronModule: {} });
|
||||
try {
|
||||
session.autoLogin.handleText("login: ");
|
||||
assert.deepEqual(credentialWrites, ["admin\r"]);
|
||||
|
||||
terminalBridge.writeToSession({}, { sessionId: "s", data: "\r" });
|
||||
session.autoLogin.handleText("\r\nPassword: ");
|
||||
|
||||
assert.equal(cancelCount(), 1);
|
||||
assert.deepEqual(credentialWrites, ["admin\r"]);
|
||||
} finally {
|
||||
terminalBridge.cleanupAllSessions();
|
||||
}
|
||||
});
|
||||
Reference in new issue
Block a user