apple-notes-mcp 2.5.0 → 2.5.2

package/build/services/appleNotesManager.js

@@ -2056,10 +2056,11 @@ export class AppleNotesManager {
      */
     listAttachments(title, account) {
         const targetAccount = this.resolveAccount(account);
+        const safeAccount = escapePlainStringForAppleScript(targetAccount);
         const safeTitle = escapePlainStringForAppleScript(title);
         const script = `
       tell application "Notes"
-        tell account "${targetAccount}"
+        tell account "${safeAccount}"
           set theNote to note "${safeTitle}"
         set attachmentList to {}
         repeat with a in attachments of theNote
@@ -2435,19 +2436,21 @@ export class AppleNotesManager {
      * Simple HTML to plaintext conversion for export.
      */
     htmlToPlaintext(html) {
-        return html
+        return (html
             .replace(/<br\s*\/?>/gi, "\n")
             .replace(/<\/div>/gi, "\n")
             .replace(/<\/p>/gi, "\n")
             .replace(/<[^>]+>/g, "")
             .replace(/&nbsp;/g, " ")
-            .replace(/&amp;/g, "&")
             .replace(/&lt;/g, "<")
             .replace(/&gt;/g, ">")
             .replace(/&quot;/g, '"')
             .replace(/&#92;/g, "\\")
+            // Decode &amp; LAST so an encoded entity like "&amp;lt;" round-trips to the
+            // literal "&lt;" instead of being double-unescaped to "<".
+            .replace(/&amp;/g, "&")
             .replace(/\n{3,}/g, "\n\n")
-            .trim();
+            .trim());
     }
     /**
      * Exports all notes as a JSON structure for backup/migration.

package/build/services/appleNotesManager.test.js

@@ -315,6 +315,17 @@ describe("AppleNotesManager", () => {
         manager = new AppleNotesManager();
         vi.clearAllMocks();
     });
+    describe("listAttachments — security", () => {
+        it("escapes the account name so it cannot break out of the AppleScript literal (injection regression)", () => {
+            mockExecuteAppleScript.mockReturnValue({ success: true, output: "" });
+            manager.listAttachments("My Note", 'evil" injected');
+            const script = String(mockExecuteAppleScript.mock.calls.at(-1)?.[0]);
+            // The account's double-quote must be escaped (\\") — a raw quote would
+            // terminate the tell-account string literal and allow `do shell script` injection.
+            expect(script).toContain('tell account "evil\\" injected"');
+            expect(script).not.toContain('tell account "evil" injected"');
+        });
+    });
     // ---------------------------------------------------------------------------
     // Note Creation
     // ---------------------------------------------------------------------------
@@ -2362,3 +2373,33 @@ describe("AppleNotesManager", () => {
         });
     });
 });
+describe("htmlToPlaintext (export helper)", () => {
+    // htmlToPlaintext is a private, pure string transform used by exportNote; it
+    // touches no AppleScript, so we exercise it directly through a cast.
+    const toPlaintext = (html) => new AppleNotesManager().htmlToPlaintext(html);
+    it("decodes the basic HTML entities", () => {
+        expect(toPlaintext("a & b")).toBe("a & b");
+        expect(toPlaintext("&lt;tag&gt;")).toBe("<tag>");
+        expect(toPlaintext("say &quot;hi&quot;")).toBe('say "hi"');
+        expect(toPlaintext("path&#92;file")).toBe("path\\file");
+        expect(toPlaintext("a&nbsp;b")).toBe("a b");
+    });
+    it("decodes &amp; last so encoded entities round-trip (no double-unescape)", () => {
+        // The literal text "&lt;" is stored in HTML as "&amp;lt;" and must decode
+        // back to "&lt;", NOT be double-unescaped to "<".
+        expect(toPlaintext("&amp;lt;")).toBe("&lt;");
+        expect(toPlaintext("&amp;gt;")).toBe("&gt;");
+        expect(toPlaintext("&amp;amp;")).toBe("&amp;");
+        expect(toPlaintext("&amp;nbsp;")).toBe("&nbsp;");
+    });
+    it("converts block/line tags to newlines and strips other tags", () => {
+        expect(toPlaintext("one<br>two")).toBe("one\ntwo");
+        expect(toPlaintext("<div>a</div><div>b</div>")).toBe("a\nb");
+        expect(toPlaintext("<p>x</p><p>y</p>")).toBe("x\ny");
+        expect(toPlaintext("<b>bold</b>")).toBe("bold");
+    });
+    it("collapses 3+ newlines and trims surrounding whitespace", () => {
+        expect(toPlaintext("a<br><br><br><br>b")).toBe("a\n\nb");
+        expect(toPlaintext("  <div>x</div>  ")).toBe("x");
+    });
+});

package/build/utils/checklistParser.js

@@ -24,7 +24,7 @@
  * @module utils/checklistParser
  * @see https://github.com/sweetrb/apple-notes-mcp/issues/2
  */
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 import * as zlib from "zlib";
 import * as fs from "fs";
 import * as path from "path";
@@ -43,7 +43,7 @@ export function hasFullDiskAccess() {
         if (!fs.existsSync(NOTES_DB_PATH))
             return false;
         // Try to open the database with a simple query
-        execSync(`sqlite3 -readonly "${NOTES_DB_PATH}" "SELECT 1;"`, {
+        execFileSync("sqlite3", ["-readonly", NOTES_DB_PATH, "SELECT 1;"], {
             encoding: "utf8",
             timeout: 3000,
             stdio: ["pipe", "pipe", "pipe"],
@@ -75,7 +75,7 @@ function queryNoteData(noteId) {
     // Query for the gzipped protobuf data, output as hex for safe transport
     const query = `SELECT hex(nd.ZDATA) FROM ZICNOTEDATA nd JOIN ZICCLOUDSYNCINGOBJECT n ON nd.ZNOTE = n.Z_PK WHERE n.Z_PK = ${pk};`;
     try {
-        const result = execSync(`sqlite3 -readonly "${NOTES_DB_PATH}" "${query}"`, {
+        const result = execFileSync("sqlite3", ["-readonly", NOTES_DB_PATH, query], {
             encoding: "utf8",
             timeout: 5000,
             stdio: ["pipe", "pipe", "pipe"],

package/build/utils/checklistParser.test.js

@@ -9,7 +9,7 @@ import * as zlib from "zlib";
 import { getChecklistItems, hasFullDiskAccess } from "./checklistParser.js";
 // Mock child_process to avoid actual database access
 vi.mock("child_process", () => ({
-    execSync: vi.fn(),
+    execFileSync: vi.fn(),
     spawnSync: vi.fn(() => ({ error: null })),
 }));
 // Mock fs for database existence checks
@@ -17,9 +17,9 @@ vi.mock("fs", () => ({
     existsSync: vi.fn(() => true),
     statSync: vi.fn(() => ({ mtimeMs: Date.now() })),
 }));
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 import { existsSync } from "fs";
-const mockExecSync = vi.mocked(execSync);
+const mockExecSync = vi.mocked(execFileSync);
 const mockExistsSync = vi.mocked(existsSync);
 /**
  * Builds a minimal Apple Notes protobuf structure with checklist items.
@@ -225,6 +225,6 @@ describe("getChecklistItems", () => {
     it("extracts correct primary key from note ID", () => {
         mockExecSync.mockReturnValue("");
         getChecklistItems("x-coredata://12345-ABCDE/ICNote/p42");
-        expect(mockExecSync).toHaveBeenCalledWith(expect.stringContaining("Z_PK = 42"), expect.any(Object));
+        expect(mockExecSync).toHaveBeenCalledWith("sqlite3", expect.arrayContaining([expect.stringContaining("Z_PK = 42")]), expect.any(Object));
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-notes-mcp",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "MCP server for Apple Notes - create, search, update, and manage notes via Claude and other AI assistants",
   "type": "module",
   "main": "build/index.js",
@@ -68,7 +68,7 @@
     "@types/turndown": "^5.0.6",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
-    "@vitest/coverage-v8": "^2.1.9",
+    "@vitest/coverage-v8": "^3.2.6",
     "eslint": "^9.0.0",
     "globals": "^17.0.0",
     "husky": "^9.1.7",
@@ -78,7 +78,7 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.0.0",
     "typescript-eslint": "^8.51.0",
-    "vitest": "^2.0.0"
+    "vitest": "^3.2.6"
   },
   "volta": {
     "node": "24.17.0"