fix: fixed dkim-signature header spanning multiple line breaks with t…

…ab \t character (per <andris9/mailsplit#22>)
forwardemail · Sep 2, 2024 · 7d1e192 · 7d1e192
1 parent 124a5f3
commit 7d1e192
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/models/emails.js b/app/models/emails.js
@@ -915,7 +915,11 @@ Emails.statics.queue = async function (
     // ignore, keep as is
   }
 
-  lines = lines.replace(/[\r\n]+$/, '').split(/\r?\n/);
+  lines = lines
+    // <https://github.com/andris9/mailsplit/issues/22>
+    .replace(/\r?\n?\t/g, ' ')
+    .replace(/[\r\n]+$/, '')
+    .split(/\r?\n/);
 
   for (const line of lines) {
     const index = line.indexOf(':');

diff --git a/helpers/get-headers.js b/helpers/get-headers.js
@@ -28,7 +28,11 @@ function getHeaders(headers, specificKey = null) {
     // ignore, keep as is
   }
 
-  lines = lines.replace(/[\r\n]+$/, '').split(/\r?\n/);
+  lines = lines
+    // <https://github.com/andris9/mailsplit/issues/22>
+    .replace(/\r?\n?\t/g, ' ')
+    .replace(/[\r\n]+$/, '')
+    .split(/\r?\n/);
 
   for (const line of lines) {
     const index = line.indexOf(':');