wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-11 09:51:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle plain-text mails in inbound mail service (#8519)

Browse Source 
Signed-off-by: Nikolay Chunosov <Chunosov.N@gmail.com>
This commit is contained in:
Chunosov 2025-04-10 18:25:04 +07:00 committed by GitHub
parent 5ec92ceb1d
commit 7537d0014a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
services/mail/pod-inbound-mail/src/handlerMta.ts
View File

@ -36,6 +36,11 @@ interface MtaMessage {
} }
} }
function getHeader (mta: MtaMessage, header: string): string | undefined {
const h = header.toLowerCase()
return mta.message.headers.find((header) => header[0].toLowerCase() === h)?.[1]?.trim()
}
export async function handleMtaHook (req: Request, res: Response, ctx: MeasureContext): Promise<void> { export async function handleMtaHook (req: Request, res: Response, ctx: MeasureContext): Promise<void> {
try { try {
if (config.hookToken !== undefined) { if (config.hookToken !== undefined) {
@ -51,13 +56,13 @@ export async function handleMtaHook (req: Request, res: Response, ctx: MeasureCo
if (config.ignoredAddresses.includes(from.address)) { if (config.ignoredAddresses.includes(from.address)) {
return return
} }
const fromHeader = mta.message.headers.find((header) => header[0] === 'From')?.[1] const fromHeader = getHeader(mta, 'From')
if (fromHeader !== undefined) { if (fromHeader !== undefined) {
from.name = extractContactName(ctx, fromHeader) from.name = extractContactName(ctx, fromHeader)
} }
const tos = mta.envelope.to.map((to) => ({ address: stripTags(to.address), name: '' })) const tos = mta.envelope.to.map((to) => ({ address: stripTags(to.address), name: '' }))
const toHeader = mta.message.headers.find((header) => header[0] === 'To')?.[1] const toHeader = getHeader(mta, 'To')
if (toHeader !== undefined) { if (toHeader !== undefined) {
for (const part of toHeader.split(',')) { for (const part of toHeader.split(',')) {
for (const to of tos) { for (const to of tos) {
@ -68,11 +73,11 @@ export async function handleMtaHook (req: Request, res: Response, ctx: MeasureCo
} }
} }
const subject = (mta.message.headers.find((header) => header[0] === 'Subject')?.[1] ?? '').trim() const subject = getHeader(mta, 'Subject') ?? ''
const inReplyTo = mta.message.headers.find((header) => header[0] === 'In-Reply-To')?.[1]?.trim() const inReplyTo = getHeader(mta, 'In-Reply-To')
const { content, attachments } = await parseContent(ctx, mta) const { content, attachments } = await parseContent(ctx, mta)
let mailId = mta.message.headers.find((header) => header[0] === 'Message-ID')?.[1].trim() let mailId = getHeader(mta, 'Message-ID')
if (mailId === undefined) { if (mailId === undefined) {
mailId = createHash('sha256') mailId = createHash('sha256')
.update( .update(
@ -99,10 +104,15 @@ async function parseContent (
ctx: MeasureContext, ctx: MeasureContext,
mta: MtaMessage mta: MtaMessage
): Promise<{ content: string, attachments: Attachment[] }> { ): Promise<{ content: string, attachments: Attachment[] }> {
const contentType = mta.message.headers.find((header) => header[0] === 'Content-Type')?.[1] const contentType = getHeader(mta, 'Content-Type')
if (contentType === undefined) { if (contentType === undefined) {
throw new Error('Content-Type header not found') throw new Error('Content-Type header not found')
} }
if (contentType.toLowerCase().startsWith('text/plain')) {
return { content: mta.message.contents, attachments: [] }
}
const contents = `Content-Type: ${contentType}\r\n${mta.message.contents}` const contents = `Content-Type: ${contentType}\r\n${mta.message.contents}`
const email = await new Promise<ReadedEmlJson>((resolve, reject) => { const email = await new Promise<ReadedEmlJson>((resolve, reject) => {
readEml(contents, (err, json) => { readEml(contents, (err, json) => {