diff --git a/apps/api/src/modules/projects/folder/folder.service.test.ts b/apps/api/src/modules/projects/folder/folder.service.test.ts index 02b956160..ac85c40ac 100644 --- a/apps/api/src/modules/projects/folder/folder.service.test.ts +++ b/apps/api/src/modules/projects/folder/folder.service.test.ts @@ -59,7 +59,7 @@ describe("scanFolderSession", () => { expect(resolveFromLocalMock).toHaveBeenCalledWith(stagingDir, { env: { MY_VERSION: "1.2.3" }, composePath: "deploy/compose.yaml", - }); + }, "app"); expect(result.services).toBe(refreshed); expect(upload.services).toBe(initial); }); diff --git a/apps/api/test/modules/projects/folder-upload.test.ts b/apps/api/test/modules/projects/folder-upload.test.ts index 4360dc34f..9cc62e6a2 100644 --- a/apps/api/test/modules/projects/folder-upload.test.ts +++ b/apps/api/test/modules/projects/folder-upload.test.ts @@ -80,11 +80,11 @@ afterAll(async () => { if (root) await rm(root, { recursive: true, force: true }); }); -async function open() { +async function open(name?: string) { const response = await fetch(`${origin}/api/projects/folder/session`, { method: "POST", headers: { ...owner.auth, "Content-Type": "application/json" }, - body: JSON.stringify(env.CLOUD_MODE ? { serverId: managedServerId } : {}), + body: JSON.stringify({ ...(env.CLOUD_MODE ? { serverId: managedServerId } : {}), ...(name ? { name } : {}) }), }); expect(response.status).toBe(200); const target = (await response.json()) as FolderSessionResult; @@ -117,6 +117,33 @@ function upload(target: FolderSessionResult, bytes = archive, chunked = false) { describe.each([false, true])("authenticated folder upload over HTTP (Cloud: %s)", (cloudMode) => { beforeEach(() => { env.CLOUD_MODE = cloudMode; }); + it.each([undefined, "my-folder-app"])("uses a client name or stable fallback instead of the staging path: %s", async (name) => { + const target = await open(name); + const uploaded = await upload(target); + expect(uploaded.status).toBe(200); + const response = await fetch(`${origin}/api/projects/folder/scan/${target.sessionId}`, { + method: "POST", headers: { ...owner.auth, "Content-Type": "application/json" }, body: "{}", + }); + expect(response.status, await response.clone().text()).toBe(200); + expect(await response.json()).toMatchObject({ name: name ?? "app" }); + }); + + it("returns the safe Compose refusal through the actual folder scan route", async () => { + const source = await mkdtemp(join(root, "host-network-")); + await writeFile(join(source, "compose.yaml"), "services:\n web:\n image: nginx:alpine\n network_mode: host\n"); + const packed = await archiveSourceDirectory(source, { temporaryRoot: join(root, "archives") }); + try { + const target = await open(); + expect((await upload(target, await readFile(packed.path))).status).toBe(200); + const response = await fetch(`${origin}/api/projects/folder/scan/${target.sessionId}`, { + method: "POST", headers: { ...owner.auth, "Content-Type": "application/json" }, body: "{}", + }); + expect(response.status).toBe(400); + expect(await response.json()).toMatchObject({ + code: "COMPOSE_CONFIGURATION_INVALID", error: expect.stringContaining("network_mode"), + }); + } finally { await packed.dispose(); } + }); it.each([false, true])("preserves every byte above 10 MiB (chunked: %s)", async (chunked) => { const target = await open(); const response = await upload(target, archive, chunked); @@ -133,7 +160,8 @@ describe.each([false, true])("authenticated folder upload over HTTP (Cloud: %s)" it("rejects a truncated gzip, cleans temporary files, and allows a complete retry", async () => { const target = await open(); const response = await upload(target, archive.subarray(0, 10 * 1024 * 1024)); - expect(response.status, await response.text()).toBe(400); + expect(response.status).toBe(400); + expect(await response.json()).toMatchObject({ error: expect.stringMatching(/incomplete|truncated/i) }); const session = getFolderSession(target.sessionId)!; expect(session.uploaded).toBe(false); expect(session.uploading).toBe(false); diff --git a/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts b/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts index 7859cba96..1626849fa 100644 --- a/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts +++ b/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts @@ -1,4 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { createHash } from "node:crypto"; import { NextRequest } from "next/server"; import { errorReporter, consoleErrorSink, type ErrorEvent } from "@repo/core/diagnostics"; @@ -27,6 +28,21 @@ afterEach(async () => { upstreamFetch.mockReset(); }); +it("streams folder uploads larger than the middleware default without changing their bytes", async () => { + const bytes = new Uint8Array(12 * 1024 * 1024).fill(117); + upstreamFetch.mockImplementationOnce(async (_url, init) => { + const received = new Uint8Array(await new Response(init?.body).arrayBuffer()); + expect(createHash("sha256").update(received).digest("hex")).toBe(createHash("sha256").update(bytes).digest("hex")); + expect(new Headers(init?.headers).get("authorization")).toBe("Bearer upload-test"); + return Response.json({ received: received.length }); + }); + const response = await POST(new NextRequest("https://ops.example.com/api/proxy/api/projects/folder/upload/session", { + method: "POST", headers: { authorization: "Bearer upload-test", "Content-Type": "application/gzip" }, body: bytes, + }), { params: Promise.resolve({ path: ["api", "projects", "folder", "upload", "session"] }) }); + expect(response.status).toBe(200); + expect(await response.json()).toEqual({ received: bytes.length }); +}); + it("correlates proxy network failures without logging credentials or request contents", async () => { upstreamFetch.mockRejectedValueOnce(Object.assign(new Error("Connection refused"), { code: "ECONNREFUSED", headers: { authorization: "private-proxy-token-913" }, diff --git a/apps/dashboard/src/proxy.test.ts b/apps/dashboard/src/proxy.test.ts index 6746ee9ea..59b96828a 100644 --- a/apps/dashboard/src/proxy.test.ts +++ b/apps/dashboard/src/proxy.test.ts @@ -1,8 +1,17 @@ import { describe, expect, it } from "vitest"; import { NextRequest } from "next/server"; -import { proxy } from "./proxy"; +import { unstable_doesMiddlewareMatch } from "next/experimental/testing/server"; +import { config, proxy } from "./proxy"; describe("dashboard proxy middleware", () => { + it.each(["/api", "/api/proxy/api/projects/folder/upload/session", "/api/auth/sign-in/email", "/api/mcp"])( + "does not buffer API request bodies through middleware: %s", (url) => { + expect(unstable_doesMiddlewareMatch({ config, nextConfig: {}, url })).toBe(false); + }, + ); + it.each(["/projects", "/login", "/api-docs"])("still matches page requests: %s", (url) => { + expect(unstable_doesMiddlewareMatch({ config, nextConfig: {}, url })).toBe(true); + }); it("mirrors a valid theme cookie for the initial server render", () => { const response = proxy(new NextRequest("https://app.openship.io/login", { headers: { cookie: "openship-theme=system:dim", "x-openship-theme": "light:light" }, diff --git a/apps/dashboard/src/proxy.ts b/apps/dashboard/src/proxy.ts index 0801bfe61..66af7a4f9 100644 --- a/apps/dashboard/src/proxy.ts +++ b/apps/dashboard/src/proxy.ts @@ -90,5 +90,7 @@ export function proxy(req: NextRequest) { } export const config = { - matcher: ["/((?!_next/static|_next/image|favicon.ico|.*\\..*).*)"], + // API routes authenticate in the API process. Matching them here makes Next + // clone/buffer uploads, truncating the stream at its middleware body limit. + matcher: ["/((?!api(?:/|$)|_next/static|_next/image|favicon.ico|.*\\..*).*)"], }; diff --git a/packages/platform/src/engine/modules/deployments/compose-configuration-error.ts b/packages/platform/src/engine/modules/deployments/compose-configuration-error.ts index 89210d3ef..4758070f5 100644 --- a/packages/platform/src/engine/modules/deployments/compose-configuration-error.ts +++ b/packages/platform/src/engine/modules/deployments/compose-configuration-error.ts @@ -6,9 +6,12 @@ * service shape, but must never do that for this error: deploying stale Compose * configuration after the file changed is less safe than refusing the deploy. */ -export class ComposeConfigurationError extends Error { +import { AppError } from "@repo/core"; + +export class ComposeConfigurationError extends AppError { constructor(message: string, options?: ErrorOptions) { - super(message, options); + super(message, 400, "COMPOSE_CONFIGURATION_INVALID"); + if (options?.cause !== undefined) this.cause = options.cause; this.name = "ComposeConfigurationError"; } } diff --git a/packages/platform/src/engine/modules/deployments/local-source.ts b/packages/platform/src/engine/modules/deployments/local-source.ts index bd03064d7..a7fbbf3bc 100644 --- a/packages/platform/src/engine/modules/deployments/local-source.ts +++ b/packages/platform/src/engine/modules/deployments/local-source.ts @@ -95,6 +95,7 @@ export async function resolveSourceEnvFromLocal( export async function resolveFromLocal( dirPath: string, opts: ResolveOptions = {}, + fallbackName = basename(dirPath), ): Promise { const st = await stat(dirPath); if (!st.isDirectory()) { @@ -103,7 +104,7 @@ export async function resolveFromLocal( const reader = createLocalReader(dirPath); const rootPackageJson = await reader.readJson("package.json"); - const name = (rootPackageJson?.name as string) ?? basename(dirPath); + const name = (rootPackageJson?.name as string) || fallbackName; return resolveFromReader( reader, diff --git a/packages/platform/src/engine/modules/projects/folder/folder.service.ts b/packages/platform/src/engine/modules/projects/folder/folder.service.ts index 0b9a6c717..06e68493d 100644 --- a/packages/platform/src/engine/modules/projects/folder/folder.service.ts +++ b/packages/platform/src/engine/modules/projects/folder/folder.service.ts @@ -257,5 +257,6 @@ async function scanSource(session: FolderSession, opts: ResolveOptions = {}) { const st = await stat(session.stagingDir).catch((diagnosticFailure) => { observeCaughtError(diagnosticFailure, "platform/engine/modules/projects/folder/folder.service"); return null; }); if (!st?.isDirectory()) throw new Error("Uploaded source not found"); const { resolveFromLocal } = await import("../../deployments/local-source"); - return resolveFromLocal(session.stagingDir, opts); + // Staging paths are private implementation details, not project names. + return resolveFromLocal(session.stagingDir, opts, session.name?.trim() || "app"); } diff --git a/packages/platform/src/source-archive.ts b/packages/platform/src/source-archive.ts index 6942c6e65..0f97e1635 100644 --- a/packages/platform/src/source-archive.ts +++ b/packages/platform/src/source-archive.ts @@ -62,6 +62,8 @@ export async function extractSourceArchive(archive: string, destination: string) await pipeline(createReadStream(archive), createGunzip(), sourceByteLimit(MAX_SOURCE_BYTES + MAX_SOURCE_ENTRIES * 1024 + 16 * 1024 * 1024), parser); } catch (error) { if (validationError) throw validationError; + if ((error as { code?: string }).code === "Z_BUF_ERROR") + throw new ValidationError("Source archive is incomplete or truncated. Retry the upload (maximum 300MB)."); if (/^(?:TAR_|Z_)/.test(String((error as { code?: string }).code))) throw new ValidationError("Invalid source archive"); throw error; } diff --git a/packages/sdk/src/source-workflow.ts b/packages/sdk/src/source-workflow.ts index a57e397fc..4362fca95 100644 --- a/packages/sdk/src/source-workflow.ts +++ b/packages/sdk/src/source-workflow.ts @@ -15,7 +15,7 @@ export async function deploySourceWorkflow(ship: { projects: ProjectOperations; step("Creating project"); const hasBuild = Boolean(scan.buildCommand) || runtimeNeedsInstall(scan.stack, scan.runtimeVersion, scan.installCommand), hasServer = scan.workloadType !== "worker" && Boolean(scan.startCommand); const ensured = await ship.projects.ensure(parseInput(EnsureProjectBody, { - name: scan.name || input.name || "app", projectId: input.projectId, serverId, + name: input.name || scan.name || "app", projectId: input.projectId, serverId, deploymentEnvironment: input.environment, gitProvider: "upload", uploadSessionId: session.sessionId, framework: scan.stack, projectType: scan.projectType, packageManager: scan.packageManager, diff --git a/packages/sdk/test/sources.test.ts b/packages/sdk/test/sources.test.ts index 3af808d9c..58244da81 100644 --- a/packages/sdk/test/sources.test.ts +++ b/packages/sdk/test/sources.test.ts @@ -122,7 +122,7 @@ describe("SDK source deployments", () => { expect(s.tar()).toContain("initial-content"); expect(s.tar()).toContain("published-site"); expect(s.commands[2]?.body).toMatchObject({ - projectId: "existing", serverId: "server-a", name: "detected", deploymentEnvironment: "preview", + projectId: "existing", serverId: "server-a", name: "app", deploymentEnvironment: "preview", }); expect(s.commands[3]?.body).toMatchObject({ projectId: "project-a", uploadSessionId: "session/opaque", serverId: "server-a",