borgmcp 1.1.14 → 2.0.1

package/dist/token-store.js

@@ -1 +1,81 @@
-import w from"path";import d from"crypto";import{AsyncEntry as h}from"@napi-rs/keyring";import{decryptString as k,encryptString as g}from"./token-crypto.js";const S="borg-mcp",E=t=>new h(S,t);function K(t=E){return{name:"keychain",async get(e){return await t(e).getPassword()??null},async set(e,o){await t(e).setPassword(o)},async delete(e){try{await t(e).deletePassword()}catch(o){const a=String(o?.message??"");if(/no entry|not found|no matching/i.test(a))return;throw o}}}}const O=25,_=2e3,F=1e4;function x(t){return new Promise(e=>setTimeout(e,t))}function v(){return`${process.pid}.${d.randomBytes(6).toString("hex")}`}function T(t){const{filePath:e,key:o,fs:a}=t,y=t.sleep??x,s=t.now??Date.now,p=t.uniqueSuffix??v,c=`${e}.lock`;async function l(){let r;try{r=await a.readFile(e)}catch{return{}}try{const n=k(r.trim(),o),i=JSON.parse(n);return i&&typeof i=="object"?i:{}}catch{return{}}}async function u(r){await a.mkdir(w.dirname(e),448);const n=`${e}.${p()}.tmp`;await a.writeFile(n,g(JSON.stringify(r),o),384);try{await a.rename(n,e)}catch(i){try{await a.removeFile(n)}catch{}throw i}}async function f(r){await a.mkdir(w.dirname(c),448);const n=s()+_;let i=!1;for(;!i&&(i=await a.createExclusive(c,`${process.pid}@${s()}`),!i);){const m=await a.fileAgeMs(c);if(m!==null&&m>F){await a.removeFile(c);continue}if(s()>=n){await a.removeFile(c),i=await a.createExclusive(c,`${process.pid}@${s()}`);break}await y(O)}try{return await r()}finally{i&&await a.removeFile(c)}}return{name:"encrypted-file",async get(r){const n=await l();return Object.prototype.hasOwnProperty.call(n,r)?n[r]:null},set(r,n){return f(async()=>{const i=await l();i[r]=n,await u(i)})},delete(r){return f(async()=>{const n=await l();Object.prototype.hasOwnProperty.call(n,r)&&(delete n[r],await u(n))})}}}async function b(t){return t.forced==="keychain"?t.makeKeychain():t.forced==="file"?t.makeFile():await t.keyringAvailable()?t.makeKeychain():t.makeFile()}async function L(t){const e=t.env.BORG_TOKEN?.trim();if(e)return e;const o=t.env.BORG_TOKEN_FILE?.trim();return o?(await t.readFile(o)).trim():null}export{T as makeEncryptedFileBackend,K as makeKeychainBackend,L as readCallerManagedIdToken,b as selectTokenBackend};
+/**
+ * Local-server credential backend.
+ *
+ * config.ts's local-server credential group sits on top of this. Storage is the
+ * 0600 file store (Queen rescope) — the OS keychain (@napi-rs/keyring) is GONE.
+ * The raw secret rests only in the 0600 file, parity with the server's own TLS
+ * private keys; there is no keychain and no obfuscation-grade fallback.
+ */
+import { atomicWrite0600, readStoreFile } from './seat-store.js';
+// ─── 0600 file backend (Queen rescope: replaces the OS keychain) ─────────────
+/**
+ * Build a TokenBackend over a single 0600 store file, all accounts held in one
+ * `{version, accounts}` map. get/set/delete read-modify-write the file via the
+ * seat-store's atomic 0600 writer — the RAW secret rests only in the 0600 file
+ * (parity with the server's TLS keys), never a keychain.
+ *
+ * These ops are NON-flocking by design: the config layer holds the single store
+ * lock (withStoreLock over CREDENTIALS_LOCK) continuously across each
+ * read-compare-write, so nesting a second lock here would deadlock the O_EXCL
+ * lockfile. Pure reads (get) are safe lock-free because atomicWrite0600's rename
+ * guarantees a reader only ever sees a complete file.
+ */
+export function makeFileBackend(filePath) {
+    const load = async () => {
+        const raw = await readStoreFile(filePath);
+        // CR4 fail-closed: ONLY a missing file initializes empty. A present-but-
+        // malformed / wrong-version / schema-invalid credential store MUST NOT read as
+        // empty — a subsequent set/delete would OVERWRITE it and erase every stored
+        // account (parent enrollment credentials + pending records). Throw WITHOUT
+        // writing so the corrupt bytes are preserved for recovery.
+        if (raw === null)
+            return {};
+        let parsed;
+        try {
+            parsed = JSON.parse(raw);
+        }
+        catch {
+            throw new Error('Borg credential store is malformed; refusing to overwrite it');
+        }
+        if (!parsed ||
+            typeof parsed !== 'object' ||
+            Array.isArray(parsed) ||
+            parsed.version !== 1 ||
+            !parsed.accounts ||
+            typeof parsed.accounts !== 'object' ||
+            Array.isArray(parsed.accounts)) {
+            throw new Error('Borg credential store is malformed or has an unsupported version; refusing to overwrite it');
+        }
+        // CR#2: FULL value validation — every account value MUST be a string. A
+        // non-string value (a corrupted/tampered entry) fails CLOSED without writing,
+        // so a following set/delete never overwrites the store off a bad read.
+        const accounts = parsed.accounts;
+        for (const value of Object.values(accounts)) {
+            if (typeof value !== 'string') {
+                throw new Error('Borg credential store is malformed (a non-string account value); refusing to overwrite it');
+            }
+        }
+        return { ...accounts };
+    };
+    const save = (accounts) => atomicWrite0600(filePath, JSON.stringify({ version: 1, accounts }, null, 2) + '\n');
+    return {
+        name: 'file',
+        async get(account) {
+            const accounts = await load();
+            return Object.prototype.hasOwnProperty.call(accounts, account) ? accounts[account] : null;
+        },
+        async set(account, value) {
+            const accounts = await load();
+            accounts[account] = value;
+            await save(accounts);
+        },
+        async delete(account) {
+            const accounts = await load();
+            if (Object.prototype.hasOwnProperty.call(accounts, account)) {
+                delete accounts[account];
+                await save(accounts);
+            }
+        },
+    };
+}
+//# sourceMappingURL=token-store.js.map

package/dist/token-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token-store.js","sourceRoot":"","sources":["../src/token-store.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAgBjE,gFAAgF;AAEhF;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,MAAM,IAAI,GAAG,KAAK,IAAqC,EAAE;QACvD,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC1C,yEAAyE;QACzE,+EAA+E;QAC/E,4EAA4E;QAC5E,2EAA2E;QAC3E,2DAA2D;QAC3D,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC5B,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAClF,CAAC;QACD,IACE,CAAC,MAAM;YACP,OAAO,MAAM,KAAK,QAAQ;YAC1B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACpB,MAAgC,CAAC,OAAO,KAAK,CAAC;YAC/C,CAAE,MAAiC,CAAC,QAAQ;YAC5C,OAAQ,MAAiC,CAAC,QAAQ,KAAK,QAAQ;YAC/D,KAAK,CAAC,OAAO,CAAE,MAAiC,CAAC,QAAQ,CAAC,EAC1D,CAAC;YACD,MAAM,IAAI,KAAK,CACb,4FAA4F,CAC7F,CAAC;QACJ,CAAC;QACD,wEAAwE;QACxE,8EAA8E;QAC9E,uEAAuE;QACvE,MAAM,QAAQ,GAAI,MAAgD,CAAC,QAAQ,CAAC;QAC5E,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,EAAE,GAAI,QAAmC,EAAE,CAAC;IACrD,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,QAAgC,EAAiB,EAAE,CAC/D,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACtF,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,KAAK,CAAC,GAAG,CAAC,OAAO;YACf,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5F,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK;YACtB,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAC;YAC9B,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;YAC1B,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,OAAO;YAClB,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;gBAC5D,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACzB,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/tool-manifest.d.ts

@@ -1,15 +1,11 @@
 /**
  * gh#docs-site — SOURCE-OF-TRUTH tool manifest.
  *
- * The single canonical list of borg_* MCP tool definitions. index.ts imports
- * this as the tools it registers, AND the docs site
- * (landing-page/src/pages/docs/tools.astro) imports it to AUTO-GENERATE the
- * tool reference — so the published docs can never drift from the shipped
- * tools (the gh#740 drift lesson).
+ * The single canonical list of borg_* MCP tool definitions. The runtime and
+ * documentation consumers use the same pure-data list.
  *
- * PURE DATA — no imports, no side effects — so the lightweight landing-page
- * (Astro/Vite) build can bundle it without pulling the client's MCP/keyring
- * runtime deps.
+ * PURE DATA — no imports, no side effects — so documentation builds do not pull
+ * in the client's MCP runtime dependencies.
  */
 export interface ToolManifestEntry {
     name: string;

package/dist/tool-manifest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-manifest.d.ts","sourceRoot":"","sources":["../src/tool-manifest.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,KAAK,CAAC,EAAE,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;KACvC,CAAC;CACH;AAED,eAAO,MAAM,aAAa,EAAE,iBAAiB,EA6kB5C,CAAC"}