fix: Secure S3 attachments, bump SDK, refactoring

Closes #673

server/api/helpers/attachments/process-uploaded-file.js

@@ -1,7 +1,4 @@
-const fs = require('fs');
-const path = require('path');
-const rimraf = require('rimraf');
-const moveFile = require('move-file');
+const { rimraf } = require('rimraf');
 const { v4: uuid } = require('uuid');
 const sharp = require('sharp');
 
@@ -16,86 +13,19 @@ module.exports = {
   },
 
   async fn(inputs) {
-    const dirname = uuid();
+    const fileManager = sails.hooks['file-manager'].getInstance();
 
+    const dirname = uuid();
+    const folderPathSegment = `${sails.config.custom.attachmentsPathSegment}/${dirname}`;
     const filename = filenamify(inputs.file.filename);
 
-    const rootPath = path.join(sails.config.custom.attachmentsPath, dirname);
-    const filePath = path.join(rootPath, filename);
+    const filePath = await fileManager.move(
+      inputs.file.fd,
+      `${folderPathSegment}/${filename}`,
+      inputs.file.type,
+    );
 
-    if (sails.config.custom.s3Config) {
-      const client = await sails.helpers.utils.getSimpleStorageServiceClient();
-      const s3Image = await client.upload({
-        Body: fs.createReadStream(inputs.file.fd),
-        Key: `attachments/${dirname}/${filename}`,
-        ContentType: inputs.file.type,
-      });
-
-      let image = sharp(inputs.file.fd, {
-        animated: true,
-      });
-
-      let metadata;
-      try {
-        metadata = await image.metadata();
-      } catch (error) {} // eslint-disable-line no-empty
-
-      const fileData = {
-        type: 's3',
-        dirname,
-        filename,
-        thumb: null,
-        image: null,
-        url: s3Image.Location,
-        name: inputs.file.filename,
-      };
-
-      if (metadata && !['svg', 'pdf'].includes(metadata.format)) {
-        let { width, pageHeight: height = metadata.height } = metadata;
-        if (metadata.orientation && metadata.orientation > 4) {
-          [image, width, height] = [image.rotate(), height, width];
-        }
-
-        const isPortrait = height > width;
-        const thumbnailsExtension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
-
-        try {
-          const resizeBuffer = await image
-            .resize(
-              256,
-              isPortrait ? 320 : undefined,
-              width < 256 || (isPortrait && height < 320)
-                ? {
-                    kernel: sharp.kernel.nearest,
-                  }
-                : undefined,
-            )
-            .toBuffer();
-          const s3Thumb = await client.upload({
-            Key: `attachments/${dirname}/thumbnails/cover-256.${thumbnailsExtension}`,
-            Body: resizeBuffer,
-            ContentType: inputs.file.type,
-          });
-          fileData.thumb = s3Thumb.Location;
-          fileData.image = { width, height };
-        } catch (error1) {
-          console.warn(error2.stack); // eslint-disable-line no-console
-        }
-      }
-
-      try {
-        rimraf.sync(inputs.file.fd);
-      } catch (error) {
-        console.warn(error.stack); // eslint-disable-line no-console
-      }
-
-      return fileData;
-    }
-
-    fs.mkdirSync(rootPath);
-    await moveFile(inputs.file.fd, filePath);
-
-    let image = sharp(filePath, {
+    let image = sharp(filePath || inputs.file.fd, {
       animated: true,
     });
 
@@ -105,7 +35,6 @@ module.exports = {
     } catch (error) {} // eslint-disable-line no-empty
 
     const fileData = {
-      type: 'local',
       dirname,
       filename,
       image: null,
@@ -113,9 +42,6 @@ module.exports = {
     };
 
     if (metadata && !['svg', 'pdf'].includes(metadata.format)) {
-      const thumbnailsPath = path.join(rootPath, 'thumbnails');
-      fs.mkdirSync(thumbnailsPath);
-
       let { width, pageHeight: height = metadata.height } = metadata;
       if (metadata.orientation && metadata.orientation > 4) {
         [image, width, height] = [image.rotate(), height, width];
@@ -125,7 +51,7 @@ module.exports = {
       const thumbnailsExtension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
 
       try {
-        await image
+        const resizeBuffer = await image
           .resize(
             256,
             isPortrait ? 320 : undefined,
@@ -135,19 +61,29 @@ module.exports = {
                 }
               : undefined,
           )
-          .toFile(path.join(thumbnailsPath, `cover-256.${thumbnailsExtension}`));
+          .toBuffer();
+
+        await fileManager.save(
+          `${folderPathSegment}/thumbnails/cover-256.${thumbnailsExtension}`,
+          resizeBuffer,
+          inputs.file.type,
+        );
 
         fileData.image = {
           width,
           height,
           thumbnailsExtension,
         };
-      } catch (error1) {
-        try {
-          rimraf.sync(thumbnailsPath);
-        } catch (error2) {
-          console.warn(error2.stack); // eslint-disable-line no-console
-        }
+      } catch (error) {
+        console.warn(error.stack); // eslint-disable-line no-console
+      }
+    }
+
+    if (!filePath) {
+      try {
+        await rimraf(inputs.file.fd);
+      } catch (error) {
+        console.warn(error.stack); // eslint-disable-line no-console
       }
     }