mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-09-24 15:49:09 +00:00
904af93a1d
* fix(credentials): stop double-encrypting undecryptable safeStorage blobs When local decrypt failed (e.g. OSCrypt key churn after reboot), encrypt used to wrap the leftover enc:v1 ciphertext again, permanently poisoning the vault. Startup sync could also push those placeholders to cloud and make download restore the same poison. - Keep real enc:v1 blobs unchanged on encrypt (header check, no wrap) - Strip device-bound placeholders when applying portable sync payloads - Guard startup local-wins / merge round-trips before upload - Skip vault init re-encrypt writes when secrets are still undecrypted Fixes #2702 Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(sync): strip enc:v1 secrets from smart-merge uploads Bugbot found that after local apply sanitized placeholders, legacy v1 smart-merge could still decrypt an unstripped remote, merge it, and re-upload the poison. Strip device-bound credentials on remote decrypt and again on the merged payload before upload. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(credentials): address Codex P2 review on #2702 - Always re-encrypt vault init batches so plaintext siblings are not left unprotected when one record is a stale enc:v1 placeholder - Sanitize device-bound secrets before convergent restore prepare so CRDT replica commit matches vault import - Require a complete safeStorage blob (header + min 31 bytes) before treating enc:v1 as ciphertext; encrypt header-only coincidences Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(credentials): address Codex P1 review on #2702 - Decode enc:v1 payloads with atob in the renderer-safe domain helper - Heal poisoned remote secrets from local/base before smart-merge so good credentials are not discarded as remote-only deletions - Keep post-merge strip so leftover enc:v1 never uploads Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(credentials): address Codex P1 CBC min and startup heal - Accept 19-byte v10/v11 CBC OSCrypt blobs (not only 31-byte GCM) - Heal poisoned remote secrets before startup smart-merge - Strip unresolved placeholders on merge round-trip upload Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(sync): sanitize payloads at every apply/commit boundary Codex P1: vault apply stripped enc:v1 while commitRemoteInspection and convergent materialization could keep the poison. Sanitize merged/remote payloads before apply+base commit, strip on CRDT materialization, and sanitize convergent apply inputs. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(sync): heal local and remote secrets before smart-merge Smart-merge could select a locally-changed entity whose only secret delta was enc:v1 poison, then strip and upload empty secrets. Heal both sides from the opposite payload/base before merge on all sync paths. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(sync): keep enc:v1 intact during convergent materialize Stripping device-bound secrets inside materializeSyncPayloadFromConvergentState broke envelope validation for poisoned-but-consistent v2 snapshots, so decrypt could not hydrate the clouds #2702 needs to recover. Portable stripping stays at apply/upload boundaries. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(credentials): detect Windows DPAPI by decoded header bytes Real DPAPI blobs start with 01 00 00 00 d0 8c... and base64-encode as AQAAANCM..., so the previous AQAAAA string prefix rejected them and allowed double-wrapping after key rotation. Match decoded headers in both the main-process bridge and renderer predicate. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * test(credentials): use complete enc:v1 fixtures for stricter detector Short placeholders like enc:v1:djEwAAAA no longer pass the platform header + minimum-size checks. Update auth/SFTP/proxy/sync fixtures to full v10-shaped blobs so npm test matches production validation. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(sync): treat preferred credential deletions as authoritative When healing enc:v1 before merge, an empty/missing secret on a present preferred entity is an intentional clear and must not be revived from base. Only fall back to base when preferred is absent or also poisoned. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(credentials): reject impossible v10/v11 ciphertext lengths Accept only CBC-aligned sizes (19+16n) or GCM-sized blobs (>=31) so coincidental enc:v1 plaintext of intermediate length is encrypted instead of treated as an undecryptable placeholder. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(credentials): require full DPAPI provider GUID signature Accept Windows safeStorage blobs only when they start with version 01 00 00 00 plus provider GUID df9d8cd0-1501-11d1-8c7a-00c04fc297eb, so coincidental 01 00 00 00 prefixes are not treated as ciphertext. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
226 lines
6.0 KiB
TypeScript
226 lines
6.0 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import React from "react";
|
|
import { renderToStaticMarkup } from "react-dom/server";
|
|
|
|
import { I18nProvider } from "../application/i18n/I18nProvider.tsx";
|
|
import { isValidProxyPort } from "../domain/proxyProfiles.ts";
|
|
import { STORAGE_KEY_VAULT_PROXY_PROFILES_VIEW_MODE } from "../infrastructure/config/storageKeys.ts";
|
|
import type { Identity, ProxyProfile } from "../types.ts";
|
|
import { prepareProxyProfileForSave, ProxyProfilesManager } from "./ProxyProfilesManager.tsx";
|
|
|
|
const proxyProfile: ProxyProfile = {
|
|
id: "proxy-1",
|
|
label: "Office Proxy",
|
|
config: {
|
|
type: "http",
|
|
host: "127.0.0.1",
|
|
port: 8080,
|
|
},
|
|
createdAt: 1,
|
|
};
|
|
|
|
const proxyIdentity: Identity = {
|
|
id: "identity-1",
|
|
label: "Proxy login",
|
|
username: "proxy-user",
|
|
authMethod: "password",
|
|
password: "proxy-secret",
|
|
created: 1,
|
|
};
|
|
|
|
const installStorageStub = (viewMode: string | null = null) => {
|
|
const values = new Map<string, string>();
|
|
if (viewMode) {
|
|
values.set(STORAGE_KEY_VAULT_PROXY_PROFILES_VIEW_MODE, viewMode);
|
|
}
|
|
|
|
Object.defineProperty(globalThis, "localStorage", {
|
|
configurable: true,
|
|
value: {
|
|
getItem: (key: string) => values.get(key) ?? null,
|
|
setItem: (key: string, value: string) => {
|
|
values.set(key, value);
|
|
},
|
|
removeItem: (key: string) => {
|
|
values.delete(key);
|
|
},
|
|
},
|
|
});
|
|
};
|
|
|
|
const renderManager = (
|
|
viewMode: string | null = null,
|
|
profiles: ProxyProfile[] = [proxyProfile],
|
|
) => {
|
|
installStorageStub(viewMode);
|
|
return renderToStaticMarkup(
|
|
React.createElement(
|
|
I18nProvider,
|
|
{ locale: "en" },
|
|
React.createElement(ProxyProfilesManager, {
|
|
proxyProfiles: profiles,
|
|
hosts: [],
|
|
groupConfigs: [],
|
|
identities: [proxyIdentity],
|
|
onUpdateProxyProfiles: () => {},
|
|
onUpdateHosts: () => {},
|
|
onUpdateGroupConfigs: () => {},
|
|
}),
|
|
),
|
|
);
|
|
};
|
|
|
|
test("ProxyProfilesManager uses the shared Vault grid card style by default", () => {
|
|
const markup = renderManager();
|
|
|
|
assert.match(markup, /Add Proxy/);
|
|
assert.match(markup, /aria-label="Search proxies…"/);
|
|
assert.match(markup, /aria-label="Office Proxy, HTTP, 127\.0\.0\.1:8080, 0 linked"/);
|
|
assert.match(markup, /Office Proxy/);
|
|
assert.match(markup, /127\.0\.0\.1:8080/);
|
|
});
|
|
|
|
test("ProxyProfilesManager uses the shared Vault list row style when persisted", () => {
|
|
const markup = renderManager("list");
|
|
|
|
assert.match(markup, /aria-label="Office Proxy, HTTP, 127\.0\.0\.1:8080, 0 linked"/);
|
|
assert.match(markup, /Office Proxy/);
|
|
assert.match(markup, /127\.0\.0\.1:8080/);
|
|
});
|
|
|
|
test("ProxyProfilesManager validates proxy ports", () => {
|
|
assert.equal(isValidProxyPort(1), true);
|
|
assert.equal(isValidProxyPort(65535), true);
|
|
assert.equal(isValidProxyPort(0), false);
|
|
assert.equal(isValidProxyPort(65536), false);
|
|
assert.equal(isValidProxyPort(10.5), false);
|
|
});
|
|
|
|
test("ProxyProfilesManager hides ProxyCommand contents in profile summaries", () => {
|
|
const markup = renderManager(null, [
|
|
{
|
|
id: "proxy-command-1",
|
|
label: "Cloudflare Access",
|
|
config: {
|
|
type: "command",
|
|
host: "",
|
|
port: 0,
|
|
command: "cloudflared access ssh --hostname %h --token secret",
|
|
},
|
|
createdAt: 1,
|
|
},
|
|
]);
|
|
|
|
assert.match(markup, /aria-label="Cloudflare Access, ProxyCommand, ProxyCommand, 0 linked"/);
|
|
assert.match(markup, /Cloudflare Access/);
|
|
assert.match(markup, /ProxyCommand/);
|
|
assert.doesNotMatch(markup, /cloudflared access ssh/);
|
|
assert.doesNotMatch(markup, /secret/);
|
|
});
|
|
|
|
test("prepareProxyProfileForSave saves identity auth without stale manual credentials", () => {
|
|
const result = prepareProxyProfileForSave(
|
|
{
|
|
...proxyProfile,
|
|
label: " Office Proxy ",
|
|
config: {
|
|
type: "http",
|
|
host: " proxy.example.com ",
|
|
port: 3128,
|
|
identityId: proxyIdentity.id,
|
|
username: "stale-user",
|
|
password: "stale-secret",
|
|
},
|
|
},
|
|
[proxyIdentity],
|
|
2,
|
|
);
|
|
|
|
assert.deepEqual(result.saved?.config, {
|
|
type: "http",
|
|
host: "proxy.example.com",
|
|
port: 3128,
|
|
identityId: proxyIdentity.id,
|
|
});
|
|
assert.equal(result.saved?.label, "Office Proxy");
|
|
assert.equal(result.saved?.updatedAt, 2);
|
|
});
|
|
|
|
test("prepareProxyProfileForSave rejects missing and incomplete proxy identities", () => {
|
|
assert.equal(
|
|
prepareProxyProfileForSave(
|
|
{
|
|
...proxyProfile,
|
|
config: {
|
|
type: "http",
|
|
host: "proxy.example.com",
|
|
port: 3128,
|
|
identityId: "missing-identity",
|
|
},
|
|
},
|
|
[proxyIdentity],
|
|
).error,
|
|
"missingIdentity",
|
|
);
|
|
|
|
assert.equal(
|
|
prepareProxyProfileForSave(
|
|
{
|
|
...proxyProfile,
|
|
config: {
|
|
type: "http",
|
|
host: "proxy.example.com",
|
|
port: 3128,
|
|
identityId: proxyIdentity.id,
|
|
},
|
|
},
|
|
[{ ...proxyIdentity, password: undefined }],
|
|
).error,
|
|
"incompleteIdentity",
|
|
);
|
|
});
|
|
|
|
test("prepareProxyProfileForSave rejects unreadable proxy identity passwords", () => {
|
|
assert.equal(
|
|
prepareProxyProfileForSave(
|
|
{
|
|
...proxyProfile,
|
|
config: {
|
|
type: "http",
|
|
host: "proxy.example.com",
|
|
port: 3128,
|
|
identityId: proxyIdentity.id,
|
|
},
|
|
},
|
|
[{ ...proxyIdentity, password: "enc:v1:djEwdGVzdAAAAAAAAAAAAAAAAA==" }],
|
|
).error,
|
|
"unreadableIdentity",
|
|
);
|
|
});
|
|
|
|
test("prepareProxyProfileForSave strips stale ProxyCommand data from HTTP/SOCKS profiles", () => {
|
|
const result = prepareProxyProfileForSave(
|
|
{
|
|
...proxyProfile,
|
|
config: {
|
|
type: "socks5",
|
|
host: "proxy.example.com",
|
|
port: 1080,
|
|
command: "cloudflared access ssh --hostname %h --token secret",
|
|
username: "proxy-user",
|
|
password: "proxy-secret",
|
|
},
|
|
},
|
|
[],
|
|
);
|
|
|
|
assert.deepEqual(result.saved?.config, {
|
|
type: "socks5",
|
|
host: "proxy.example.com",
|
|
port: 1080,
|
|
username: "proxy-user",
|
|
password: "proxy-secret",
|
|
});
|
|
});
|