mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 12:01:13 +00:00
* feat(ssh): restore FIDO2 security key support (#2308) Consolidate the restored feature and its review fixes before rebasing onto current main. Original PR head: 5d0a0c6c9a550364d3ec5c2331395cedfc9ea7ae. * fix(ssh): verify and repair FIDO authentication with simulated hardware Preserve complete OpenSSH SK signature payloads, classify combined PIN/presence prompts correctly, expand IdentityFile tokens, retain certificate selectors, and route shared-agent signing prompts to their originating window. Dismiss prompts when notification helpers exit. Add a software SK provider and opt-in real OpenSSH integration coverage for both algorithms, certificates, SFTP, forwarding, and concurrent windows. * refactor(ui): refine security key forms and authentication motion Use shared Select and Switch controls, concise localized copy and compact token-based dialogs. Add scoped enter/exit, field transition and presence animations with reduced-motion support. Preserve raw prompt details and visible PIN errors. * fix(ssh): align security key prompts with hardware presence and verify Docker logins * fix(ui): keep security key dialog above its remounted overlay * fix: address Codex review on PR #2823 * feat(ssh): guide security key recovery and explicit authentication fallback * test(ssh): exercise security key authentication on native Windows * test(ssh): verify Windows fixture signatures and explicit fallback * test(ssh): configure Windows OpenSSH toolchain and document coverage --------- Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
62 lines
2.4 KiB
TypeScript
62 lines
2.4 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import { readFileSync } from "node:fs";
|
|
import { join } from "node:path";
|
|
|
|
import { SK_ECDSA_NISTP256, SK_SSH_ED25519 } from "../../domain/fidoSsh.ts";
|
|
import { detectKeyType, resolveImportedKeyType } from "./utils.ts";
|
|
|
|
/** Real OpenSSH shape: algorithm only after base64 decode. */
|
|
function makeSkPrivatePem(algo: string): string {
|
|
const body = Buffer.from(
|
|
`openssh-key-v1\0\0\0\0\0none\0\0\0\0\0\0\0\0\0\x01${algo}`,
|
|
).toString("base64");
|
|
const pem = `-----BEGIN OPENSSH PRIVATE KEY-----\n${body}\n-----END OPENSSH PRIVATE KEY-----\n`;
|
|
assert.equal(pem.includes("@openssh.com"), false);
|
|
return pem;
|
|
}
|
|
|
|
test("resolveImportedKeyType prefers FIDO detection over seeded ED25519 draft", () => {
|
|
const pem = makeSkPrivatePem(SK_SSH_ED25519);
|
|
// Simulate openImport seed + paste import (handleImport path).
|
|
const seededDraftType = "ED25519" as const;
|
|
const detected = resolveImportedKeyType({ privateKey: pem });
|
|
assert.equal(detected, "ED25519-SK");
|
|
// Product rule: material wins; never keep seeded ED25519 when SK is detected.
|
|
const savedType = detected; // same as fixed handleImport
|
|
assert.notEqual(savedType, seededDraftType);
|
|
assert.equal(savedType, "ED25519-SK");
|
|
});
|
|
|
|
test("resolveImportedKeyType distinguishes ECDSA-SK from base64-only PEM", () => {
|
|
assert.equal(
|
|
resolveImportedKeyType({ privateKey: makeSkPrivatePem(SK_ECDSA_NISTP256) }),
|
|
"ECDSA-SK",
|
|
);
|
|
});
|
|
|
|
test("detectKeyType uses the same material path for file drop", () => {
|
|
assert.equal(detectKeyType(makeSkPrivatePem(SK_SSH_ED25519)), "ED25519-SK");
|
|
assert.equal(detectKeyType("-----BEGIN RSA PRIVATE KEY-----\nMII\n-----END RSA PRIVATE KEY-----"), "RSA");
|
|
});
|
|
|
|
test("resolveImportedKeyType keeps soft keys", () => {
|
|
assert.equal(
|
|
resolveImportedKeyType({
|
|
privateKey: "-----BEGIN OPENSSH PRIVATE KEY-----\nAAAA\n-----END OPENSSH PRIVATE KEY-----",
|
|
}),
|
|
"ED25519",
|
|
);
|
|
});
|
|
|
|
test("KeychainManager handleImport uses material type not seeded draft type", () => {
|
|
const source = readFileSync(join(import.meta.dirname, "../KeychainManager.tsx"), "utf8");
|
|
// Must resolve from material; must not keep draftKey.type first (openImport seeds ED25519).
|
|
assert.match(source, /detectSshKeyType/);
|
|
assert.doesNotMatch(
|
|
source,
|
|
/type:\s*\(draftKey\.type as KeyType\)\s*\|\|\s*detectedType/,
|
|
);
|
|
assert.match(source, /type:\s*detected.type/);
|
|
});
|