wip

.config/cypress-devcontainer.yml

@@ -218,6 +218,3 @@ proxyBypassHosts:
 allowedPrivateNetworks: [
   '127.0.0.1/32'
 ]
-
-# Upload or download file size limits (bytes)
-#maxFileSize: 262144000

.config/docker_example.yml

@@ -234,9 +234,6 @@ proxyBypassHosts:
 #  '127.0.0.1/32'
 #]
 
-# Upload or download file size limits (bytes)
-#maxFileSize: 262144000
-
 # Log settings
 # logging:
 #   sql:

.config/example.yml

@@ -332,9 +332,6 @@ proxyBypassHosts:
 #  '127.0.0.1/32'
 #]
 
-# Upload or download file size limits (bytes)
-#maxFileSize: 262144000
-
 # PID File of master process
 #pidFile: /tmp/misskey.pid
 

.devcontainer/devcontainer.yml

@@ -205,6 +205,3 @@ proxyBypassHosts:
 allowedPrivateNetworks: [
   '127.0.0.1/32'
 ]
-
-# Upload or download file size limits (bytes)
-#maxFileSize: 262144000

CHANGELOG.md

@@ -6,6 +6,8 @@
   - proxyRemoteFiles
   - disallowExternalApRedirect
     - 許可しないかどうかではなく、許可するかどうかの設定(allowExternalApRedirect)になりました
+- 設定ファイルの maxFileSize が削除されました
+  - リクエストの最大ペイロードサイズは、nginxやCDNなどのMisskeyの前段で制限をするか、ロール設定で制限してください。
 
 ### General
 - Feat: 非ログインでサーバーを閲覧された際に、サーバー内のコンテンツを非公開にすることができるようになりました

chart/files/default.yml

@@ -224,6 +224,3 @@ id: "aidx"
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]
-
-# Upload or download file size limits (bytes)
-#maxFileSize: 262144000

packages/backend/src/config.ts

@@ -80,8 +80,6 @@ type Source = {
 
 	allowedPrivateNetworks?: string[];
 
-	maxFileSize?: number;
-
 	clusterLimit?: number;
 
 	id: string;
@@ -152,7 +150,6 @@ export type Config = {
 	proxySmtp: string | undefined;
 	proxyBypassHosts: string[] | undefined;
 	allowedPrivateNetworks: string[] | undefined;
-	maxFileSize: number;
 	clusterLimit: number | undefined;
 	id: string;
 	outgoingAddress: string | undefined;
@@ -293,7 +290,6 @@ export function loadConfig(): Config {
 		proxySmtp: config.proxySmtp,
 		proxyBypassHosts: config.proxyBypassHosts,
 		allowedPrivateNetworks: config.allowedPrivateNetworks,
-		maxFileSize: config.maxFileSize ?? 262144000,
 		clusterLimit: config.clusterLimit,
 		outgoingAddress: config.outgoingAddress,
 		outgoingAddressFamily: config.outgoingAddressFamily,

packages/backend/src/core/DownloadService.ts

@@ -41,7 +41,7 @@ export class DownloadService {
 
 		const timeout = 30 * 1000;
 		const operationTimeout = 60 * 1000;
-		const maxSize = this.config.maxFileSize;
+		const maxSize = 1024 * 1024 * 1024; // 1GB
 
 		const urlObj = new URL(url);
 		let filename = urlObj.pathname.split('/').pop() ?? 'untitled';

packages/backend/src/core/entities/MetaEntityService.ts

@@ -131,7 +131,6 @@ export class MetaEntityService {
 			mediaProxy: this.config.mediaProxy,
 			enableUrlPreview: instance.urlPreviewEnabled,
 			noteSearchableScope: (this.config.meilisearch == null || this.config.meilisearch.scope !== 'local') ? 'global' : 'local',
-			maxFileSize: this.config.maxFileSize,
 			federation: this.meta.federation,
 		};
 

packages/backend/src/models/json-schema/meta.ts

@@ -293,10 +293,6 @@ export const packedMetaLiteSchema = {
 			optional: false, nullable: false,
 			default: 'local',
 		},
-		maxFileSize: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
 		federation: {
 			type: 'string',
 			enum: ['all', 'specified', 'none'],

packages/backend/src/server/api/ApiServerService.ts

@@ -51,7 +51,6 @@ export class ApiServerService {
 
 		fastify.register(multipart, {
 			limits: {
-				fileSize: this.config.maxFileSize,
 				files: 1,
 			},
 		});