2
0
Эх сурвалжийг харах

Add support to validate attachment uploads by an external program

Tobias Wolf 2 жил өмнө
parent
commit
b5d311c00c

+ 1 - 0
.devcontainer/Dockerfile

@@ -30,6 +30,7 @@ ENV \
     RICHER_CARD_COMMENT_EDITOR=false \
     CARD_OPENED_WEBHOOK_ENABLED=false \
     ATTACHMENTS_STORE_PATH="" \
+    ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \
     ATTACHMENTS_UPLOAD_MIME_TYPES="" \
     ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
     MAX_IMAGE_PIXEL="" \

+ 1 - 0
Dockerfile

@@ -33,6 +33,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
     ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS=90 \
+    ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \
     ATTACHMENTS_UPLOAD_MIME_TYPES="" \
     ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
     RICHER_CARD_COMMENT_EDITOR=false \

+ 1 - 0
docker-compose.yml

@@ -267,6 +267,7 @@ services:
       - CARD_OPENED_WEBHOOK_ENABLED=false
       #---------------------------------------------------------------
       # ==== Allow configuration to validate uploaded attachments ====
+      #-ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM=/usr/local/bin/avscan {file}
       #-ATTACHMENTS_UPLOAD_MIME_TYPES=image/*,text/*
       #-ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
       #---------------------------------------------------------------

+ 73 - 26
models/attachments.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { FilesCollection } from 'meteor/ostrio:files';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
 import { createBucket } from './lib/grid/createBucket';
 import fs from 'fs';
 import FileType from 'file-type';
@@ -7,12 +9,15 @@ import path from 'path';
 import { AttachmentStoreStrategyFilesystem, AttachmentStoreStrategyGridFs} from '/models/lib/attachmentStoreStrategy';
 import FileStoreStrategyFactory, {moveToStorage, rename, STORAGE_NAME_FILESYSTEM, STORAGE_NAME_GRIDFS} from '/models/lib/fileStoreStrategy';
 
+let asyncExec;
+let attachmentUploadExternalProgram;
 let attachmentUploadMimeTypes = [];
 let attachmentUploadSize = 0;
 let attachmentBucket;
 let storagePath;
 
 if (Meteor.isServer) {
+  asyncExec = promisify(exec);
   attachmentBucket = createBucket('attachments');
 
   if (process.env.ATTACHMENTS_UPLOAD_MIME_TYPES) {
@@ -28,6 +33,14 @@ if (Meteor.isServer) {
     }
   }
 
+  if (process.env.ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM) {
+    attachmentUploadExternalProgram = process.env.ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM;
+
+    if (!attachmentUploadExternalProgram.includes("{file}")) {
+      attachmentUploadExternalProgram = undefined;
+    }
+  }
+
   storagePath = path.join(process.env.WRITABLE_PATH, 'attachments');
 }
 
@@ -56,26 +69,6 @@ Attachments = new FilesCollection({
     return ret;
   },
   onAfterUpload(fileObj) {
-    let isValid = true;
-
-    if (attachmentUploadMimeTypes.length) {
-      const mimeTypeResult = Promise.await(FileType.fromFile(fileObj.path));
-
-      const mimeType = (mimeTypeResult ? mimeTypeResult.mime : fileObj.type);
-      const baseMimeType = mimeType.split('/', 1)[0];
-
-      isValid = attachmentUploadMimeTypes.includes(mimeType) || attachmentUploadMimeTypes.includes(baseMimeType + '/*') || attachmentUploadMimeTypes.includes('*');
-
-      if (!isValid) {
-        console.log("Validation of uploaded file failed: file " + fileObj.path + " - mimetype " + mimeType);
-      }
-    }
-
-    if (attachmentUploadSize && fileObj.size > attachmentUploadSize) {
-      console.log("Validation of uploaded file failed: file " + fileObj.path + " - size " + fileObj.size);
-      isValid = false;
-    }
-
     // current storage is the filesystem, update object and database
     Object.keys(fileObj.versions).forEach(versionName => {
       fileObj.versions[versionName].storage = STORAGE_NAME_FILESYSTEM;
@@ -83,12 +76,8 @@ Attachments = new FilesCollection({
 
     Attachments.update({ _id: fileObj._id }, { $set: { "versions" : fileObj.versions } });
 
-    if (isValid) {
-      let storage = fileObj.meta.copyStorage || STORAGE_NAME_GRIDFS;
-      moveToStorage(fileObj, storage, fileStoreStrategyFactory);
-    } else {
-      this.remove(fileObj._id);
-    }
+    let storageDestination = fileObj.meta.copyStorage || STORAGE_NAME_GRIDFS;
+    Meteor.defer(() => Meteor.call('validateAttachmentAndMoveToStorage', fileObj._id, storageDestination));
   },
   interceptDownload(http, fileObj, versionName) {
     const ret = fileStoreStrategyFactory.getFileStrategy(fileObj, versionName).interceptDownload(http, this.cacheControl);
@@ -148,6 +137,64 @@ if (Meteor.isServer) {
       const fileObj = Attachments.findOne({_id: fileObjId});
       rename(fileObj, newName, fileStoreStrategyFactory);
     },
+    validateAttachment(fileObjId) {
+      check(fileObjId, String);
+
+      const fileObj = Attachments.findOne({_id: fileObjId});
+      let isValid = true;
+
+      if (attachmentUploadMimeTypes.length) {
+        const mimeTypeResult = Promise.await(FileType.fromFile(fileObj.path));
+
+        const mimeType = (mimeTypeResult ? mimeTypeResult.mime : fileObj.type);
+        const baseMimeType = mimeType.split('/', 1)[0];
+
+        isValid = attachmentUploadMimeTypes.includes(mimeType) || attachmentUploadMimeTypes.includes(baseMimeType + '/*') || attachmentUploadMimeTypes.includes('*');
+
+        if (!isValid) {
+          console.log("Validation of uploaded file failed: file " + fileObj.path + " - mimetype " + mimeType);
+        }
+      }
+
+      if (attachmentUploadSize && fileObj.size > attachmentUploadSize) {
+        console.log("Validation of uploaded file failed: file " + fileObj.path + " - size " + fileObj.size);
+        isValid = false;
+      }
+
+      if (isValid && attachmentUploadExternalProgram) {
+        let args = { ...attachmentUploadExternalProgram.args };
+
+        for (let key in args) {
+          if (args[key] == "%file") {
+            args[key] = fileObj.path;
+          }
+        }
+
+        Promise.await(asyncExec(attachmentUploadExternalProgram.replace("{file}", '"' + fileObj.path + '"')));
+        isValid = fs.existsSync(fileObj.path);
+
+        if (!isValid) {
+          console.log("Validation of uploaded file failed: file " + fileObj.path + " has been deleted externally");
+        }
+      }
+
+      if (!isValid) {
+        Attachments.remove(fileObjId);
+      }
+    },
+    validateAttachmentAndMoveToStorage(fileObjId, storageDestination) {
+      check(fileObjId, String);
+      check(storageDestination, String);
+
+      Meteor.call('validateAttachment', fileObjId);
+
+      const fileObj = Attachments.findOne({_id: fileObjId});
+
+      if (fileObj) {
+        console.debug("Validation of uploaded file completed: file " + fileObj.path + " - storage destination " + storageDestination);
+        Meteor.defer(() => Meteor.call('moveAttachmentToStorage', fileObjId, storageDestination));
+      }
+    },
   });
 
   Meteor.startup(() => {

+ 1 - 0
releases/virtualbox/start-wekan.sh

@@ -49,6 +49,7 @@
       # - ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS=90
       #---------------------------------------------------------------
       # ==== Allow configuration to validate uploaded attachments ====
+      #export ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="/usr/local/bin/avscan {file}"
       #export ATTACHMENTS_UPLOAD_MIME_TYPES="image/*,text/*"
       #export ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
       #---------------------------------------------------------------

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
snap-src/bin/config


+ 6 - 0
snap-src/bin/wekan-help

@@ -125,6 +125,12 @@ echo -e "\t$ snap set $SNAP_NAME card-opened-webhook-enabled='true'"
 echo -e "Disable, default:"
 echo -e "\t$ snap unset $SNAP_NAME card-opened-webhook-enabled"
 echo -e "\n"
+echo -e "Attachments upload validation by an external program. {file} is replaced by the uploaded file. Example: /usr/local/bin/avscan {file}"
+echo -e "Enable:"
+echo -e "\t$ snap set $SNAP_NAME attachments-upload-external-program='/usr/local/bin/avscan {file}'"
+echo -e "Disable, default:"
+echo -e "\t$ snap unset $SNAP_NAME attachments-upload-external-program"
+echo -e "\n"
 echo -e "Attachments upload mime types. Example: image/*,text/*"
 echo -e "Enable:"
 echo -e "\t$ snap set $SNAP_NAME attachments-upload-mime-types='image/*,text/*'"

+ 1 - 0
start-wekan.sh

@@ -54,6 +54,7 @@
       # - ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS=90
       #---------------------------------------------------------------
       # ==== Allow configuration to validate uploaded attachments ====
+      #export ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="/usr/local/bin/avscan {file}"
       #export ATTACHMENTS_UPLOAD_MIME_TYPES="image/*,text/*"
       #export ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
       #---------------------------------------------------------------

+ 1 - 0
torodb-postgresql/docker-compose.yml

@@ -277,6 +277,7 @@ services:
       - CARD_OPENED_WEBHOOK_ENABLED=false
       #---------------------------------------------------------------
       # ==== Allow configuration to validate uploaded attachments ====
+      #-ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM=/usr/local/bin/avscan {file}
       #-ATTACHMENTS_UPLOAD_MIME_TYPES=image/*,text/*
       #-ATTACHMENTS_UPLOAD_MAX_SIZE=5000000
       #---------------------------------------------------------------

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно