checkFileSize in provider upload

packages/core/upload/server/config.js

@@ -4,9 +4,7 @@ module.exports = {
   default: {
     enabled: true,
     provider: 'local',
-    providerOptions: {
-      sizeLimit: 1000000,
-    },
+    sizeLimit: 1000000,
     actionOptions: {},
   },
   validator() {},

packages/core/upload/server/register.js

@@ -1,7 +1,9 @@
 'use strict';
 
+const { PayloadTooLargeError } = require('@strapi/utils/lib/errors');
 const _ = require('lodash');
 const registerUploadMiddleware = require('./middlewares/upload');
+const { kbytesToBytes } = require('./utils/file');
 
 /**
  * Register upload plugin
@@ -60,6 +62,25 @@ const createProvider = (config) => {
     );
   }
 
+  if (providerOptions.sizeLimit) {
+    // TODO V5: remove sizeLimit from providerOptions
+    process.emitWarning(
+      `[deprecated] In future versions, "sizeLimit" argument will be ignored from upload.config.providerOptions. Move it to upload.config`
+    );
+  }
+
+  if (!providerInstance.checkFileSize) {
+    providerInstance.checkFileSize = (file) => {
+      const fileSize = kbytesToBytes(file.size);
+
+      if (providerOptions.sizeLimit && fileSize > providerOptions.sizeLimit) {
+        throw new PayloadTooLargeError();
+      } else if (config.sizeLimit && fileSize > config.sizeLimit) {
+        throw new PayloadTooLargeError();
+      }
+    };
+  }
+
   const wrappedProvider = _.mapValues(providerInstance, (method, methodName) => {
     return async function (file, options = actionOptions[methodName]) {
       return providerInstance[methodName](file, options);

packages/core/upload/server/services/provider.js

@@ -5,6 +5,8 @@ const { streamToBuffer } = require('../utils/file');
 
 module.exports = ({ strapi }) => ({
   async upload(file) {
+    await strapi.plugin('upload').provider.checkFileSize(file);
+
     if (isFunction(strapi.plugin('upload').provider.uploadStream)) {
       file.stream = file.getStream();
       await strapi.plugin('upload').provider.uploadStream(file);

packages/core/upload/server/utils/file.js

@@ -6,6 +6,7 @@
 const { Writable } = require('stream');
 
 const bytesToKbytes = (bytes) => Math.round((bytes / 1000) * 100) / 100;
+const kbytesToBytes = (kbytes) => kbytes * 1000;
 
 const streamToBuffer = (stream) =>
   new Promise((resolve, reject) => {
@@ -46,6 +47,7 @@ function writableDiscardStream(options) {
 module.exports = {
   streamToBuffer,
   bytesToKbytes,
+  kbytesToBytes,
   getStreamSize,
   writableDiscardStream,
 };

packages/providers/upload-local/lib/index.js

@@ -9,18 +9,11 @@ const { pipeline } = require('stream');
 const fs = require('fs');
 const path = require('path');
 const fse = require('fs-extra');
-const { PayloadTooLargeError } = require('@strapi/utils').errors;
 
 const UPLOADS_FOLDER_NAME = 'uploads';
 
 module.exports = {
-  init({ sizeLimit = 1000000 } = {}) {
-    const verifySize = (file) => {
-      if (file.size > sizeLimit) {
-        throw new PayloadTooLargeError();
-      }
-    };
-
+  init() {
     // Ensure uploads folder exists
     const uploadPath = path.resolve(strapi.dirs.static.public, UPLOADS_FOLDER_NAME);
     if (!fse.pathExistsSync(uploadPath)) {
@@ -31,8 +24,6 @@ module.exports = {
 
     return {
       uploadStream(file) {
-        verifySize(file);
-
         return new Promise((resolve, reject) => {
           pipeline(
             file.stream,
@@ -50,8 +41,6 @@ module.exports = {
         });
       },
       upload(file) {
-        verifySize(file);
-
         return new Promise((resolve, reject) => {
           // write file in public/assets folder
           fs.writeFile(path.join(uploadPath, `${file.hash}${file.ext}`), file.buffer, (err) => {