feat(storage): Added cid property to storage files

nodemailer · Sep 21, 2023 · 2b45b77 · 2b45b77
1 parent a49bc11
commit 2b45b77
Show file tree

Hide file tree

Showing 8 changed files with 1,250 additions and 1,150 deletions.
diff --git a/api-tests-overview.md b/api-tests-overview.md
@@ -8,7 +8,6 @@
 | `/filters` | `GET` | 4 | ✅ (4) | ❌ (0) |
 | `/users` | `POST` | 4 | ✅ (3) | ✅ (1) |
 | `/users/:user/filters/:filter` | `PUT` | 4 | ✅ (4) | ❌ (0) |
-| `/users/:user/mailboxes` | `POST` | 4 | ✅ (3) | ✅ (1) |
 | `/users/:user/storage` | `GET` | 4 | ✅ (2) | ✅ (2) |
 | `/users/:user` | `PUT` | 3 | ✅ (3) | ❌ (0) |
 | `/users/:user/addresses/:address` | `DELETE` | 3 | ✅ (2) | ✅ (1) |
@@ -96,6 +95,7 @@
 | `/users/:user/autoreply` | `GET` | 0 | ❌ (0) | ❌ (0) |
 | `/users/:user/autoreply` | `DELETE` | 0 | ❌ (0) | ❌ (0) |
 | `/users/:user/filters/:filter` | `GET` | 0 | ❌ (0) | ❌ (0) |
+| `/users/:user/mailboxes` | `POST` | 0 | ❌ (0) | ❌ (0) |
 | `/users/:user/mailboxes/:mailbox` | `GET` | 0 | ❌ (0) | ❌ (0) |
 | `/users/:user/mailboxes/:mailbox` | `PUT` | 0 | ❌ (0) | ❌ (0) |
 | `/users/:user/mailboxes/:mailbox` | `DELETE` | 0 | ❌ (0) | ❌ (0) |

diff --git a/imap-core/lib/indexer/indexer.js b/imap-core/lib/indexer/indexer.js
@@ -561,6 +561,7 @@ class Indexer {
                         contentType,
                         disposition,
                         transferEncoding,
+                        cid: contentId ? `<${contentId}>` : null,
                         related,
                         // approximite size in kilobytes
                         sizeKb: Math.ceil((transferEncoding === 'base64' ? this.expectedB64Size(node.size) : node.size) / 1024)

diff --git a/lib/api/messages.js b/lib/api/messages.js
@@ -1783,7 +1783,8 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
                                 id: fileData.id,
                                 filename: fileData.filename,
                                 contentType: fileData.contentType,
-                                size: fileData.size
+                                size: fileData.size,
+                                cid: fileData.cid
                             });
                         }
                     } catch (err) {

diff --git a/lib/api/storage.js b/lib/api/storage.js
@@ -22,6 +22,7 @@ module.exports = (db, server, storageHandler) => {
                 encoding: Joi.string().empty('').valid('base64'),
 
                 content: Joi.binary().max(consts.MAX_ALLOWED_MESSAGE_SIZE).empty('').required(),
+                cid: Joi.string().empty('').max(255),
 
                 sess: sessSchema,
                 ip: sessIPSchema
@@ -214,6 +215,7 @@ module.exports = (db, server, storageHandler) => {
                     id: fileData._id.toString(),
                     filename: fileData.filename || false,
                     contentType: fileData.contentType || false,
+                    cid: fileData.metadata?.cid,
                     size: fileData.length,
                     created: fileData.uploadDate.toISOString(),
                     md5: fileData.md5

diff --git a/lib/storage-handler.js b/lib/storage-handler.js
@@ -18,8 +18,7 @@ class StorageHandler {
     }
 
     async add(user, options) {
-        let filename = options.filename;
-        let contentType = options.contentType;
+        let { filename, contentType, cid } = options;
 
         let filebase = 'upload-' + new Date().toISOString().substr(0, 10);
         if (!contentType && !filename) {
@@ -31,12 +30,18 @@ class StorageHandler {
             filename = filebase + '.' + libmime.detectExtension(contentType);
         }
 
+        let metadata = {
+            user
+        };
+
+        if (cid) {
+            metadata.cid = cid;
+        }
+
         return new Promise((resolve, reject) => {
             let store = this.gridstore.openUploadStream(filename, {
                 contentType,
-                metadata: {
-                    user
-                }
+                metadata
             });
 
             store.on('error', err => {
@@ -109,7 +114,8 @@ class StorageHandler {
                     filename: fileData.filename,
                     contentType: fileData.contentType,
                     size: fileData.length,
-                    content: Buffer.concat(chunks, chunklen)
+                    content: Buffer.concat(chunks, chunklen),
+                    cid: fileData.metadata?.cid
                 });
             });
         });