functionalscript 0.32.1 → 0.32.2

package/fs/cas/mcp/module.f.d.ts

@@ -24,7 +24,7 @@ export declare const casListArgs: {};
  * the blob on the local filesystem. When absent (e.g. memory-backed tests),
  * `url` is omitted.
  */
-export declare const casMcpHandlers: <O extends Operation>(c: Cas<O>, toUrl?: (hash: Vec) => string) => McpHandlers<ReadFile | O>;
+export declare const casMcpHandlers: <O extends Operation>(c: Cas<O>, home: string, toUrl?: (hash: Vec) => string) => McpHandlers<ReadFile | O>;
 /**
  * Static MCP configuration for the CAS server: advertises the `tools`
  * capability, identifies the server, and pins the protocol version.
@@ -37,4 +37,4 @@ export declare const casConfig: McpConfig;
  *
  * When `toUrl` is provided, `cas_get` includes the blob's filesystem URL.
  */
-export declare const casMcpServer: <O extends Operation>(c: Cas<O>, toUrl?: (hash: Vec) => string) => Effect<Read | Write | MemOp | ReadFile | O, void>;
+export declare const casMcpServer: <O extends Operation>(c: Cas<O>, home: string, toUrl?: (hash: Vec) => string) => Effect<Read | Write | MemOp | ReadFile | O, void>;

package/fs/cas/mcp/module.f.js

@@ -23,8 +23,9 @@
  *   without any encoding step.
  * - `'base64'`: `content` is RFC 4648 base64, decoded to bytes before storage.
  *   Use this for pre-encoded binary payloads.
- * - `'url'`: `content` is a filesystem path; the server reads the file at that
- *   path and stores its raw bytes.
+ * - `'url'`: `content` is a filesystem path within `$HOME/cas_upload/`; the server
+ *   reads the file at that path and stores its raw bytes. Paths outside
+ *   `$HOME/cas_upload/` or containing `..` are rejected for security.
  *
  * ## `cas_get` output
  *
@@ -83,44 +84,79 @@ export const casGetArgs = { hash: string, content: option(boolean) };
 export const casListArgs = {};
 // ── Tool registry ──────────────────────────────────────────────────────────────
 /** Registry of all CAS tools. */
-const casToolRegistry = (c, toUrl) => [
-    toolEntry('cas_add', 'Store content and return its hash (cBase32). Pass type:"base64" for binary; type:"url" to read from a filesystem path; omit or pass type:"text" for UTF-8 text (default).', casAddArgs, ({ type, content }) => {
-        let x;
-        switch (type) {
-            case 'url':
-                x = readFile(content).step(([t, v]) => pure(t === 'error'
-                    ? `cannot read file: ${content}: ${v}`
-                    : v));
-                break;
-            case 'base64':
-                const value = base64Decode(content);
-                x = pure(value === null ? `invalid base64 content: ${content}` : value);
-                break;
-            default:
-                x = pure(utf8(content));
-                break;
-        }
-        return x.step(value => typeof value === 'string'
-            ? pure(errorResult(value))
-            : c.write(value).step(hash => pure(okResult(vecToCBase32(hash)))));
-    }),
-    toolEntry('cas_get', 'Inspect a blob by hash. Always returns JSON {length,mime_type,type[,url]} where type is "text" or "base64". Pass content:true to also include the inline content string.', casGetArgs, r => {
-        const key = cBase32ToVec(r.hash);
-        if (key === null) {
-            return pure(errorResult(`invalid cBase32 hash: ${r.hash}`));
-        }
-        return c.read(key).step(value => {
-            if (value === undefined) {
-                return pure(errorResult(`no such hash: ${r.hash}`));
+const casToolRegistry = (c, home, toUrl) => {
+    const casUploadDir = `${home}/cas_upload`;
+    return [
+        toolEntry('cas_add', 'Store content and return its hash (cBase32). Pass type:"base64" for binary; type:"url" to read from a filesystem path within $HOME/cas_upload/; omit or pass type:"text" for UTF-8 text (default).', casAddArgs, ({ type, content }) => {
+            let x;
+            switch (type) {
+                case 'url':
+                    if (!content.startsWith(`${casUploadDir}/`) || content.includes('..')) {
+                        x = pure(`cas_add type:url paths must be within ${casUploadDir}/ — got: ${content}`);
+                    }
+                    else {
+                        x = readFile(content).step(([t, v]) => pure(t === 'error'
+                            ? `cannot read file: ${content}: ${v}`
+                            : v));
+                    }
+                    break;
+                case 'base64':
+                    const value = base64Decode(content);
+                    x = pure(value === null ? `invalid base64 content: ${content}` : value);
+                    break;
+                default:
+                    x = pure(utf8(content));
+                    break;
             }
-            const byteLength = Number(bitVecLength(value) / 8n);
-            // Phase 1: magic-byte sniffing for known binary formats.
-            const detectedMime = detect(value);
-            if (detectedMime !== null) {
+            return x.step(value => typeof value === 'string'
+                ? pure(errorResult(value))
+                : c.write(value).step(hash => pure(okResult(vecToCBase32(hash)))));
+        }),
+        toolEntry('cas_get', 'Inspect a blob by hash. Always returns JSON {length,mime_type,type[,url]} where type is "text" or "base64". Pass content:true to also include the inline content string.', casGetArgs, r => {
+            const key = cBase32ToVec(r.hash);
+            if (key === null) {
+                return pure(errorResult(`invalid cBase32 hash: ${r.hash}`));
+            }
+            return c.read(key).step(value => {
+                if (value === undefined) {
+                    return pure(errorResult(`no such hash: ${r.hash}`));
+                }
+                const byteLength = Number(bitVecLength(value) / 8n);
+                // Phase 1: magic-byte sniffing for known binary formats.
+                const detectedMime = detect(value);
+                if (detectedMime !== null) {
+                    const url = toUrl?.(key);
+                    const meta = {
+                        length: byteLength,
+                        mime_type: detectedMime,
+                        type: 'base64',
+                        ...(url !== undefined && { url })
+                    };
+                    if (r.content === true) {
+                        const blob = base64Encode(value);
+                        return pure(blob === null
+                            ? errorResult(`content is not byte-aligned: ${r.hash}`)
+                            : okResult(JSON.stringify({ ...meta, content: blob })));
+                    }
+                    return pure(okResult(JSON.stringify(meta)));
+                }
+                // Phase 2: UTF-8 validation — text if valid, octet-stream otherwise.
+                const str = fromVec(value);
                 const url = toUrl?.(key);
+                if (str !== null) {
+                    const meta = {
+                        length: byteLength,
+                        mime_type: 'text/plain',
+                        type: 'text',
+                        ...(url !== undefined && { url })
+                    };
+                    return pure(r.content === true
+                        ? okResult(JSON.stringify({ ...meta, content: str }))
+                        : okResult(JSON.stringify(meta)));
+                }
                 const meta = {
                     length: byteLength,
-                    mime_type: detectedMime,
+                    mime_type: 'application/octet-stream',
                     type: 'base64',
                     ...(url !== undefined && { url })
                 };
@@ -131,38 +167,11 @@ const casToolRegistry = (c, toUrl) => [
                         : okResult(JSON.stringify({ ...meta, content: blob })));
                 }
                 return pure(okResult(JSON.stringify(meta)));
-            }
-            // Phase 2: UTF-8 validation — text if valid, octet-stream otherwise.
-            const str = fromVec(value);
-            const url = toUrl?.(key);
-            if (str !== null) {
-                const meta = {
-                    length: byteLength,
-                    mime_type: 'text/plain',
-                    type: 'text',
-                    ...(url !== undefined && { url })
-                };
-                return pure(r.content === true
-                    ? okResult(JSON.stringify({ ...meta, content: str }))
-                    : okResult(JSON.stringify(meta)));
-            }
-            const meta = {
-                length: byteLength,
-                mime_type: 'application/octet-stream',
-                type: 'base64',
-                ...(url !== undefined && { url })
-            };
-            if (r.content === true) {
-                const blob = base64Encode(value);
-                return pure(blob === null
-                    ? errorResult(`content is not byte-aligned: ${r.hash}`)
-                    : okResult(JSON.stringify({ ...meta, content: blob })));
-            }
-            return pure(okResult(JSON.stringify(meta)));
-        });
-    }),
-    toolEntry('cas_list', 'List all stored content hashes (cBase32), one per line.', casListArgs, () => c.list().step(hashes => pure(okResult(hashes.map(vecToCBase32).join('\n'))))),
-];
+            });
+        }),
+        toolEntry('cas_list', 'List all stored content hashes (cBase32), one per line.', casListArgs, () => c.list().step(hashes => pure(okResult(hashes.map(vecToCBase32).join('\n'))))),
+    ];
+};
 // ── Result helpers ──────────────────────────────────────────────────────────────
 /** A successful single-text-block tool result. */
 const okResult = (text) => ({ content: [{ type: 'text', text }] });
@@ -175,7 +184,7 @@ const okResult = (text) => ({ content: [{ type: 'text', text }] });
  * the blob on the local filesystem. When absent (e.g. memory-backed tests),
  * `url` is omitted.
  */
-export const casMcpHandlers = (c, toUrl) => fromRegistry(casToolRegistry(c, toUrl));
+export const casMcpHandlers = (c, home, toUrl) => fromRegistry(casToolRegistry(c, home, toUrl));
 // ── Session configuration ───────────────────────────────────────────────────────
 /**
  * Static MCP configuration for the CAS server: advertises the `tools`
@@ -194,4 +203,4 @@ export const casConfig = {
  *
  * When `toUrl` is provided, `cas_get` includes the blob's filesystem URL.
  */
-export const casMcpServer = (c, toUrl) => create(uninitializedState).step(key => stdioTransport(mcpStep(casConfig)(casMcpHandlers(c, toUrl))(key)));
+export const casMcpServer = (c, home, toUrl) => create(uninitializedState).step(key => stdioTransport(mcpStep(casConfig)(casMcpHandlers(c, home, toUrl))(key)));

package/fs/cas/mcp/proof.f.d.ts

@@ -27,4 +27,7 @@ export declare const proof: {
     getMetaNoUrlWhenToUrlAbsent: () => void;
     getMetaMissingHashIsError: () => void;
     getMetaInvalidHashIsError: () => void;
+    addUrlFromApprovedDirectorySucceeds: () => void;
+    addUrlFromRandomDirectoryIsRejected: () => void;
+    addUrlWithPathTraversalIsRejected: () => void;
 };

package/fs/cas/mcp/proof.f.js

@@ -49,15 +49,15 @@ const feed = (step) => (msgs) => {
     return go(0, []);
 };
 // Runs a full session over a fresh in-memory CAS, returning all responses.
-const runSession = (msgs) => runMem(create({}).step(mapKey => create(uninitializedState).step(sessionKey => {
+const runSession = (msgs, home = '/home/user') => runMem(create({}).step(mapKey => create(uninitializedState).step(sessionKey => {
     const c = cas(sha256)(memKvStore(mapKey));
-    const step = mcpStep(casConfig)(casMcpHandlers(c))(sessionKey);
+    const step = mcpStep(casConfig)(casMcpHandlers(c, home))(sessionKey);
     return feed(step)(msgs);
 })));
 // Runs a session with a mocked filesystem (for cas_add with type:'url' tests).
-const runSessionWithFiles = (files) => (msgs) => runMemWithFiles(files)(create({}).step(mapKey => create(uninitializedState).step(sessionKey => {
+const runSessionWithFiles = (files, home = '/home/user') => (msgs) => runMemWithFiles(files)(create({}).step(mapKey => create(uninitializedState).step(sessionKey => {
     const c = cas(sha256)(memKvStore(mapKey));
-    const step = mcpStep(casConfig)(casMcpHandlers(c))(sessionKey);
+    const step = mcpStep(casConfig)(casMcpHandlers(c, home))(sessionKey);
     return feed(step)(msgs);
 })));
 // ── Messages ────────────────────────────────────────────────────────────────────
@@ -211,26 +211,26 @@ export const proof = {
         assert(!('error' in resp));
         assert('result' in resp);
     },
-    // cas_add with type:'url' reads a file and stores it.
+    // cas_add with type:'url' reads a file from /home/user/cas_upload/ and stores it.
     addUrlStoresFileAndReturnsHash: () => {
         const fileContent = utf8('hello from file');
-        const [addUrlResp] = runSessionWithFiles({ '/tmp/hello.txt': fileContent })([
+        const [addUrlResp] = runSessionWithFiles({ '/home/user/cas_upload/hello.txt': fileContent })([
             init, initialized,
-            call(2, 'cas_add', { content: '/tmp/hello.txt', type: 'url' }),
+            call(2, 'cas_add', { content: '/home/user/cas_upload/hello.txt', type: 'url' }),
         ]).slice(2);
         assert(!resultOf(addUrlResp).isError);
         assert(textOf(addUrlResp).length > 0);
     },
     addUrlRoundTrips: () => {
         const fileContent = utf8('round-trip content');
-        const msgs = runSessionWithFiles({ '/tmp/rt.txt': fileContent })([
+        const msgs = runSessionWithFiles({ '/home/user/cas_upload/rt.txt': fileContent })([
             init, initialized,
-            call(2, 'cas_add', { content: '/tmp/rt.txt', type: 'url' }),
+            call(2, 'cas_add', { content: '/home/user/cas_upload/rt.txt', type: 'url' }),
         ]).slice(2);
         const hash = textOf(msgs[0]);
-        const msgs2 = runSessionWithFiles({ '/tmp/rt.txt': fileContent })([
+        const msgs2 = runSessionWithFiles({ '/home/user/cas_upload/rt.txt': fileContent })([
             init, initialized,
-            call(2, 'cas_add', { content: '/tmp/rt.txt', type: 'url' }),
+            call(2, 'cas_add', { content: '/home/user/cas_upload/rt.txt', type: 'url' }),
             call(3, 'cas_get', { hash, content: true }),
         ]).slice(2);
         assert(!resultOf(msgs2[1]).isError);
@@ -241,21 +241,21 @@ export const proof = {
     addUrlMissingFileIsError: () => {
         const [resp] = runSessionWithFiles({})([
             init, initialized,
-            call(2, 'cas_add', { content: '/nonexistent/path.txt', type: 'url' }),
+            call(2, 'cas_add', { content: '/home/user/cas_upload/nonexistent.txt', type: 'url' }),
         ]).slice(2);
         assertEq(resultOf(resp).isError, true);
     },
     // cas_get without content:true returns only metadata.
     getMetaReturnsLengthAndMimeType: () => {
         const fileContent = utf8('text content');
-        const [addResp] = runSessionWithFiles({ '/f': fileContent })([
+        const [addResp] = runSessionWithFiles({ '/home/user/cas_upload/f': fileContent })([
             init, initialized,
-            call(2, 'cas_add', { content: '/f', type: 'url' }),
+            call(2, 'cas_add', { content: '/home/user/cas_upload/f', type: 'url' }),
         ]).slice(2);
         const hash = textOf(addResp);
-        const [, metaResp2] = runSessionWithFiles({ '/f': fileContent })([
+        const [, metaResp2] = runSessionWithFiles({ '/home/user/cas_upload/f': fileContent })([
             init, initialized,
-            call(2, 'cas_add', { content: '/f', type: 'url' }),
+            call(2, 'cas_add', { content: '/home/user/cas_upload/f', type: 'url' }),
             call(3, 'cas_get', { hash }),
         ]).slice(2);
         assert(!resultOf(metaResp2).isError);
@@ -307,4 +307,34 @@ export const proof = {
         const [resp] = session(call(2, 'cas_get', { hash: 'bad!' }));
         assertEq(resultOf(resp).isError, true);
     },
+    // cas_add with type:'url' accepts paths within /home/user/cas_upload/
+    addUrlFromApprovedDirectorySucceeds: () => {
+        const fileContent = utf8('approved file');
+        const [resp] = runSessionWithFiles({ '/home/user/cas_upload/test.txt': fileContent })([
+            init, initialized,
+            call(2, 'cas_add', { content: '/home/user/cas_upload/test.txt', type: 'url' }),
+        ]).slice(2);
+        assert(!resultOf(resp).isError);
+        assert(textOf(resp).length > 0);
+    },
+    // cas_add with type:'url' rejects paths outside /home/user/cas_upload/
+    addUrlFromRandomDirectoryIsRejected: () => {
+        const fileContent = utf8('forbidden file');
+        const [resp] = runSessionWithFiles({ '/tmp/secret.txt': fileContent })([
+            init, initialized,
+            call(2, 'cas_add', { content: '/tmp/secret.txt', type: 'url' }),
+        ]).slice(2);
+        assert(resultOf(resp).isError === true);
+        assert(textOf(resp).includes('/home/user/cas_upload/'));
+    },
+    // cas_add with type:'url' rejects path traversal attempts with ..
+    addUrlWithPathTraversalIsRejected: () => {
+        const fileContent = utf8('secret content');
+        const [resp] = runSessionWithFiles({ '/home/user/cas_upload/../../etc/passwd': fileContent })([
+            init, initialized,
+            call(2, 'cas_add', { content: '/home/user/cas_upload/../../etc/passwd', type: 'url' }),
+        ]).slice(2);
+        assert(resultOf(resp).isError === true);
+        assert(textOf(resp).includes('/home/user/cas_upload/'));
+    },
 };

package/fs/fjs/module.f.js

@@ -35,7 +35,7 @@ const commands = [
         description: 'Run an MCP server over stdio exposing the CAS as tools',
         handler: ({ home }) => {
             const c = cas(sha256)(fileKvStore(home));
-            return casMcpServer(c, hash => join(home, toPath(hash))).step(() => pure(0));
+            return casMcpServer(c, home, hash => join(home, toPath(hash))).step(() => pure(0));
         },
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.32.1",
+  "version": "0.32.2",
   "type": "module",
   "files": [
     "**/*.js",