fix(deps): update formidable to v2

shm-open · Nov 23, 2021 · 9949913 · 9949913
1 parent 41b5bb1
commit 9949913
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 10 deletions.
diff --git a/core/services/package-manager.js b/core/services/package-manager.js
@@ -45,15 +45,14 @@ proto.findLatestPackageInfoByDeployVersion = function (deploymentsVersionsId) {
 proto.parseReqFile = function (req) {
     log.debug('parseReqFile');
     return new Promise((resolve, reject) => {
-        var form = new formidable.IncomingForm();
-        form.maxFieldsSize = 200 * 1024 * 1024;
+        var form = formidable();
         form.parse(req, (err, fields, files) => {
             if (err) {
                 log.debug('parseReqFile:', err);
                 reject(new AppError.AppError('upload error'));
             } else {
                 log.debug('parseReqFile fields:', fields);
-                log.debug('parseReqFile file location:', _.get(files, 'package.path'));
+                log.debug('parseReqFile file location:', _.get(files, 'package.filepath'));
                 if (_.isEmpty(fields.packageInfo) || _.isEmpty(_.get(files, 'package'))) {
                     log.debug('parseReqFile upload info lack');
                     reject(new AppError.AppError('upload info lack'));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "diff-match-patch": "1.0.5",
     "express": "4.17.1",
     "extract-zip": "2.0.1",
-    "formidable": "1.2.6",
+    "formidable": "2.0.1",
     "fs-extra": "10.0.0",
     "helmet": "4.6.0",
     "jschardet": "3.0.0",

diff --git a/routes/apps.js b/routes/apps.js
@@ -303,7 +303,7 @@ router.post(
                         return packageManager
                             .parseReqFile(req)
                             .then((data) => {
-                                if (data.package.type != 'application/zip') {
+                                if (data.package.mimetype != 'application/zip') {
                                     log.debug(`upload file type is invlidate`, data.package);
                                     throw new AppError.AppError('upload file type is invalidate');
                                 }
@@ -313,11 +313,11 @@ router.post(
                                         deploymentInfo.appid,
                                         deploymentInfo.id,
                                         data.packageInfo,
-                                        data.package.path,
+                                        data.package.filepath,
                                         uid,
                                     )
                                     .finally(() => {
-                                        common.deleteFolderSync(data.package.path);
+                                        common.deleteFolderSync(data.package.filepath);
                                     });
                             })
                             .then((packages) => {