Skip to content

armgit / mso

Public Imported from GitHub
0

Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.

fix(security): serialize bounded image imports

Abdurrahman Fakhrulcc8a55028d53
diff --git a/lib/mcp/openai-file-upload.test.ts b/lib/mcp/openai-file-upload.test.ts
index b32ed592..67cb7c06 100644
--- a/lib/mcp/openai-file-upload.test.ts
+++ b/lib/mcp/openai-file-upload.test.ts
@@ -82,3 +82,22 @@ describe("ChatGPT upload trust and validation", () => {
expect(uploadOneGuarded).not.toHaveBeenCalled();
});
});
+
+
+describe("image import resource gate", () => {
+ it("serializes image downloads before raster decode", async () => {
+ let active = 0, peak = 0;
+ vi.stubGlobal("fetch", vi.fn(async () => {
+ active += 1; peak = Math.max(peak, active);
+ await new Promise((resolve) => setTimeout(resolve, 15));
+ active -= 1;
+ return new Response(new Uint8Array(PNG), { status: 200, headers: { "content-type": "image/png" } });
+ }));
+ await Promise.all([
+ run({ mime_type: "image/png", file_id: "one" }),
+ run({ mime_type: "image/png", file_id: "two" }),
+ run({ mime_type: "image/png", file_id: "three" }),
+ ]);
+ expect(peak).toBe(1);
+ });
+});
diff --git a/lib/mcp/openai-file-upload.ts b/lib/mcp/openai-file-upload.ts
index 586fd4ee..5b1d5cb7 100644
--- a/lib/mcp/openai-file-upload.ts
+++ b/lib/mcp/openai-file-upload.ts
@@ -13,6 +13,25 @@ export interface OpenAiProvidedFile {
const MAX_FILE_BYTES = 20 * 1024 * 1024;
const MAX_IMAGE_PIXELS = 25_000_000;
+const MAX_IMAGE_IMPORT_WAITERS = 8;
+type ImageImportGate = { active: boolean; waiters: Array<() => void> };
+const imageGate = ((globalThis as typeof globalThis & { __msoImageImportGate?: ImageImportGate }).__msoImageImportGate ??= { active: false, waiters: [] });
+
+async function acquireImageImportSlot(): Promise<() => void> {
+ if (!imageGate.active) imageGate.active = true;
+ else {
+ if (imageGate.waiters.length >= MAX_IMAGE_IMPORT_WAITERS) throw new HostError("too many image imports are already queued");
+ await new Promise<void>((resolve) => imageGate.waiters.push(resolve));
+ }
+ let released = false;
+ return () => {
+ if (released) return;
+ released = true;
+ const next = imageGate.waiters.shift();
+ if (next) next();
+ else imageGate.active = false;
+ };
+}
const SUPPORTED_MIME = new Set(["image/png", "image/webp", "image/jpeg", "application/json", "application/zip"]);
const WIRE_MIME = new Set([...SUPPORTED_MIME, "application/octet-stream"]);
const CHATGPT_AZURE_FILE_HOST = /^oaisdmntpr[a-z0-9]{2,40}\.blob\.core\.windows\.net$/;
@@ -148,14 +167,19 @@ export async function importOpenAiProvidedFile(opts: {
}) {
const file = providedFile(opts.file), url = trustedDownloadUrl(file.download_url, opts.allowChatGptAzureFamily === true), mimeType = declaredMime(file);
if (typeof file.size === "number" && (!Number.isFinite(file.size) || file.size < 0 || file.size > MAX_FILE_BYTES)) throw new HostError("file exceeds the 20 MiB MCP import limit");
- const response = await fetchTrustedFile(url, opts.allowChatGptAzureFamily === true);
- if (!response.ok) throw new HostError(`OpenAI file download failed (${response.status})`);
- const wireMime = responseMime(response);
- if (wireMime && wireMime !== "application/octet-stream" && wireMime !== mimeType) throw new HostError(`response file type ${wireMime} does not match ${mimeType}`);
- const data = await readBoundedBody(response);
- if (!(await validateBody(data, mimeType))) throw new HostError(`file content does not match ${mimeType}`);
- const fallbackExt = [...EXTENSION_MIME.entries()].find(([, mime]) => mime === mimeType)?.[0] || ".bin";
- const filename = safeFilename(opts.filename, file.file_name || file.name || `${file.file_id}${fallbackExt}`, mimeType);
- const stored = await uploadOneGuarded({ dest: opts.dest, filename, data, conflict: opts.conflict, expectedSha256: opts.expectedSha256 });
- return { ok: true as const, fileId: file.file_id, mimeType, bytes: data.byteLength, ...stored };
+ const release = mimeType.startsWith("image/") ? await acquireImageImportSlot() : null;
+ try {
+ const response = await fetchTrustedFile(url, opts.allowChatGptAzureFamily === true);
+ if (!response.ok) throw new HostError(`OpenAI file download failed (${response.status})`);
+ const wireMime = responseMime(response);
+ if (wireMime && wireMime !== "application/octet-stream" && wireMime !== mimeType) throw new HostError(`response file type ${wireMime} does not match ${mimeType}`);
+ const data = await readBoundedBody(response);
+ if (!(await validateBody(data, mimeType))) throw new HostError(`file content does not match ${mimeType}`);
+ const fallbackExt = [...EXTENSION_MIME.entries()].find(([, mime]) => mime === mimeType)?.[0] || ".bin";
+ const filename = safeFilename(opts.filename, file.file_name || file.name || `${file.file_id}${fallbackExt}`, mimeType);
+ const stored = await uploadOneGuarded({ dest: opts.dest, filename, data, conflict: opts.conflict, expectedSha256: opts.expectedSha256 });
+ return { ok: true as const, fileId: file.file_id, mimeType, bytes: data.byteLength, ...stored };
+ } finally {
+ release?.();
+ }
}