using sanitizeMailHeaders when needed. see #672

This commit is contained in:
mic 2026-02-22 22:23:24 +01:00
parent e8e6c86be1
commit 3510636eb3

View file

@ -17,7 +17,10 @@
*/ */
import { prefs_default } from '../options/mzta-options-default.js'; import { prefs_default } from '../options/mzta-options-default.js';
import { getMailHeader } from './mzta-utils.js'; import {
getMailHeader,
sanitizeMailHeaders
} from './mzta-utils.js';
/* ================= PLACEHOLDERS PROPERTIES ======================================== /* ================= PLACEHOLDERS PROPERTIES ========================================
@ -509,7 +512,7 @@ export const placeholdersUtils = {
finalSubs['mail_folder_path'] = placeholdersUtils.failSafePlaceholders(curr_message.folder?.path); finalSubs['mail_folder_path'] = placeholdersUtils.failSafePlaceholders(curr_message.folder?.path);
break; break;
case 'mail_headers': case 'mail_headers':
finalSubs['mail_headers:' + currPH.custom_value] = placeholdersUtils.failSafePlaceholders(await getMailHeader(curr_message, currPH.custom_value)); finalSubs['mail_headers:' + currPH.custom_value] = placeholdersUtils.failSafePlaceholders(sanitizeMailHeaders(await getMailHeader(curr_message, currPH.custom_value)));
break; break;
case 'selected_text': case 'selected_text':
finalSubs['selected_text'] = placeholdersUtils.failSafePlaceholders(selection_text); finalSubs['selected_text'] = placeholdersUtils.failSafePlaceholders(selection_text);
@ -518,13 +521,13 @@ export const placeholdersUtils = {
finalSubs['selected_html'] = placeholdersUtils.failSafePlaceholders(selection_html); finalSubs['selected_html'] = placeholdersUtils.failSafePlaceholders(selection_html);
break; break;
case 'author': case 'author':
finalSubs['author'] = placeholdersUtils.failSafePlaceholders(curr_message.author); finalSubs['author'] = placeholdersUtils.failSafePlaceholders(sanitizeMailHeaders(curr_message.author));
break; break;
case 'recipients': case 'recipients':
finalSubs['recipients'] = placeholdersUtils.failSafePlaceholders(curr_message.recipients?.join(", ")); finalSubs['recipients'] = placeholdersUtils.failSafePlaceholders(sanitizeMailHeaders(curr_message.recipients?.join(", ")));
break; break;
case 'cc_list': case 'cc_list':
finalSubs['cc_list'] = placeholdersUtils.failSafePlaceholders(curr_message.ccList?.join(", ")); finalSubs['cc_list'] = placeholdersUtils.failSafePlaceholders(sanitizeMailHeaders(curr_message.ccList?.join(", ")));
break; break;
case 'junk_score': case 'junk_score':
finalSubs['junk_score'] = placeholdersUtils.failSafePlaceholders(curr_message.junkScore); finalSubs['junk_score'] = placeholdersUtils.failSafePlaceholders(curr_message.junkScore);