@midwayjs/upload 3.15.6 → 3.15.8

package/dist/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
-import { IgnoreMatcher } from '@midwayjs/core';
+import { IgnoreMatcher, IMidwayContext } from '@midwayjs/core';
 export type UploadMode = 'stream' | 'file';
 export interface UploadOptions {
     /**
@@ -14,7 +14,7 @@ export interface UploadOptions {
     /**
      * The white ext file names
      */
-    whitelist?: string[] | null;
+    whitelist?: string[] | null | ((ctx: IMidwayContext<any>) => string[]);
     /**
      * Temporary file directory
      */
@@ -38,7 +38,7 @@ export interface UploadOptions {
     /**
      * Mime type white list
      */
-    mimeTypeWhiteList?: Record<string, string | string[]>;
+    mimeTypeWhiteList?: Record<string, string | string[]> | ((ctx: IMidwayContext<any>) => string | string[]);
 }
 export interface UploadFileInfo<T> {
     filename: string;

package/dist/middleware.d.ts

@@ -1,10 +1,18 @@
 /// <reference types="node" />
-import { IMiddleware, IMidwayLogger, IgnoreMatcher } from '@midwayjs/core';
+import { IMiddleware, ILogger, IgnoreMatcher } from '@midwayjs/core';
 import { UploadOptions } from '.';
 export declare class UploadMiddleware implements IMiddleware<any, any> {
     uploadConfig: UploadOptions;
-    logger: IMidwayLogger;
+    logger: ILogger;
+    /**
+     * cache global upload white list when uploadConfig.whitelist is set
+     * @private
+     */
     private uploadWhiteListMap;
+    /**
+     * cache global upload mime type white list when uploadConfig.mimeTypeWhiteList is set
+     * @private
+     */
     private uploadFileMimeTypeMap;
     match: IgnoreMatcher<any>[];
     ignore: IgnoreMatcher<any>[];
@@ -13,8 +21,8 @@ export declare class UploadMiddleware implements IMiddleware<any, any> {
     execUpload(ctx: any, req: any, res: any, next: any, isExpress: any): Promise<any>;
     getUploadBoundary(request: any): false | string;
     isReadableStream(req: any, isExpress: any): boolean;
-    checkAndGetExt(filename: any): string | boolean;
-    checkFileType(ext: string, data: Buffer): Promise<{
+    checkAndGetExt(filename: any, whiteListMap?: Map<string, string>): string | boolean;
+    checkFileType(ext: string, data: Buffer, uploadFileMimeTypeMap?: Map<string, string[]>): Promise<{
         passed: boolean;
         mime?: string;
         current?: string;

package/dist/middleware.js

@@ -22,7 +22,15 @@ const utils_1 = require("./utils");
 const { unlink, writeFile } = fs_1.promises;
 let UploadMiddleware = class UploadMiddleware {
     constructor() {
+        /**
+         * cache global upload white list when uploadConfig.whitelist is set
+         * @private
+         */
         this.uploadWhiteListMap = new Map();
+        /**
+         * cache global upload mime type white list when uploadConfig.mimeTypeWhiteList is set
+         * @private
+         */
         this.uploadFileMimeTypeMap = new Map();
     }
     async init() {
@@ -34,7 +42,8 @@ let UploadMiddleware = class UploadMiddleware {
         }
     }
     resolve(app) {
-        if (Array.isArray(this.uploadConfig.whitelist)) {
+        if (this.uploadConfig.whitelist &&
+            Array.isArray(this.uploadConfig.whitelist)) {
             for (const whiteExt of this.uploadConfig.whitelist) {
                 this.uploadWhiteListMap.set(whiteExt, whiteExt);
             }
@@ -85,11 +94,30 @@ let UploadMiddleware = class UploadMiddleware {
                 }
             }));
         };
+        // create new map include custom white list
+        const currentContextWhiteListMap = new Map([
+            ...this.uploadWhiteListMap.entries(),
+        ]);
+        if (typeof this.uploadConfig.whitelist === 'function') {
+            const whiteListArray = this.uploadConfig.whitelist.call(this, ctx);
+            whiteListArray.forEach(ext => currentContextWhiteListMap.set(ext, ext));
+        }
+        // create new map include custom mime type white list
+        const currentContextMimeTypeWhiteListMap = new Map([
+            ...this.uploadFileMimeTypeMap.entries(),
+        ]);
+        if (typeof this.uploadConfig.mimeTypeWhiteList === 'function') {
+            const mimeTypeWhiteList = this.uploadConfig.mimeTypeWhiteList.call(this, ctx);
+            for (const ext in mimeTypeWhiteList) {
+                const mime = [].concat(mimeTypeWhiteList[ext]);
+                currentContextMimeTypeWhiteListMap.set(ext, mime);
+            }
+        }
         let body;
         if (this.isReadableStream(req, isExpress)) {
             if (mode === 'stream') {
                 const { fields, fileInfo } = await (0, parse_1.parseFromReadableStream)(req, boundary);
-                const ext = this.checkAndGetExt(fileInfo.filename);
+                const ext = this.checkAndGetExt(fileInfo.filename, currentContextWhiteListMap);
                 if (!ext) {
                     throw new _1.MultipartInvalidFilenameError(fileInfo.filename);
                 }
@@ -120,11 +148,11 @@ let UploadMiddleware = class UploadMiddleware {
         const requireId = `upload_${Date.now()}.${Math.random()}`;
         const files = data.files;
         for (const fileInfo of files) {
-            const ext = this.checkAndGetExt(fileInfo.filename);
+            const ext = this.checkAndGetExt(fileInfo.filename, currentContextWhiteListMap);
             if (!ext) {
                 throw new _1.MultipartInvalidFilenameError(fileInfo.filename);
             }
-            const { passed, mime, current } = await this.checkFileType(ext, fileInfo.data);
+            const { passed, mime, current } = await this.checkFileType(ext, fileInfo.data, currentContextMimeTypeWhiteListMap);
             if (!passed) {
                 throw new _1.MultipartInvalidFileTypeError(fileInfo.filename, current, mime);
             }
@@ -185,8 +213,8 @@ let UploadMiddleware = class UploadMiddleware {
         }
         return false;
     }
-    // check extentions
-    checkAndGetExt(filename) {
+    // check extensions
+    checkAndGetExt(filename, whiteListMap = this.uploadWhiteListMap) {
         const lowerCaseFileNameList = filename.toLowerCase().split('.');
         while (lowerCaseFileNameList.length) {
             lowerCaseFileNameList.shift();
@@ -194,20 +222,20 @@ let UploadMiddleware = class UploadMiddleware {
             if (this.uploadConfig.whitelist === null) {
                 return (0, utils_1.formatExt)(curExt);
             }
-            if (this.uploadWhiteListMap.has(curExt)) {
+            if (whiteListMap.has(curExt)) {
                 // Avoid the presence of hidden characters and return extensions in the white list.
-                return this.uploadWhiteListMap.get(curExt);
+                return whiteListMap.get(curExt);
             }
         }
         return false;
     }
     // check file-type
-    async checkFileType(ext, data) {
+    async checkFileType(ext, data, uploadFileMimeTypeMap = this.uploadFileMimeTypeMap) {
         // fileType == null, pass check
         if (!this.uploadConfig.mimeTypeWhiteList) {
             return { passed: true };
         }
-        const mime = this.uploadFileMimeTypeMap.get(ext);
+        const mime = uploadFileMimeTypeMap.get(ext);
         if (!mime) {
             return { passed: false, mime: ext };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/upload",
-  "version": "3.15.6",
+  "version": "3.15.8",
   "description": "Midway Component for upload",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -26,12 +26,12 @@
     "raw-body": "2.5.2"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.15.6",
-    "@midwayjs/express": "^3.15.6",
-    "@midwayjs/faas": "^3.15.6",
-    "@midwayjs/koa": "^3.15.6",
-    "@midwayjs/mock": "^3.15.6",
-    "@midwayjs/web": "^3.15.6"
+    "@midwayjs/core": "^3.15.8",
+    "@midwayjs/express": "^3.15.8",
+    "@midwayjs/faas": "^3.15.8",
+    "@midwayjs/koa": "^3.15.8",
+    "@midwayjs/mock": "^3.15.8",
+    "@midwayjs/web": "^3.15.8"
   },
-  "gitHead": "b04e58d015b8f4ffb48c98ad72180d88c70011e5"
+  "gitHead": "b9790dce4fac050c747893bc86dda0f044d827a9"
 }