opencode-anthropic-fix 0.0.25 → 0.0.27

package/lib/storage.mjs

@@ -1,7 +1,7 @@
 import { promises as fs } from "node:fs";
 import { existsSync, readFileSync, appendFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { randomBytes } from "node:crypto";
+import { randomBytes, createHash } from "node:crypto";
 import { getConfigDir } from "./config.mjs";
 
 /**
@@ -153,7 +153,11 @@ function validateAccount(raw, now) {
 
   const addedAt = typeof acc.addedAt === "number" && Number.isFinite(acc.addedAt) ? acc.addedAt : now;
 
-  const id = typeof acc.id === "string" && acc.id ? acc.id : `${addedAt}:${acc.refreshToken.slice(0, 12)}`;
+  // QA fix M12: hash token fragment instead of leaking raw prefix
+  const id =
+    typeof acc.id === "string" && acc.id
+      ? acc.id
+      : `${addedAt}:${createHash("sha256").update(acc.refreshToken).digest("hex").slice(0, 12)}`;
 
   return {
     id,
@@ -198,8 +202,21 @@ export async function loadAccounts() {
     }
 
     if (data.version !== CURRENT_VERSION) {
-      // Future: handle migrations here
-      return null;
+      // QA fix H12: warn about version mismatch but attempt best-effort load
+      // rather than silently discarding all accounts
+      if (typeof data.version === "number" && data.version > CURRENT_VERSION) {
+        // Forward-compat: newer versions likely only add fields
+         
+        console.warn(
+          `[anthropic-auth] accounts file version ${data.version} is newer than expected ${CURRENT_VERSION}; loading with best effort`,
+        );
+      } else {
+        // Unknown/older version — still try to load
+         
+        console.warn(
+          `[anthropic-auth] accounts file version mismatch (${data.version} vs ${CURRENT_VERSION}); attempting load`,
+        );
+      }
     }
 
     const now = Date.now();
@@ -225,7 +242,12 @@ export async function loadAccounts() {
   } catch (error) {
     const code = /** @type {NodeJS.ErrnoException} */ (error).code;
     if (code === "ENOENT") return null;
-    return null;
+    // QA fix H11: only swallow ENOENT and JSON parse errors; throw for real I/O failures
+    if (error instanceof SyntaxError) {
+      // Corrupted JSON file — treat as empty
+      return null;
+    }
+    throw error;
   }
 }
 
@@ -244,11 +266,13 @@ export async function saveAccounts(storage) {
   /** @type {AccountStorage} */
   let storageToWrite = storage;
 
+  // QA fix M15: Accept pre-loaded disk data to avoid double-read (TOCTOU mitigation).
+  // Callers can pass diskData from their own loadAccounts() call.
   // Merge auth fields against disk by freshness to avoid stale-process clobber.
   // We do not resurrect removed accounts; only merge for accounts present in
   // the incoming storage payload.
   try {
-    const disk = await loadAccounts();
+    const disk = arguments[1] ?? (await loadAccounts());
     if (disk && storage.accounts.length > 0) {
       const diskById = new Map(disk.accounts.map((a) => [a.id, a]));
       /** @type {Map<number, AccountMetadata[]>} */
@@ -313,6 +337,10 @@ export async function saveAccounts(storage) {
   const content = JSON.stringify(storageToWrite, null, 2);
 
   try {
+    // QA note H9: mode 0o600 (owner-only read/write) is enforced on Linux/macOS.
+    // On Windows, POSIX mode is silently ignored by Node.js — ACLs govern permissions.
+    // Windows file inherits parent directory ACLs, which typically restrict access
+    // to the current user on per-user directories (%APPDATA%).
     await fs.writeFile(tempPath, content, { encoding: "utf-8", mode: 0o600 });
     await fs.rename(tempPath, storagePath);
   } catch (error) {

package/lib/storage.test.mjs

@@ -27,11 +27,15 @@ vi.mock("node:fs", () => ({
   },
 }));
 
-vi.mock("node:crypto", () => ({
-  randomBytes: vi.fn(() => ({
-    toString: () => "abcdef123456",
-  })),
-}));
+vi.mock("node:crypto", async (importOriginal) => {
+  const actual = await importOriginal();
+  return {
+    randomBytes: vi.fn(() => ({
+      toString: () => "abcdef123456",
+    })),
+    createHash: actual.createHash,
+  };
+});
 
 // ---------------------------------------------------------------------------
 // deduplicateByRefreshToken
@@ -206,10 +210,13 @@ describe("loadAccounts", () => {
     expect(result).toBeNull();
   });
 
-  it("returns null for wrong version", async () => {
+  it("returns best-effort data for newer version (forward compat)", async () => {
     fs.readFile.mockResolvedValue(JSON.stringify({ version: 99, accounts: [] }));
     const result = await loadAccounts();
-    expect(result).toBeNull();
+    // H12 fix: no longer returns null; attempts best-effort load with a warning
+    expect(result).not.toBeNull();
+    expect(result.accounts).toEqual([]);
+    expect(result.version).toBe(1); // normalized to current version
   });
 
   it("returns null when accounts is not an array", async () => {

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "0.0.25",
+  "version": "0.0.27",
+  "license": "GPL-3.0-or-later",
   "main": "./index.mjs",
   "files": [
     "index.mjs",
@@ -32,7 +33,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@opencode-ai/plugin": "^0.4.45",
+    "@opencode-ai/plugin": "^1.2.27",
     "esbuild": "^0.27.3",
     "eslint": "^10.0.0",
     "husky": "^9.1.7",