Skip to content

ZMS-46: Move encryption to WD, fix authenticatedSender encoding #81

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 1 commit into from
Apr 14, 2026
Merged

ZMS-46: Move encryption to WD, fix authenticatedSender encoding #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 8 additions & 19 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ module.exports.init = function (app, done) {
loggelf: message => loggelf(message)
});

const encryptMessage = util.promisify(messageHandler.encryptMessage.bind(messageHandler));
const prepareMessage = util.promisify(messageHandler.prepareMessage.bind(messageHandler));

const addMessage = util.promisify((...args) => {
Expand Down Expand Up @@ -814,19 +813,6 @@ module.exports.init = function (app, done) {
let raw = Buffer.concat(chunks, chunklen);

let storeSentMessage = async () => {
// Checks if the message needs to be encrypted before storing it
let messageSource = raw;

if (userData.encryptMessages && userData.pubKey) {
try {
let encrypted = await encryptMessage(userData.pubKey, raw);
if (encrypted) {
messageSource = encrypted;
}
} catch (err) {
// ignore
}
}
try {
let { data } = await addMessage({
user: userData._id,
Expand All @@ -848,7 +834,7 @@ module.exports.init = function (app, done) {

date: false,
flags: ['\\Seen'],
raw: messageSource,
raw,

// if similar message exists, then skip
skipExisting: true
Expand Down Expand Up @@ -1430,10 +1416,13 @@ function generateReceivedHeader(envelope, hostname) {
origin = origin.join(' ').trim() || 'localhost';
}

let username = (envelope.user || '').toString();
let match = username.match(/\[([^\]]+)]/);
if (match && match[1]) {
username = match[1];
let username = '';
if (envelope.user) {
try {
username = tools.normalizeAddress(envelope.user);
} catch (err) {
username = envelope.user;
}
}

let value =
Expand Down
Loading