mirror of
https://github.com/stablyai/orca.git
synced 2026-11-02 10:08:13 +00:00
* fix(windows): restrict secure files in-process instead of spawning icacls Every secure write on Windows spawned icacls.exe five times on the calling thread (the Electron main thread for most stores): verify, /reset, /inheritance:r /grant:r, verify, verify. Process creation under endpoint security costs ~0.6 s each, so each write froze the UI for seconds (#26027). The /reset + /inheritance:r pair is also what behavioural EDR scores as ransomware tradecraft (#25583). Add native/windows-security (@orca/windows-security): a small N-API addon over advapi32 that reads and writes DACLs in-process. It exposes the token user SID, a DACL read as SDDL, a DACL write (sync and on the thread pool), a create-with-DACL file write, and an additive grant. Policy and verification stay in TypeScript. - writeSecureFile creates each temp file already carrying the protected user/SYSTEM/Administrators DACL (CreateFileW + SECURITY_ATTRIBUTES), reads it back once, and renames it. No ACL is modified on the write path and no process starts. Before: 5-7 spawns, 94-138 ms per write. After: 0 spawns, ~0.5 ms. - A secure directory is verified once per process. It is rewritten only when verification fails, on the thread pool, because the write walks every descendant (~2 s on a 29k-entry userData). - The verifier follows OpenSSH's rule: only the user, SYSTEM and Administrators may be granted anything, and the path must be protected (or, for a file, inherit from a secure parent). DACLs written by the icacls-era hardening pass unchanged, so there is no migration. - If the addon cannot load, the write still happens and reports unrestricted, logged once. There is no icacls or PowerShell fallback. - grantDirAcl, the startup userData grant, and the install-dir probe and package repair use the same addon, so whoami.exe and icacls.exe are no longer spawned anywhere at runtime. - orcad's Windows slots ship the addon beside their bundles (built per arch, PE-machine checked). Its data-root privacy check fails closed, so without the addon a Windows orcad would not start. Fixes #26027 Fixes #25583 * refactor(secure-file): harden existing Windows files through the sync lane The read path called restrictWindowsPathSync directly and recorded success itself; the existing sync lane already does both. One call site fewer. * refactor(windows-security): one load, one rule, no fallthrough (review #28135) - The descriptor parser is anchored, so a conditional ACE (its body holds parentheses) or anything else it cannot read fails closed instead of verifying the ACEs before it. - findSecureDaclViolation is one flat rule: protected, allow rules only for the user, SYSTEM and Administrators (OpenSSH's ACE rule), and full control for the user. The inherits-from-a-secure-parent exception is gone: it accepted exactly what loosening the parent reaches. - The addon and the user SID load once, behind one wrapper that adds the extended-length prefix to every path and runs async DACL writes to one path in order, so a startup grant cannot land after a re-lock and restore the broader DACL. - With the addon loaded, a failed born-restricted create throws with the matching Node error code instead of falling back to a plain write. - A grant leaves a NULL DACL untouched instead of turning 'everyone' into 'only this SID'. WriteFile runs once and fails on a short write. - The artifact create-intent store writes through writeSecureFile and drops its own temp writer, directory LRU and synchronous directory re-lock. - Test seams the global fake makes redundant are gone. * fix(packaging): fail a Windows build whose workspace addon binary is missing or foreign-arch The @orca/windows-* workspace links exist on every host, so their presence proved nothing: a missing or wrong-architecture .node only surfaced at runtime, as unrestricted secure files or an orcad that refuses to start. beforePack now reads each addon's PE machine against the target arch. * refactor(windows-security): prune what the native ACL left dead (review #28135) - Sync-spawn ratchet: hardenSecurePath and the sync-flag exemption it alone used are gone, and the advice and baseline header no longer say secure writers run icacls. - The install-dir probe reads ACEs through parseSddlDacl, so an ACE it cannot parse fails the whole reading closed instead of being skipped; AC is a resolved alias there now. - The packaging check reads the addon binary through node_modules, the copy that ships. - No winCode-to-errno table: nothing reads .code off a failed secure write. - The load memo is not mutated; secure-path keeps its own log-once flag. - grantInstallDirPackageAcl is a plain function, and secure-file restricts a Windows directory and a POSIX path directly instead of through one two-platform helper. * fix(windows-security): resolve LA in real-ACL tests; tear a file whose close fails - The GitHub Windows runner is the built-in Administrator (RID 500), whose SID reads back as LA. Production already resolves it through localDomainSidOf; the win32 test helpers parsed without it. One shared readDaclOf resolves aliases for every real-ACL suite, and the verifier's unit test covers an LA-aliased directory and LA as a stranger. - createFileWithDacl treats a failed CloseHandle like a failed write (lost data on a network volume) and deletes the torn file. - Drop a duplicate test reset and a typo. * fix(windows-security): load only from inside the app; read DACLs as structure (review #28135) - Loader: orcad's staged binary first, then the workspace package only if its real path is inside the app (process.resourcesPath, or this checkout). A bare specifier otherwise walks every parent up to C:\node_modules, which any local user may create, and orcad holds credentials. - The addon reads a DACL as { protected, aces: [{ type, flags, mask, sid }] } via GetAce, with a SID only for plain allow/deny ACEs and null for a NULL DACL. findSecureDaclViolation and the install-dir probe check that structure, so conditional, callback and object ACEs fail closed. The SDDL parser, its alias table, LA/localDomainSid resolution and getDaclSddl are gone; SDDL is only the write format. - Install-dir tree pass: files flagless as before, but a directory only when its own DACL is protected (inheritably). Re-granting inheriting directories re-propagated each subtree (3.2 s for 1,093 directories). The root is no longer granted, or counted, twice. The two passes are plain functions behind a { root, tree } seam. - One namespacing (path.win32.toNamespacedPath) at the addon boundary, also the per-path ordering key; the comment states the real sync-grant invariant. - restrictWindowsDirectory(dir): Promise<boolean> replaces the callback lane; the reporter is guarded once, so the 'settle' stage is gone. - Sync-spawn ratchet: the secure writers no longer spawn or block, so they leave the gate (109 -> 61 uses). - Errors name the Win32 call and code only; a failed GetSecurityDescriptorControl fails the write instead of defaulting to unprotected. * test(secure-file): assert the durable POSIX write's outcome, not the old chmod order writeSecureFile now chmods the temp file to 0o600 before fsyncing it, so the fsync also covers the mode change and the file is owner-writable when opened. Assert what matters under umask 0o200: the write succeeds, the temp file is fsynced read-only, and the published file is exactly 0o600. * fix(windows-security): namespace paths with the host's toNamespacedPath path.win32.toNamespacedPath rewrote POSIX temp paths (/tmp/x -> \tmp\x) in the Linux runs of the Windows-logic unit tests, so the fake addon wrote to the wrong place. The addon only runs on Windows, where the host function is the win32 one; elsewhere it is the identity. The long-path assertion runs on Windows only. * test(windows-security): assert the install-dir long-path prefix on Windows only The prefix comes from the host's toNamespacedPath, which is the identity off Windows; the Linux run of this suite expected the win32 escape. * fix(windows-user-data-acl): grant the root even when its children cannot be listed (review #28135) A readdir failure on userData aborted the whole grant, so the root grant that could repair a DACL refusing the listing was never attempted. The listing failure is now recorded, the root is still granted, and the marker stays withheld so the next launch retries. * test(windows-security): wait for relock propagation, accept Entra ID SIDs (review #28135) - The large-relock test waited only for the parent to turn protected, which happens before propagation reaches the children, then read a child. It now waits on the parent and both ends of the child range. - The token-user test rejected S-1-12-1 (Entra ID) accounts, failing the suite on Entra-joined dev machines. --------- Co-authored-by: Orca Worker <orca-worker@localhost>
136 lines
5.6 KiB
TypeScript
136 lines
5.6 KiB
TypeScript
import { realpathSync } from 'node:fs'
|
|
import { createRequire } from 'node:module'
|
|
import { basename, isAbsolute, join, relative, toNamespacedPath } from 'node:path'
|
|
import type * as WindowsSecurityModule from '@orca/windows-security'
|
|
import { ORCAD_WINDOWS_SECURITY_FILENAME } from './orcad-artifacts'
|
|
|
|
export type { GrantAccessOptions, WindowsAce, WindowsDacl } from '@orca/windows-security'
|
|
export type WindowsSecurityAddon = typeof WindowsSecurityModule
|
|
|
|
/** The addon (every path namespaced, async writes ordered per path) and the token's user SID. */
|
|
export type WindowsSecurity = {
|
|
addon: Omit<WindowsSecurityAddon, 'currentUserSid'>
|
|
userSid: string
|
|
}
|
|
|
|
/** FILE_ALL_ACCESS, what SDDL prints as `FA`. */
|
|
export const WINDOWS_FILE_ALL_ACCESS = 0x1f01ff
|
|
/** FILE_GENERIC_READ | FILE_GENERIC_EXECUTE, what icacls calls `(RX)`. */
|
|
export const WINDOWS_FILE_READ_EXECUTE = 0x1200a9
|
|
|
|
const requireFromHere = createRequire(__filename)
|
|
|
|
let loaded: WindowsSecurity | { error: string } | null = null
|
|
|
|
/**
|
|
* The addon, or why it cannot load on this host. orcad ships the bare binary at its slot root,
|
|
* beside its server bundles and two levels above its CLI bundle (`out/cli/index.js`). Desktop and
|
|
* the CLI load the workspace package, but only from inside the app: a bare specifier otherwise
|
|
* walks every parent up to `C:\node_modules`, which any local user may create.
|
|
*/
|
|
export function loadWindowsSecurity(): WindowsSecurity | { error: string } {
|
|
loaded ??= loadOnce()
|
|
return loaded
|
|
}
|
|
|
|
function loadOnce(): WindowsSecurity | { error: string } {
|
|
if (process.platform !== 'win32') {
|
|
return { error: `unsupported on ${process.platform}` }
|
|
}
|
|
const failures: string[] = []
|
|
const candidates = [
|
|
() => join(__dirname, ORCAD_WINDOWS_SECURITY_FILENAME),
|
|
() => join(__dirname, '..', '..', ORCAD_WINDOWS_SECURITY_FILENAME),
|
|
() => trustedPackagePath(requireFromHere.resolve('@orca/windows-security'), appRoots())
|
|
]
|
|
for (const candidate of candidates) {
|
|
try {
|
|
// Reading the SID is also what makes the package load its deferred .node binary.
|
|
return prepare(requireFromHere(candidate()))
|
|
} catch (error) {
|
|
failures.push(error instanceof Error ? error.message : String(error))
|
|
}
|
|
}
|
|
return { error: failures.join('; ') }
|
|
}
|
|
|
|
/**
|
|
* Where the app's own node_modules live: the packaged resources directory, or this checkout
|
|
* (electron-vite puts shared code one level deeper, in `out/main/chunks`).
|
|
*/
|
|
function appRoots(): string[] {
|
|
const checkout =
|
|
basename(__dirname) === 'chunks'
|
|
? join(__dirname, '..', '..', '..')
|
|
: join(__dirname, '..', '..')
|
|
// Electron only, so not on Node's Process type; the CLI runs under Electron as Node too.
|
|
return 'resourcesPath' in process && typeof process.resourcesPath === 'string'
|
|
? [process.resourcesPath, checkout]
|
|
: [checkout]
|
|
}
|
|
|
|
/** `resolved` when its real location is inside one of `roots`; throws otherwise. */
|
|
export function trustedPackagePath(resolved: string, roots: readonly string[]): string {
|
|
const real = realpathSync(resolved)
|
|
const inside = roots.some((root) => {
|
|
const fromRoot = relative(realpathSync(root), real)
|
|
return fromRoot !== '' && !fromRoot.startsWith('..') && !isAbsolute(fromRoot)
|
|
})
|
|
if (!inside) {
|
|
throw new Error(`refusing @orca/windows-security outside the app: ${real}`)
|
|
}
|
|
return real
|
|
}
|
|
|
|
/**
|
|
* Every path is namespaced (`\\?\`) once, here: the Win32 security APIs are MAX_PATH-limited.
|
|
*
|
|
* Async DACL writes to one path run in order. A grant reads the DACL and writes back a merge, so
|
|
* one racing a re-lock on another pool thread could land last and restore the broader DACL. A
|
|
* synchronous grantDirAcl is not ordered against them, but it runs to completion on the main
|
|
* thread, so restrictAsync's post-apply verify (a later main-thread continuation) sees its result:
|
|
* a resurrected broad DACL fails that verify, which evicts the directory to retry under the budget.
|
|
*/
|
|
function prepare(raw: WindowsSecurityAddon): WindowsSecurity {
|
|
const writes = new Map<string, Promise<unknown>>()
|
|
const inPathOrder = (path: string, write: (namespaced: string) => Promise<void>) => {
|
|
const namespaced = toNamespacedPath(path)
|
|
const key = namespaced.toLowerCase()
|
|
const run = () => write(namespaced)
|
|
const next = (writes.get(key) ?? Promise.resolve()).then(run, run)
|
|
const settled = next.catch(() => undefined)
|
|
writes.set(key, settled)
|
|
void settled.then(() => {
|
|
if (writes.get(key) === settled) {
|
|
writes.delete(key)
|
|
}
|
|
})
|
|
return next
|
|
}
|
|
return {
|
|
userSid: raw.currentUserSid(),
|
|
addon: {
|
|
getDaclAces: (path) => raw.getDaclAces(toNamespacedPath(path)),
|
|
setDaclSddl: (path, sddl) => raw.setDaclSddl(toNamespacedPath(path), sddl),
|
|
setDaclSddlAsync: (path, sddl) =>
|
|
inPathOrder(path, (namespaced) => raw.setDaclSddlAsync(namespaced, sddl)),
|
|
createFileWithDacl: (path, sddl, data) =>
|
|
raw.createFileWithDacl(toNamespacedPath(path), sddl, data),
|
|
grantAccess: (path, sid, mask, options) =>
|
|
raw.grantAccess(toNamespacedPath(path), sid, mask, options),
|
|
grantAccessAsync: (path, sid, mask, options) =>
|
|
inPathOrder(path, (namespaced) => raw.grantAccessAsync(namespaced, sid, mask, options))
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Installs `addon` (a fake, or null for "cannot load") behind the same wrapping as the real one. */
|
|
export function setWindowsSecurityForTests(addon: WindowsSecurityAddon | null): void {
|
|
loaded = addon ? prepare(addon) : { error: 'disabled for tests' }
|
|
}
|
|
|
|
/** Forgets the loaded addon and its SID. */
|
|
export function resetWindowsSecurityLoadForTests(): void {
|
|
loaded = null
|
|
}
|