Merge commit '54dac1724c3f099928d7676c0a41d837bd48a057' into feat/tag-form-with-typeahead

src/client/js/components/PageEditor.js

@@ -115,33 +115,22 @@ export default class PageEditor extends React.Component {
 
   /**
    * the upload event handler
-   * @param {any} files
+   * @param {any} file
    */
   async onUpload(file) {
     try {
       let res = await this.props.crowi.apiGet('/attachments.limit', { _csrf: this.props.crowi.csrfToken, fileSize: file.size });
       if (!res.isUploadable) {
-        toastr.error(undefined, 'MongoDB for uploading files reaches limit', {
-          closeButton: true,
-          progressBar: true,
-          newestOnTop: false,
-          showDuration: '100',
-          hideDuration: '100',
-          timeOut: '5000',
-        });
-        throw new Error('MongoDB for uploading files reaches limit');
+        throw new Error(res.errorMessage);
       }
-      const endpoint = '/attachments.add';
 
-      // create a FromData instance
       const formData = new FormData();
       formData.append('_csrf', this.props.crowi.csrfToken);
       formData.append('file', file);
       formData.append('path', this.props.pagePath);
       formData.append('page_id', this.state.pageId || 0);
 
-      // post
-      res = await this.props.crowi.apiPost(endpoint, formData);
+      res = await this.props.crowi.apiPost('/attachments.add', formData);
       const attachment = res.attachment;
       const fileName = attachment.originalName;
 

src/server/models/page.js

@@ -310,12 +310,10 @@ module.exports = function(crowi) {
     const relatedTags = await PageTagRelation.find({ relatedPage: page._id }).populate('relatedTag').select('-_id relatedTag');
 
     // unlink relations
-    const unlinkTags = relatedTags.filter((tag) => { return !newTags.includes(tag.relatedTag.name) });
-    unlinkTags.forEach(async(tag) => {
-      await PageTagRelation.deleteMany({
-        relatedPage: page._id,
-        relatedTag: tag.relatedTag._id,
-      });
+    const unlinkTagRelations = relatedTags.filter((tag) => { return !newTags.includes(tag.relatedTag.name) });
+    await PageTagRelation.deleteMany({
+      relatedPage: page._id,
+      relatedTag: { $in: unlinkTagRelations.map((relation) => { return relation.relatedTag._id }) },
     });
 
     // create tag and relations

src/server/routes/attachment.js

@@ -100,10 +100,10 @@ module.exports = function(crowi, app) {
   }
 
   async function createAttachment(file, user, pageId = null) {
-    // check capacity
-    const isUploadable = await fileUploader.checkCapacity(file.size);
-    if (!isUploadable) {
-      throw new Error('File storage reaches limit');
+    // check limit
+    const res = await fileUploader.checkLimit(file.size);
+    if (!res.isUploadable) {
+      throw new Error(res.errorMessage);
     }
 
     const fileStream = fs.createReadStream(file.path, {
@@ -204,8 +204,7 @@ module.exports = function(crowi, app) {
    * @apiGroup Attachment
    */
   api.limit = async function(req, res) {
-    const isUploadable = await fileUploader.checkCapacity(req.query.fileSize);
-    return res.json(ApiResponse.success({ isUploadable }));
+    return res.json(ApiResponse.success(await fileUploader.checkLimit(req.query.fileSize)));
   };
 
   /**

src/server/service/config-loader.js

@@ -116,6 +116,12 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     default: null,
   },
+  MAX_FILE_SIZE: {
+    ns:      'crowi',
+    key:     'app:maxFileSize',
+    type:    TYPES.NUMBER,
+    default: Infinity,
+  },
   SAML_USES_ONLY_ENV_VARS_FOR_SOME_OPTIONS: {
     ns:      'crowi',
     key:     'security:passport-saml:useOnlyEnvVarsForSomeOptions',

src/server/service/file-uploader/aws.js

@@ -109,10 +109,14 @@ module.exports = function(crowi) {
   };
 
   /**
-   * chech storage for fileUpload reaches MONGO_GRIDFS_TOTAL_LIMIT (for gridfs)
+   * check the file size limit
+   *
+   * In detail, the followings are checked.
+   * - per-file size limit (specified by MAX_FILE_SIZE)
    */
-  lib.checkCapacity = async(uploadFileSize) => {
-    return true;
+  lib.checkLimit = async(uploadFileSize) => {
+    const maxFileSize = crowi.configManager.getConfig('crowi', 'app:maxFileSize');
+    return { isUploadable: uploadFileSize <= maxFileSize, errorMessage: 'File size exceeds the size limit per file' };
   };
 
   return lib;

src/server/service/file-uploader/gridfs.js

@@ -50,16 +50,29 @@ module.exports = function(crowi) {
   };
 
   /**
-   * chech storage for fileUpload reaches MONGO_GRIDFS_TOTAL_LIMIT (for gridfs)
+   * check the file size limit
+   *
+   * In detail, the followings are checked.
+   * - per-file size limit (specified by MAX_FILE_SIZE)
+   * - mongodb(gridfs) size limit (specified by MONGO_GRIDFS_TOTAL_LIMIT)
    */
-  lib.checkCapacity = async(uploadFileSize) => {
+  lib.checkLimit = async(uploadFileSize) => {
+    const maxFileSize = crowi.configManager.getConfig('crowi', 'app:maxFileSize');
+    if (uploadFileSize > maxFileSize) {
+      return { isUploadable: false, errorMessage: 'File size exceeds the size limit per file' };
+    }
+
     // skip checking if env var is undefined
     if (process.env.MONGO_GRIDFS_TOTAL_LIMIT == null) {
-      return true;
+      return { isUploadable: true };
     }
 
     const usingFilesSize = await getCollectionSize();
-    return (+process.env.MONGO_GRIDFS_TOTAL_LIMIT > usingFilesSize + +uploadFileSize);
+    if (usingFilesSize + uploadFileSize > +process.env.MONGO_GRIDFS_TOTAL_LIMIT) {
+      return { isUploadable: false, errorMessage: 'MongoDB for uploading files reaches limit' };
+    }
+
+    return { isUploadable: true };
   };
 
   lib.uploadFile = async function(fileStream, attachment) {

src/server/service/file-uploader/local.js

@@ -68,10 +68,14 @@ module.exports = function(crowi) {
   };
 
   /**
-   * chech storage for fileUpload reaches MONGO_GRIDFS_TOTAL_LIMIT (for gridfs)
+   * check the file size limit
+   *
+   * In detail, the followings are checked.
+   * - per-file size limit (specified by MAX_FILE_SIZE)
    */
-  lib.checkCapacity = async(uploadFileSize) => {
-    return true;
+  lib.checkLimit = async(uploadFileSize) => {
+    const maxFileSize = crowi.configManager.getConfig('crowi', 'app:maxFileSize');
+    return { isUploadable: uploadFileSize <= maxFileSize, errorMessage: 'File size exceeds the size limit per file' };
   };
 
   return lib;