fix: fixed header line parsing

forwardemail · Aug 21, 2024 · 30d645f · 30d645f
1 parent 8af531b
commit 30d645f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/models/emails.js b/app/models/emails.js
@@ -25,7 +25,6 @@ const noReplyList = require('reserved-email-addresses-list/no-reply-list.json');
 const nodemailer = require('nodemailer');
 const pEvent = require('p-event');
 const parseErr = require('parse-err');
-const splitLines = require('split-lines');
 const { Headers, Splitter, Joiner } = require('mailsplit');
 const { Iconv } = require('iconv');
 const { boolean } = require('boolean');
@@ -896,7 +895,10 @@ Emails.statics.queue = async function (
   //
   let from;
 
-  const lines = splitLines(headers.headers.toString('binary').trim());
+  const lines = headers.headers
+    .toString('binary')
+    .replace(/[\r\n]+$/, '')
+    .split(/\r?\n/);
 
   for (const line of lines) {
     const value = Buffer.from(line, 'binary').toString();

diff --git a/helpers/get-headers.js b/helpers/get-headers.js
@@ -5,11 +5,12 @@
 
 const { Buffer } = require('node:buffer');
 
-const splitLines = require('split-lines');
-
 function getHeaders(headers) {
   const _headers = {};
-  const lines = splitLines(headers.headers.toString('binary').trim());
+  const lines = headers.headers
+    .toString('binary')
+    .replace(/[\r\n]+$/, '')
+    .split(/\r?\n/);
 
   //
   // NOTE: we decode header values because