Skip to content

Commit 08277d8

Browse files
authored
fix: ZMS-47: Fix utf-8 coding issues (#489)
* ZMS-47: Fix utf-8 coding issues * remove console log
1 parent ceb39f2 commit 08277d8

3 files changed

Lines changed: 602 additions & 537 deletions

File tree

lib/sending-zone.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,15 @@ class SendingZone {
410410
origin = origin.join(' ').trim() || 'localhost';
411411
}
412412

413+
let authenticatedSender = '';
414+
if (delivery.user) {
415+
try {
416+
authenticatedSender = addressTools.normalizeAddress(delivery.user);
417+
} catch {
418+
authenticatedSender = delivery.user;
419+
}
420+
}
421+
413422
let value =
414423
'' +
415424
// from ehlokeyword
@@ -420,7 +429,7 @@ class SendingZone {
420429
origin +
421430
(originhost ? '\r\n' : '') +
422431
// (Authenticated sender: username)
423-
(delivery.user ? ' (Authenticated sender: ' + delivery.user + ')\r\n' : !originhost ? '\r\n' : '') +
432+
(authenticatedSender ? ' (Authenticated sender: ' + authenticatedSender + ')\r\n' : !originhost ? '\r\n' : '') +
424433
// by smtphost
425434
' by ' +
426435
hostname +
@@ -446,6 +455,7 @@ class SendingZone {
446455
// Wed, 03 Aug 2016 11:32:07 +0000
447456
' ' +
448457
new Date(delivery.time).toUTCString().replace(/GMT/, '+0000');
458+
449459
return key + ': ' + value;
450460
}
451461
}

0 commit comments

Comments
 (0)