diff --git a/core/services/package-manager.js b/core/services/package-manager.js index 793ecacf..003063ae 100644 --- 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 index 36ae3cb2..e0457c36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2178,6 +2178,15 @@ "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true }, + "dezalgo": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", + "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", + "requires": { + "asap": "^2.0.0", + "wrappy": "1" + } + }, "diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -3426,9 +3435,22 @@ } }, "formidable": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz", - "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz", + "integrity": "sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==", + "requires": { + "dezalgo": "1.0.3", + "hexoid": "1.0.0", + "once": "1.4.0", + "qs": "6.9.3" + }, + "dependencies": { + "qs": { + "version": "6.9.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", + "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" + } + } }, "formstream": { "version": "1.1.1", @@ -3887,6 +3909,11 @@ "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz", "integrity": "sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg==" }, + "hexoid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", + "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==" + }, "hmacsha1": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hmacsha1/-/hmacsha1-1.0.0.tgz", @@ -7204,6 +7231,12 @@ "mime-types": "^2.1.12" } }, + "formidable": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz", + "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==", + "dev": true + }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", diff --git a/package.json b/package.json index 83f264ad..03f0e6cb 100644 --- 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 index 03eb02c2..223bdb07 100644 --- 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) => {