zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mail always sent to sender

Browse Source
This commit is contained in:
zefie
2022-02-10 22:14:56 -05:00
parent 9a7d4ec035
commit 9e7549cec8
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
View File

@@ -294,9 +294,7 @@ ${html_entities.encode(message.body).replace("\n", "<br>")}
<br> <br>
<br>`; <br>`;
if (message.signature) { if (message.signature) {
if (wtvshared.isHTML(message.signature)) data += `<wtvnoscript>`; data += ssid_sessions[socket.ssid].mailstore.sanitizeSignature(message.signature);
data += message.signature;
if (wtvshared.isHTML(message.signature)) data += `</wtvnoscript>`;
} }
data += `<p> data += `<p>
<p> <p>

4
zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
View File

@@ -413,9 +413,7 @@ vlink=#62B362
vspace=0 vspace=0
hspace=0>`; hspace=0>`;
if (ssid_sessions[socket.ssid].getSessionData("subscriber_signature") && ssid_sessions[socket.ssid].getSessionData("subscriber_signature") != "" && !no_signature) { if (ssid_sessions[socket.ssid].getSessionData("subscriber_signature") && ssid_sessions[socket.ssid].getSessionData("subscriber_signature") != "" && !no_signature) {
if (wtvshared.isHTML(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"))) data += `<wtvnoscript>`; data += ssid_sessions[socket.ssid].mailstore.sanitizeSignature(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"));
data += ssid_sessions[socket.ssid].getSessionData("subscriber_signature");
if (wtvshared.isHTML(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"))) data += `</wtvnoscript>`;
} }
data += ` data += `
<td abswidth=2 bgcolor=#000000> <td abswidth=2 bgcolor=#000000>

9
zefie_wtvp_minisrv/WTVMail.js
View File

@@ -124,6 +124,13 @@ class WTVMail {
return this.uuid.v1(); return this.uuid.v1();
} }
sanitizeSignature(string) {
// placeholder ~ not yet implemented
// todo: strip <script>, </script> and everything inbetween
// todo: add missing user open tags (eg </i> if user did not close it)
// todo: figure out bgcolor and text color voodoo
return string;
}
createMessage(mailboxid, from_addr, to_addr, msgbody, subject = null, from_name = null, to_name = null, signature = null, date = null, known_sender = false, attachments = []) { createMessage(mailboxid, from_addr, to_addr, msgbody, subject = null, from_name = null, to_name = null, signature = null, date = null, known_sender = false, attachments = []) {
if (this.createMailbox(mailboxid)) { if (this.createMailbox(mailboxid)) {
@@ -369,7 +376,7 @@ class WTVMail {
if (mailbox_exists) dest_user_mailstore.createWelcomeMessage(); if (mailbox_exists) dest_user_mailstore.createWelcomeMessage();
} }
// if the mailbox exists, deliver the message // if the mailbox exists, deliver the message
if (dest_user_mailstore.mailboxExists(0)) this.createMessage(0, from_addr, to_addr, msgbody, subject, from_name, to_name, signature, null, this.isInUserAddressBook(to_addr, from_addr), attachments); if (dest_user_mailstore.mailboxExists(0)) dest_user_mailstore.createMessage(0, from_addr, to_addr, msgbody, subject, from_name, to_name, signature, null, this.isInUserAddressBook(to_addr, from_addr), attachments);
else return "There was an internal error sending the message to <strong>" + to_addr + "</strong>. Please try again later"; else return "There was an internal error sending the message to <strong>" + to_addr + "</strong>. Please try again later";
// clean up // clean up