remove x-filename

Author: NickOvt

lib/api/messages.js

@@ -1798,8 +1798,6 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
 
             let [attachmentCharset] = getAttachmentCharset(messageData.mimeTree, attachment);
             let [attachmentContentDisposition] = getAttachmentContentDisposition(messageData.mimeTree, attachment);
-            let [attachmentFilename] = getAttachmentFilename(messageData.mimeTree, attachment);
-
             let headers = {
                 'Content-Type': attachmentData.contentType || 'application/octet-stream'
             };
@@ -1808,10 +1806,6 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
                 headers['Content-Disposition'] = attachmentContentDisposition;
             }
 
-            if (attachmentFilename) {
-                headers['X-Filename'] = attachmentFilename;
-            }
-
             res.writeHead(200, headers);
 
             let decode = true;
@@ -4384,25 +4378,3 @@ function getAttachmentContentDisposition(mimeTree, attachmentId) {
 
     return [false, false];
 }
-
-function getAttachmentFilename(mimeTree, attachmentId) {
-    if (mimeTree.attachmentId && mimeTree.attachmentId === attachmentId) {
-        let filename = mimeTree.parsedHeader['content-disposition']?.params?.filename || false;
-
-        if (filename) {
-            return [filename.toString().replace(/\s*\r?\n\s*/g, ' ').trim(), true];
-        }
-
-        return [false, true];
-    } else if (mimeTree.childNodes) {
-        let filename;
-        for (const childNode of Object.values(mimeTree.childNodes)) {
-            filename = getAttachmentFilename(childNode, attachmentId);
-            if (filename[1] === true) {
-                return filename;
-            }
-        }
-    }
-
-    return [false, false];
-}

test/api-test.js

@@ -630,13 +630,12 @@ describe('API tests', function () {
                 .expect(200);
 
             expect(downloadResponse.headers['content-disposition']).to.match(/^inline\b/i);
-            expect(downloadResponse.headers['x-filename']).to.equal('inline-test.txt');
             expect(downloadResponse.text).to.equal('test');
         });
 
-        it('should GET /users/:user/mailboxes/:mailbox/messages/:message/attachments/:attachment expect utf8 filename header', async () => {
+        it('should GET /users/:user/mailboxes/:mailbox/messages/:message/attachments/:attachment expect utf8 filename in content disposition', async () => {
             const utf8Filename = 'täst-Ā.txt';
-            const expectedHeaderFilename = '=?UTF-8?Q?t=C3=A4st-=C4=80.txt?=';
+            const expectedHeaderFilename = "filename*0*=utf-8''t%C3%A4st-%C4%80.txt";
             const message = {
                 from: {
                     name: 'test tester',
@@ -668,7 +667,7 @@ describe('API tests', function () {
                 .expect(200);
 
             expect(downloadResponse.headers['content-disposition']).to.match(/^inline\b/i);
-            expect(downloadResponse.headers['x-filename']).to.equal(expectedHeaderFilename);
+            expect(downloadResponse.headers['content-disposition']).to.include(expectedHeaderFilename);
             expect(downloadResponse.text).to.equal('test');
         });