From 7516eb4bde8ea4b5696d11ba8bd143d8ea900e2f Mon Sep 17 00:00:00 2001 From: Apoorv Mishra Date: Tue, 12 Sep 2023 10:43:07 +0530 Subject: [PATCH] fix: use multipart middleware --- plugins/storage/server/api/files.ts | 28 +++++----------------------- plugins/storage/server/api/schema.ts | 2 ++ 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/plugins/storage/server/api/files.ts b/plugins/storage/server/api/files.ts index e9a48144a5..652a195e2a 100644 --- a/plugins/storage/server/api/files.ts +++ b/plugins/storage/server/api/files.ts @@ -1,15 +1,14 @@ import Router from "koa-router"; -import { bytesToHumanReadable } from "@shared/utils/files"; import env from "@server/env"; -import { AuthenticationError, InvalidRequestError } from "@server/errors"; +import { AuthenticationError } from "@server/errors"; import auth from "@server/middlewares/authentication"; +import multipart from "@server/middlewares/multipart"; import { rateLimiter } from "@server/middlewares/rateLimiter"; import validate from "@server/middlewares/validate"; import { Attachment } from "@server/models"; import { authorize } from "@server/policies"; import { APIContext } from "@server/types"; import { RateLimiterStrategy } from "@server/utils/RateLimiter"; -import { getFileFromRequest } from "@server/utils/koa"; import { createRootDirForLocalStorage } from "../utils"; import * as T from "./schema"; @@ -22,28 +21,11 @@ router.post( rateLimiter(RateLimiterStrategy.TenPerMinute), auth(), validate(T.FilesCreateSchema), + multipart({ maximumFileSize: env.FILE_STORAGE_UPLOAD_MAX_SIZE }), async (ctx: APIContext) => { - if (!ctx.is("multipart/form-data")) { - throw InvalidRequestError("Request type must be multipart/form-data"); - } - const file = getFileFromRequest(ctx.request); - if (!file) { - throw InvalidRequestError("Request must include a file parameter"); - } - - if ( - env.FILE_STORAGE_UPLOAD_MAX_SIZE && - file.size > env.FILE_STORAGE_UPLOAD_MAX_SIZE - ) { - throw InvalidRequestError( - `The selected file was larger than the ${bytesToHumanReadable( - env.FILE_STORAGE_UPLOAD_MAX_SIZE - )} maximum size` - ); - } - - const { key } = ctx.input.body; const actor = ctx.state.auth.user; + const { key } = ctx.input.body; + const file = ctx.input.file; const attachment = await Attachment.findByKey(key); diff --git a/plugins/storage/server/api/schema.ts b/plugins/storage/server/api/schema.ts index ba6da163b5..2dea96d685 100644 --- a/plugins/storage/server/api/schema.ts +++ b/plugins/storage/server/api/schema.ts @@ -1,3 +1,4 @@ +import formidable from "formidable"; import isEmpty from "lodash/isEmpty"; import { z } from "zod"; import { ValidateKey } from "@server/validation"; @@ -9,6 +10,7 @@ export const FilesCreateSchema = z.object({ .refine(ValidateKey.isValid, { message: ValidateKey.message }) .transform(ValidateKey.sanitize), }), + file: z.custom(), }); export type FilesCreateReq = z.infer;