eip-cloud-services 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [1.0.21] - 2023-06-21
+
+### Fixed
+- Bug where ACL's were not copied across when moving S3 objects.
+
+## [1.0.2] - 2023-06-21
+
+### Added
+- Initial release of the module.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-cloud-services",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Houses a collection of helpers for connecting with Cloud services.",
   "main": "index.js",
   "scripts": {
@@ -22,4 +22,4 @@
     "mysql": "^2.18.1",
     "redis": "^4.6.7"
   }
-}
+}

package/src/s3.js

@@ -41,6 +41,7 @@
 const { S3Client, HeadObjectCommand, GetObjectCommand, PutObjectCommand, DeleteObjectCommand, CopyObjectCommand, DeleteObjectsCommand } = require ( '@aws-sdk/client-s3' );
 const config = require ( 'config' );
 const zlib = require ( 'zlib' );
+const crypto = require ( 'crypto' );
 
 const S3 = new S3Client ( { region: 'eu-west-1' } );
 
@@ -92,6 +93,23 @@ exports.get = async ( key ) => {
         if ( response.ContentType !== 'application/json' ) {
             return data.toString ( 'utf8' );
         }
+        
+        if ( response.ContentType === 'application/json' && response.Metadata[ 'tmg-crypt' ] && response.Metadata[ 'tmg-crypt-vec' ] ) {
+            const key = await crypto.subtle.importKey (
+                'raw',
+                Buffer.from ( response.Metadata[ 'tmg-crypt' ], 'base64' ),
+                { name: 'AES-CBC', length: 256 },
+                false,
+                [ 'decrypt' ]
+            );
+            const iv = Buffer.from ( response.Metadata[ 'tmg-crypt-vec' ], 'base64' );
+            const decryptedArrayBuffer = await crypto.subtle.decrypt (
+                { name: 'AES-CBC', iv },
+                key,
+                Buffer.from ( data.toString (), 'base64' )
+            );
+            data = Buffer.from ( decryptedArrayBuffer ).toString ( 'utf8' );
+        }
 
         return JSON.parse ( data.toString ( 'utf8' ) );
     }
@@ -114,6 +132,8 @@ exports.get = async ( key ) => {
  * @param {string} [options.contentType='application/json'] - The content type of the object. Defaults to 'application/json'.
  * @param {string} [options.acl='public-read'] - The ACL (Access Control List) of the object. Defaults to 'public-read'.
  * @param {string} [options.cacheControl='max-age=25,s-maxage=30,must-revalidate'] - Sets cache control for the object.
+ * @param {boolean} [options.encrypt=false] - When storing JSON parsing this as true will encrypt the data with a random uuid stored in the metadata of the object.
+ * @param {object} [options.metadata={}] - Sets metadata for the object.
  * @returns {Promise} A promise that resolves when the object is successfully set in S3.
  * @description Sets an object in S3 with the provided key, body, and optional parameters.
  */
@@ -122,9 +142,34 @@ exports.set = async ( key, body, options = {} ) => {
         bucket = config.s3.Bucket,
         contentType = 'application/json',
         acl = 'public-read',
-        cacheControl = 'max-age=25,s-maxage=30,must-revalidate'
+        cacheControl = 'max-age=25,s-maxage=30,must-revalidate',
+        encrypt = false,
+        metadata = {}
     } = options;
-  
+    
+    if ( encrypt && contentType === 'application/json' ) {
+        const encoder = new TextEncoder ();
+        const data = encoder.encode ( body );
+
+        const encryptionKey = await crypto.subtle.generateKey (
+            { name: 'AES-CBC', length: 256 },
+            true,
+            [ 'encrypt', 'decrypt' ]
+        );
+        const iv = crypto.randomBytes ( 16 );
+        const exportedKey = await crypto.subtle.exportKey ( 'raw', encryptionKey );
+        const exportedIV = iv.toString ( 'base64' );
+        metadata[ 'Tmg-Crypt' ] = Buffer.from ( exportedKey ).toString ( 'base64' );
+        metadata[ 'Tmg-Crypt-Vec' ] = exportedIV;
+
+        const encryptedData = await crypto.subtle.encrypt (
+            { name: 'AES-CBC', iv },
+            encryptionKey,
+            data
+        );
+        body = Buffer.from ( encryptedData ).toString ( 'base64' );
+    }
+
     try {
         const command = new PutObjectCommand ( {
             Bucket: bucket,
@@ -132,7 +177,8 @@ exports.set = async ( key, body, options = {} ) => {
             Body: body,
             ContentType: contentType,
             ACL: acl,
-            CacheControl: cacheControl
+            CacheControl: cacheControl,
+            Metadata: metadata
         } );
   
         const data = await S3.send ( command );
@@ -140,6 +186,7 @@ exports.set = async ( key, body, options = {} ) => {
         return data;
     }
     catch ( error ) {
+        console.log ( error );
         throw error;
     }
 };
@@ -184,7 +231,9 @@ exports.move = async ( sourceKey, destinationKey, sourceBucket = config.s3.Bucke
         const copyCommand = new CopyObjectCommand ( {
             CopySource: `/${sourceBucket}/${sourceKey}`,
             Bucket: destinationBucket,
-            Key: destinationKey
+            Key: destinationKey,
+            ACL: 'public-read',
+            MetadataDirective: 'COPY',
         } );
   
         await S3.send ( copyCommand );