Skip to content

ZMS-47: Fix utf-8 coding issues #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickOvt merged 2 commits into from
Apr 9, 2026
Merged

ZMS-47: Fix utf-8 coding issues #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2f49f4
ZMS-47: Fix utf-8 coding issues
NickOvt Apr 9, 2026
06fb495
remove console log
NickOvt Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/sending-zone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,15 @@ class SendingZone {
origin = origin.join(' ').trim() || 'localhost';
}

let authenticatedSender = '';
if (delivery.user) {
try {
authenticatedSender = addressTools.normalizeAddress(delivery.user);
} catch {
authenticatedSender = delivery.user;
}
}

let value =
'' +
// from ehlokeyword
Expand All @@ -420,7 +429,7 @@ class SendingZone {
origin +
(originhost ? '\r\n' : '') +
// (Authenticated sender: username)
(delivery.user ? ' (Authenticated sender: ' + delivery.user + ')\r\n' : !originhost ? '\r\n' : '') +
(authenticatedSender ? ' (Authenticated sender: ' + authenticatedSender + ')\r\n' : !originhost ? '\r\n' : '') +
// by smtphost
' by ' +
hostname +
Expand All @@ -446,6 +455,7 @@ class SendingZone {
// Wed, 03 Aug 2016 11:32:07 +0000
' ' +
new Date(delivery.time).toUTCString().replace(/GMT/, '+0000');

return key + ': ' + value;
}
}
Expand Down
Loading