Refactor malware scan initiation for AWS and Azure attachment services

Author: KoblerS

lib/aws-s3.js

@@ -274,23 +274,21 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
       })
 
       // Initiate malware scan if configured
-      if (this.kind === 's3') {
-        logConfig.debug('Initiating malware scan for uploaded file', {
-          fileId: metadata.ID,
-          filename: metadata.filename
-        })
+      logConfig.debug('Initiating malware scan for uploaded file', {
+        fileId: metadata.ID,
+        filename: metadata.filename
+      })
 
-        const scanRequestJob = cds.spawn(async () => {
-          await scanRequest(attachments, { ID: metadata.ID })
-        })
+      const scanRequestJob = cds.spawn(async () => {
+        await scanRequest(attachments, { ID: metadata.ID })
+      })
 
-        scanRequestJob.on('error', (err) => {
-          logConfig.withSuggestion('error',
-            'Failed to initiate malware scan for attachment', err,
-            'Check malware scanner configuration and connectivity',
-            { fileId: metadata.ID, filename: metadata.filename, errorMessage: err.message })
-        })
-      }
+      scanRequestJob.on('error', (err) => {
+        logConfig.withSuggestion('error',
+          'Failed to initiate malware scan for attachment', err,
+          'Check malware scanner configuration and connectivity',
+          { fileId: metadata.ID, filename: metadata.filename, errorMessage: err.message })
+      })
     } catch (err) {
       const duration = Date.now() - startTime
       logConfig.withSuggestion('error',

lib/azure-blob-storage.js

@@ -251,23 +251,21 @@ module.exports = class AzureAttachmentsService extends require("./basic") {
       })
 
       // Initiate malware scan if configured
-      if (this.kind === 'azure') {
-        logConfig.debug('Initiating malware scan for uploaded file', {
-          fileId: metadata.ID,
-          filename: metadata.filename
-        })
+      logConfig.debug('Initiating malware scan for uploaded file', {
+        fileId: metadata.ID,
+        filename: metadata.filename
+      })
 
-        const scanRequestJob = cds.spawn(async () => {
-          await scanRequest(attachments, { ID: metadata.ID })
-        })
+      const scanRequestJob = cds.spawn(async () => {
+        await scanRequest(attachments, { ID: metadata.ID })
+      })
 
-        scanRequestJob.on('error', (err) => {
-          logConfig.withSuggestion('error',
-            'Failed to initiate malware scan for attachment', err,
-            'Check malware scanner configuration and connectivity',
-            { fileId: metadata.ID, filename: metadata.filename, errorMessage: err.message })
-        })
-      }
+      scanRequestJob.on('error', (err) => {
+        logConfig.withSuggestion('error',
+          'Failed to initiate malware scan for attachment', err,
+          'Check malware scanner configuration and connectivity',
+          { fileId: metadata.ID, filename: metadata.filename, errorMessage: err.message })
+      })
     } catch (err) {
       const duration = Date.now() - startTime
       logConfig.withSuggestion('error',
@@ -428,11 +426,25 @@ module.exports = class AzureAttachmentsService extends require("./basic") {
   registerDraftUpdateHandlers(srv, mediaElements) {
     for (const mediaElement of mediaElements) {
       srv.prepend(() => {
-        srv.on(
-          "PUT",
-          mediaElement,
-          this.updateContentHandler.bind(this)
-        )
+        if (mediaElement.drafts) {
+          srv.on(
+            "PUT",
+            mediaElement.drafts,
+            this.updateContentHandler.bind(this)
+          )
+
+          // case: attachments uploaded in draft and deleted before saving
+          srv.before(
+            "DELETE",
+            mediaElement.drafts,
+            this.attachDraftDeletionData.bind(this)
+          )
+          srv.after(
+            "DELETE",
+            mediaElement.drafts,
+            this.deleteAttachmentsWithKeys.bind(this)
+          )
+        }
       })
     }
   }