From e80113ae6f07c5c1b6447259990298bc8f9772d9 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 27 Jul 2024 10:52:42 +0900
Subject: [PATCH] chore (backend): fix default maxFileSize value
---
packages/backend-rs/index.d.ts | 2 +-
packages/backend-rs/src/config/server.rs | 4 ++--
packages/backend/src/misc/download-url.ts | 2 +-
packages/backend/src/server/api/index.ts | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index ca7bd247cc..e6a1e5d0ec 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -217,7 +217,7 @@ export interface Config {
proxySmtp?: string
proxyBypassHosts?: Array<string>
allowedPrivateNetworks?: Array<string>
- maxFileSize?: number
+ maxFileSize: number
accessLog?: string
clusterLimits: WorkerConfig
cuid?: IdConfig
diff --git a/packages/backend-rs/src/config/server.rs b/packages/backend-rs/src/config/server.rs
index 19f4d19da0..37af3587c8 100644
--- a/packages/backend-rs/src/config/server.rs
+++ b/packages/backend-rs/src/config/server.rs
@@ -200,7 +200,7 @@ pub struct Config {
pub proxy_smtp: Option<String>,
pub proxy_bypass_hosts: Option<Vec<String>>,
pub allowed_private_networks: Option<Vec<String>>,
- pub max_file_size: Option<i64>,
+ pub max_file_size: i64,
pub access_log: Option<String>,
pub cluster_limits: WorkerConfig,
pub cuid: Option<IdConfig>,
@@ -309,7 +309,7 @@ pub fn load_config() -> Config {
proxy_smtp: server_config.proxy_smtp,
proxy_bypass_hosts: server_config.proxy_bypass_hosts,
allowed_private_networks: server_config.allowed_private_networks,
- max_file_size: server_config.max_file_size,
+ max_file_size: server_config.max_file_size.unwrap_or(262144000),
access_log: server_config.access_log,
cluster_limits,
cuid: server_config.cuid,
diff --git a/packages/backend/src/misc/download-url.ts b/packages/backend/src/misc/download-url.ts
index 08dedcd3ed..6c3aea650d 100644
--- a/packages/backend/src/misc/download-url.ts
+++ b/packages/backend/src/misc/download-url.ts
@@ -20,7 +20,7 @@ export async function downloadUrl(url: string, path: string): Promise<void> {
const timeout = 30 * 1000;
const operationTimeout = 60 * 1000;
- const maxSize = config.maxFileSize || 262144000;
+ const maxSize = config.maxFileSize;
const req = got
.stream(url, {
diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index f5bf3bf097..0fd443e99e 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -43,7 +43,7 @@ const errorRouter = new Router();
const upload = multer({
storage: multer.diskStorage({}),
limits: {
- fileSize: config.maxFileSize || 262144000,
+ fileSize: config.maxFileSize,
files: 1,
},
});