Fix potential parsing error when extracting the received time (#455)

lieser · lieser · commit 4a9792ea45d6 · 2025-01-01T21:42:20.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ All notable changes to this project will be documented in this file.
 - Improved table views for sign rules and DKIM keys (#248, #305).
   E.g. it is now possible to delete multiple entries at once.
 
+### Fixes
+
+- Fixed potential parsing error when extracting the received time from the last Received header (#455).
+
 ### Other
 
 - Updated default rules and favicons (#440, #444, #447, #457).
diff --git a/modules/msgParser.mjs.js b/modules/msgParser.mjs.js
@@ -1,7 +1,7 @@
 /**
  * Reads and parses a message.
  *
- * Copyright (c) 2014-2023 Philippe Lieser
+ * Copyright (c) 2014-2024 Philippe Lieser
  *
  * This software is licensed under the terms of the MIT License.
  *
@@ -248,7 +248,9 @@ export default class MsgParser {
 			log.warn("Could not find the date time in the Received header");
 			return null;
 		}
-		const dateTimeStr = header.substring(dateTimeStart + 1);
+		// In Thunderbird (but not Node.js) Date parsing will fail if newlines are before the actual date string.
+		// We trim all surrounding whitespace to avoid this problem.
+		const dateTimeStr = header.substring(dateTimeStart + 1).trim();
 		const dateTime = new Date(dateTimeStr);
 		if (dateTime.toString() === "Invalid Date") {
 			log.warn("Could not parse the date time in the Received header");
diff --git a/test/unittest/SpecRunner.html b/test/unittest/SpecRunner.html
@@ -9,9 +9,9 @@
   <body>
     <div id="mocha"></div>
 
-    <script src="https://unpkg.com/chai/chai.js"></script>
-    <script src="https://unpkg.com/mocha/mocha.js"></script>
-    <script src="https://unpkg.com/sinon/pkg/sinon.js"></script>
+    <script src="https://unpkg.com/chai@^4.3.10/chai.js"></script>
+    <script src="https://unpkg.com/mocha@^10.0.4/mocha.js"></script>
+    <script src="https://unpkg.com/sinon@^17.0.1/pkg/sinon.js"></script>
 
     <script class="mocha-init">
       mocha.setup({ui: "bdd", globals: ["browser"]});

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* Reads and parses a message.`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2014-2023 Philippe Lieser`
	`4`	`+ * Copyright (c) 2014-2024 Philippe Lieser`
`5`	`5`	`*`
`6`	`6`	`* This software is licensed under the terms of the MIT License.`
`7`	`7`	`*`
`@@ -248,7 +248,9 @@ export default class MsgParser {`
`248`	`248`	`log.warn("Could not find the date time in the Received header");`
`249`	`249`	`return null;`
`250`	`250`	`}`
`251`		`- const dateTimeStr = header.substring(dateTimeStart + 1);`
	`251`	`+ // In Thunderbird (but not Node.js) Date parsing will fail if newlines are before the actual date string.`
	`252`	`+ // We trim all surrounding whitespace to avoid this problem.`
	`253`	`+ const dateTimeStr = header.substring(dateTimeStart + 1).trim();`
`252`	`254`	`const dateTime = new Date(dateTimeStr);`
`253`	`255`	`if (dateTime.toString() === "Invalid Date") {`
`254`	`256`	`log.warn("Could not parse the date time in the Received header");`