Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/stack/build.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ export default defineBuildConfig({
"./src/plugins/comments/query-keys.ts",
// media plugin entries
"./src/plugins/media/api/index.ts",
"./src/plugins/media/api/adapters/local.ts",
"./src/plugins/media/api/adapters/s3.ts",
"./src/plugins/media/api/adapters/vercel-blob.ts",
"./src/plugins/media/client/index.ts",
Expand Down
15 changes: 14 additions & 1 deletion packages/stack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@btst/stack",
"version": "2.11.0",
"version": "2.11.1",
"description": "A composable, plugin-based library for building full-stack applications.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -424,6 +424,16 @@
"default": "./dist/plugins/media/api/index.cjs"
}
},
"./plugins/media/api/adapters/local": {
"import": {
"types": "./dist/plugins/media/api/adapters/local.d.ts",
"default": "./dist/plugins/media/api/adapters/local.mjs"
},
"require": {
"types": "./dist/plugins/media/api/adapters/local.d.cts",
"default": "./dist/plugins/media/api/adapters/local.cjs"
}
},
"./plugins/media/api/adapters/s3": {
"import": {
"types": "./dist/plugins/media/api/adapters/s3.d.ts",
Expand Down Expand Up @@ -684,6 +694,9 @@
"plugins/media/api": [
"./dist/plugins/media/api/index.d.ts"
],
"plugins/media/api/adapters/local": [
"./dist/plugins/media/api/adapters/local.d.ts"
],
"plugins/media/api/adapters/s3": [
"./dist/plugins/media/api/adapters/s3.d.ts"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,17 @@ describe("localAdapter", () => {
const adapter = localAdapter();
expect(adapter.type).toBe("local");
});

it("throws when a URL contains a path traversal sequence", async () => {
const uploadDir = await makeTmpDir();
const adapter = localAdapter({ uploadDir, publicPath: "/uploads" });

// Simulate a tampered URL that would resolve outside uploadDir after decoding.
const maliciousUrl = "/uploads/..%2F..%2Fetc%2Fpasswd";
await expect(adapter.delete(maliciousUrl)).rejects.toThrow(
"Refusing to delete file outside upload directory",
);
});
});

// ── S3 adapter ────────────────────────────────────────────────────────────────
Expand Down
11 changes: 10 additions & 1 deletion packages/stack/src/plugins/media/api/adapters/local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,16 @@ export function localAdapter(
if (!encodedFilename) return;
const filename = decodeURIComponent(encodedFilename);

const filePath = path.join(uploadDir, filename);
const resolvedUploadDir = path.resolve(uploadDir);
const filePath = path.join(resolvedUploadDir, filename);

// Guard against path traversal: reject any path that escapes uploadDir.
if (!filePath.startsWith(resolvedUploadDir + path.sep)) {
throw new Error(
`Refusing to delete file outside upload directory: ${filePath}`,
);
}

try {
await fs.unlink(filePath);
} catch (err: unknown) {
Expand Down
5 changes: 0 additions & 5 deletions packages/stack/src/plugins/media/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ export { serializeAsset, serializeFolder } from "./serializers";

export { MEDIA_QUERY_KEYS, assetListDiscriminator } from "./query-key-defs";

export {
localAdapter,
type LocalStorageAdapterOptions,
} from "./adapters/local";

export type {
StorageAdapter,
DirectStorageAdapter,
Expand Down
6 changes: 6 additions & 0 deletions packages/stack/src/plugins/media/api/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,10 @@ export const mediaBackendPlugin = (config: MediaBackendConfig) =>
listAssets: (params?: Parameters<typeof listAssets>[1]) =>
listAssets(adapter, params),
getAssetById: (id: string) => getAssetById(adapter, id),
createAsset: (input: Parameters<typeof createAsset>[1]) =>
createAsset(adapter, input),
updateAsset: (id: string, input: Parameters<typeof updateAsset>[2]) =>
updateAsset(adapter, id, input),
listFolders: (params?: Parameters<typeof listFolders>[1]) =>
listFolders(adapter, params),
getFolderById: (id: string) => getFolderById(adapter, id),
Expand All @@ -248,6 +252,8 @@ export const mediaBackendPlugin = (config: MediaBackendConfig) =>
parentId?: string | null,
tenantId?: string,
) => getFolderByName(adapter, name, parentId, tenantId),
createFolder: (input: Parameters<typeof createFolder>[1]) =>
createFolder(adapter, input),
}),

routes: (adapter: Adapter) => {
Expand Down
6 changes: 2 additions & 4 deletions scripts/codegen/files/nextjs/lib/stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import { formBuilderBackendPlugin } from "@btst/stack/plugins/form-builder/api";
import { openApiBackendPlugin } from "@btst/stack/plugins/open-api/api";
import { kanbanBackendPlugin } from "@btst/stack/plugins/kanban/api";
import { commentsBackendPlugin } from "@btst/stack/plugins/comments/api";
import {
mediaBackendPlugin,
localAdapter,
} from "@btst/stack/plugins/media/api";
import { mediaBackendPlugin } from "@btst/stack/plugins/media/api";
import { localAdapter } from "@btst/stack/plugins/media/api/adapters/local";
import { UI_BUILDER_CONTENT_TYPE } from "@btst/stack/plugins/ui-builder";
import { openai } from "@ai-sdk/openai";
import { tool } from "ai";
Expand Down
6 changes: 2 additions & 4 deletions scripts/codegen/files/react-router/app/lib/stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import { formBuilderBackendPlugin } from "@btst/stack/plugins/form-builder/api";
import { openApiBackendPlugin } from "@btst/stack/plugins/open-api/api";
import { kanbanBackendPlugin } from "@btst/stack/plugins/kanban/api";
import { commentsBackendPlugin } from "@btst/stack/plugins/comments/api";
import {
mediaBackendPlugin,
localAdapter,
} from "@btst/stack/plugins/media/api";
import { mediaBackendPlugin } from "@btst/stack/plugins/media/api";
import { localAdapter } from "@btst/stack/plugins/media/api/adapters/local";
import { UI_BUILDER_CONTENT_TYPE } from "@btst/stack/plugins/ui-builder";
import { openai } from "@ai-sdk/openai";
import { tool } from "ai";
Expand Down
6 changes: 2 additions & 4 deletions scripts/codegen/files/tanstack/src/lib/stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import { formBuilderBackendPlugin } from "@btst/stack/plugins/form-builder/api";
import { openApiBackendPlugin } from "@btst/stack/plugins/open-api/api";
import { kanbanBackendPlugin } from "@btst/stack/plugins/kanban/api";
import { commentsBackendPlugin } from "@btst/stack/plugins/comments/api";
import {
mediaBackendPlugin,
localAdapter,
} from "@btst/stack/plugins/media/api";
import { mediaBackendPlugin } from "@btst/stack/plugins/media/api";
import { localAdapter } from "@btst/stack/plugins/media/api/adapters/local";
import { UI_BUILDER_CONTENT_TYPE } from "@btst/stack/plugins/ui-builder";
import { openai } from "@ai-sdk/openai";
import { tool } from "ai";
Expand Down
Loading