File size: 4,232 Bytes
62cfde8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | diff --git a/lib/common.js b/lib/common.js
index 7c4841f..13b193f 100644
--- a/lib/common.js
+++ b/lib/common.js
@@ -35,6 +35,17 @@ const restrictedRoutes = [
{route: '/admin/file/delete', response: 'json'}
];
+// Allowed mime types for product images
+exports.allowedMimeType = [
+ 'image/jpeg',
+ 'image/png',
+ 'image/gif',
+ 'image/bmp',
+ 'image/webp'
+];
+
+exports.fileSizeLimit = 10485760;
+
// common functions
exports.restrict = (req, res, next) => {
exports.checkLogin(req, res, next);
diff --git a/routes/admin.js b/routes/admin.js
index 2199d8a..9ef5673 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -7,6 +7,7 @@ const fs = require('fs');
const path = require('path');
const multer = require('multer');
const glob = require('glob');
+const mime = require('mime-type/with-db');
const router = express.Router();
// Admin section
@@ -419,33 +420,54 @@ router.post('/admin/file/upload', common.restrict, common.checkAccess, upload.si
const db = req.app.db;
if(req.file){
- // check for upload select
- let uploadDir = path.join('public/uploads', req.body.directory);
-
- // Check directory and create (if needed)
- common.checkDirectorySync(uploadDir);
-
let file = req.file;
- let source = fs.createReadStream(file.path);
- let dest = fs.createWriteStream(path.join(uploadDir, file.originalname.replace(/ /g, '_')));
- // save the new file
- source.pipe(dest);
- source.on('end', () => { });
+ // Get the mime type of the file
+ const mimeType = mime.lookup(file.originalname);
+
+ // Check for allowed mime type and file size
+ if(!common.allowedMimeType.includes(mimeType) || file.size > common.fileSizeLimit){
+ // Remove temp file
+ fs.unlinkSync(file.path);
- // delete the temp file.
- fs.unlink(file.path, (err) => {
- if(err){
- console.info(err.stack);
- }
- });
+ // Redirect to error
+ req.session.message = 'File type not allowed or too large. Please try again.';
+ req.session.messageType = 'danger';
+ res.redirect('/admin/product/edit/' + req.body.productId);
+ return;
+ }
// get the product form the DB
db.products.findOne({_id: common.getId(req.body.productId)}, (err, product) => {
if(err){
console.info(err.stack);
+ // delete the temp file.
+ fs.unlinkSync(file.path);
+
+ // Redirect to error
+ req.session.message = 'File upload error. Please try again.';
+ req.session.messageType = 'danger';
+ res.redirect('/admin/product/edit/' + req.body.productId);
+ return;
}
- let imagePath = path.join('/uploads', req.body.directory, file.originalname.replace(/ /g, '_'));
+
+ const productPath = product.productPermalink;
+ let uploadDir = path.join('public/uploads', productPath);
+
+ // Check directory and create (if needed)
+ common.checkDirectorySync(uploadDir);
+
+ let source = fs.createReadStream(file.path);
+ let dest = fs.createWriteStream(path.join(uploadDir, file.originalname.replace(/ /g, '_')));
+
+ // save the new file
+ source.pipe(dest);
+ source.on('end', () => { });
+
+ // delete the temp file.
+ fs.unlinkSync(file.path);
+
+ let imagePath = path.join('/uploads', productPath, file.originalname.replace(/ /g, '_'));
// if there isn't a product featured image, set this one
if(!product.productImage){
@@ -464,6 +486,10 @@ router.post('/admin/file/upload', common.restrict, common.checkAccess, upload.si
}
});
}else{
+ // delete the temp file.
+ fs.unlinkSync(file.path);
+
+ // Redirect to error
req.session.message = 'File upload error. Please select a file.';
req.session.messageType = 'danger';
res.redirect('/admin/product/edit/' + req.body.productId);
|