@0xmaxma/claude-gateway 1.5.7 → 1.6.0

package/dist/api/router.js

@@ -33,6 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidSessionId = isValidSessionId;
+exports.isValidAgentId = isValidAgentId;
 exports.createApiRouter = createApiRouter;
 const express_1 = require("express");
 const crypto_1 = require("crypto");
@@ -52,6 +54,21 @@ const MAX_MESSAGE_LENGTH = 10000;
 const DEFAULT_TIMEOUT_MS = 60000;
 const AGENT_ID_RE = /^[a-z][a-z0-9_-]{1,31}$/;
 const SAFE_FILENAME_RE = /^[a-zA-Z0-9._\-() ]+$/;
+// session_id becomes a filesystem key (sessions/<id>.jsonl, .sessions/<id>/) so it
+// must be constrained to the same safe charset as chat_id — no '/' or '.' that could
+// escape the agent's directory. Clients may pass custom (non-UUID) session ids, so
+// this preserves that while blocking path traversal.
+const SESSION_ID_RE = /^[a-zA-Z0-9_-]{1,64}$/;
+function isValidSessionId(v) {
+    return typeof v === 'string' && SESSION_ID_RE.test(v);
+}
+// agent_id likewise becomes a filesystem key (agents/<id>/media/…), so any
+// endpoint that joins it into a path MUST format-validate it first — a bare
+// non-empty check lets "../x" relocate the containment root itself. Exported so
+// sibling routers (image share) apply the identical guard as the /api routes.
+function isValidAgentId(v) {
+    return typeof v === 'string' && AGENT_ID_RE.test(v);
+}
 function maskToken(token) {
     if (token.length <= 12)
         return '•'.repeat(token.length);
@@ -256,8 +273,8 @@ function createApiRouter(agentRunners, agentConfigs, apiKeys, configPath, models
             res.status(400).json({ error: 'chat_id must be 1-64 alphanumeric characters, hyphens, or underscores' });
             return;
         }
-        if (session_id !== undefined && typeof session_id !== 'string') {
-            res.status(400).json({ error: 'session_id must be a string if provided' });
+        if (session_id !== undefined && !isValidSessionId(session_id)) {
+            res.status(400).json({ error: 'session_id must be 1-64 alphanumeric characters, hyphens, or underscores' });
             return;
         }
         // Validate media_files
@@ -306,6 +323,26 @@ function createApiRouter(agentRunners, agentConfigs, apiKeys, configPath, models
                         out[f] = v.trim();
                 }
             }
+            // image_refs (#73) — reference images explicitly selected in the composer,
+            // order-significant. Each entry is a ref from GET /api/v1/image-catalog.
+            if (ip.image_refs !== undefined) {
+                const refs = ip.image_refs;
+                if (!Array.isArray(refs) || refs.some((r) => typeof r !== 'string' || !r.trim())) {
+                    res.status(400).json({ error: 'image_params.image_refs must be an array of non-empty strings' });
+                    return;
+                }
+                const trimmedRefs = refs.map((r) => r.trim());
+                if (trimmedRefs.length > 5) {
+                    res.status(400).json({ error: 'image_params.image_refs allows at most 5 references' });
+                    return;
+                }
+                if (new Set(trimmedRefs).size !== trimmedRefs.length) {
+                    res.status(400).json({ error: 'image_params.image_refs must not contain duplicates' });
+                    return;
+                }
+                if (trimmedRefs.length)
+                    out.image_refs = trimmedRefs;
+            }
             if (ip.n !== undefined) {
                 if (typeof ip.n !== 'number' || !Number.isFinite(ip.n) || ip.n < 1) {
                     res.status(400).json({ error: 'image_params.n must be a positive number' });
@@ -566,7 +603,7 @@ function createApiRouter(agentRunners, agentConfigs, apiKeys, configPath, models
                 description: cfg?.description ?? '',
                 sessions: sessions.map((s) => {
                     const meta = metaMap.get(s.sessionId);
-                    return { ...s, sessionName: meta?.name ?? null, imageConfig: meta?.imageConfig ?? null };
+                    return { ...s, sessionName: meta?.name ?? null, imageConfig: meta?.imageConfig ?? null, model: meta?.model ?? null };
                 }),
             };
         }));
@@ -2587,7 +2624,22 @@ function createApiRouter(agentRunners, agentConfigs, apiKeys, configPath, models
         const baseName = path.basename(rawFilename).replace(/\s+/g, '_');
         const safeBaseName = SAFE_FILENAME_RE.test(baseName) ? baseName : 'upload';
         const rawExt = path.extname(safeBaseName).replace(/[^a-zA-Z0-9.]/g, '').slice(0, 10);
-        const ext = rawExt || (mimeType.includes('pdf') ? '.pdf' : '.bin');
+        // No usable extension (clipboard paste, non-ASCII filename sanitized to
+        // 'upload') → derive it from the MIME type. Falling straight to .bin made
+        // pasted images invisible to the session image catalog, which keys off the
+        // file extension — so they could never be referenced (#74).
+        const mimeExt = mimeType.includes('png')
+            ? '.png'
+            : mimeType.includes('jpeg') || mimeType.includes('jpg')
+                ? '.jpeg'
+                : mimeType.includes('webp')
+                    ? '.webp'
+                    : mimeType.includes('gif')
+                        ? '.gif'
+                        : mimeType.includes('pdf')
+                            ? '.pdf'
+                            : '.bin';
+        const ext = rawExt || mimeExt;
         const tmpFile = path.join(os.tmpdir(), `gw-${Date.now()}${ext}`);
         try {
             await fsp.writeFile(tmpFile, buf);
@@ -3095,6 +3147,10 @@ function createApiRouter(agentRunners, agentConfigs, apiKeys, configPath, models
             res.status(400).json({ error: 'session_id is required' });
             return;
         }
+        if (!isValidSessionId(sessionId)) {
+            res.status(400).json({ error: 'session_id must be 1-64 alphanumeric characters, hyphens, or underscores' });
+            return;
+        }
         // chat_id is optional — provide the same value used when creating the session via POST /sessions
         // so the greeting message lands in the correct historyDb bucket (api-{chatId}).
         // If omitted, sessionId is used as the bucket key, which creates a secondary index entry.