apple-tools-mcp 3.2.0 → 3.2.2

package/lib/httpAuth.js

@@ -8,12 +8,13 @@
  * a bearer token.
  *
  * The token is a random secret generated once and stored in the macOS
- * Keychain — never in a config file, the repo, or logs after the first
- * (one-time, clearly labeled) print. There is no external account, no
+ * Keychain — never in a config file, the repo, argv, or logs.
+ * Print it only with the explicit http-token command. There is no external account, no
  * OAuth flow, and no cost: it's a self-issued password, like an SSH key.
  */
 
 import crypto from "crypto";
+import { writeKeychainSecret } from "./keychainWrite.js";
 import { execFileSync as defaultExecFileSync } from "child_process";
 
 export const KEYCHAIN_SERVICE = "apple-tools-mcp-http";
@@ -34,11 +35,7 @@ function readFromKeychain(exec) {
 }
 
 function writeToKeychain(exec, token) {
-  exec(
-    "/usr/bin/security",
-    ["add-generic-password", "-s", KEYCHAIN_SERVICE, "-a", KEYCHAIN_ACCOUNT, "-w", token, "-U"],
-    { stdio: ["ignore", "ignore", "pipe"] }
-  );
+  writeKeychainSecret(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT, token, exec);
 }
 
 function generateToken(randomBytes) {
@@ -71,13 +68,8 @@ export function loadOrCreateHttpAuthToken(options = {}) {
 
   const token = generateToken(randomBytes);
   writeToKeychain(exec, token);
-  log("============================================================");
-  log("Generated a new HTTP auth token (shown once, stored in Keychain):");
-  log(token);
-  log("Use this as a Bearer token when configuring remote MCP clients,");
-  log("e.g. claude mcp add ... -H \"Authorization: Bearer " + token + "\"");
-  log("Retrieve it again later with: apple-tools-mcp http-token");
-  log("============================================================");
+  log("Generated a new HTTP auth token and stored it in Keychain.");
+  log("Retrieve it with: apple-tools-mcp http-token");
   return { token, generated: true };
 }
 

package/lib/keychainWrite.js

@@ -0,0 +1,17 @@
+import { execFileSync } from "node:child_process";
+
+/** The security utility parses one stdin line; credential bytes never enter process argv. */
+export function writeKeychainSecret(service, account, value, exec = execFileSync) {
+  try {
+    const quote = (text) => {
+      if (!text || /[\r\n\0]/.test(text)) throw new Error("Invalid Keychain field");
+      return '"' + text.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"';
+    };
+    const command = "add-generic-password -U -s " + quote(service) + " -a " + quote(account) + " -w " + quote(value) + "\n";
+    // Apple's interactive command buffer is 4096 bytes. Reject before any truncated write.
+    if (Buffer.byteLength(command, "utf8") >= 4095) throw new Error("Keychain field too large");
+    exec("/usr/bin/security", ["-i"], { input: command, stdio: ["pipe", "ignore", "ignore"], timeout: 15000 });
+  } catch {
+    throw new Error("Keychain write failed; credential values omitted.");
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-tools-mcp",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "MCP server for semantic search and write actions across Apple Mail, Messages, Calendar, and Contacts. Speaks stdio (local) or bearer-token-authenticated Streamable HTTP (LAN / Tailscale).",
   "type": "module",
   "main": "index.js",
@@ -88,17 +88,22 @@
     "perf:lancedb": "vitest run tests/perf/lancedb.perf.test.js",
     "perf:background": "vitest run tests/perf/background-indexing.perf.test.js",
     "perf:dates": "vitest run tests/perf/date-parsing.perf.test.js",
-    "scan:package": "node scripts/scan-package.js"
+    "scan:package": "node scripts/scan-package.js",
+    "security:check": "python3 .security/scan.py all",
+    "prepublishOnly": "npm run security:check && npm run scan:package"
   },
   "dependencies": {
     "@huggingface/transformers": "^4.3.0",
     "@lancedb/lancedb": "^0.22.3",
-    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@modelcontextprotocol/sdk": "^1.31.0",
     "chrono-node": "^2.9.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^2.1.0",
     "fast-check": "^3.22.0",
     "vitest": "^2.1.0"
+  },
+  "overrides": {
+    "sharp": "^0.35.5"
   }
 }