Email queue + async sending; legal settings and placeholders
- Add in-memory email queue with rate limiting (MAX_EMAILS_PER_HOUR) - Bulk send to event attendees now queues and returns immediately - Frontend shows 'Emails are being sent in the background' - Legal pages, settings, and placeholders updates Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,13 +1,37 @@
|
||||
import { Hono } from 'hono';
|
||||
import { zValidator } from '@hono/zod-validator';
|
||||
import { z } from 'zod';
|
||||
import { db, dbGet, dbAll, contacts, emailSubscribers } from '../db/index.js';
|
||||
import { db, dbGet, dbAll, contacts, emailSubscribers, legalSettings } from '../db/index.js';
|
||||
import { eq, desc } from 'drizzle-orm';
|
||||
import { requireAuth } from '../lib/auth.js';
|
||||
import { generateId, getNow } from '../lib/utils.js';
|
||||
import { emailService } from '../lib/email.js';
|
||||
|
||||
const contactsRouter = new Hono();
|
||||
|
||||
// ==================== Sanitization Helpers ====================
|
||||
|
||||
/**
|
||||
* Sanitize a string to prevent HTML injection
|
||||
* Escapes HTML special characters
|
||||
*/
|
||||
function sanitizeHtml(str: string): string {
|
||||
return str
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitize email header values to prevent email header injection
|
||||
* Strips newlines and carriage returns that could be used to inject headers
|
||||
*/
|
||||
function sanitizeHeaderValue(str: string): string {
|
||||
return str.replace(/[\r\n]/g, '').trim();
|
||||
}
|
||||
|
||||
const createContactSchema = z.object({
|
||||
name: z.string().min(2),
|
||||
email: z.string().email(),
|
||||
@@ -29,17 +53,74 @@ contactsRouter.post('/', zValidator('json', createContactSchema), async (c) => {
|
||||
const now = getNow();
|
||||
const id = generateId();
|
||||
|
||||
// Sanitize header-sensitive values to prevent email header injection
|
||||
const sanitizedEmail = sanitizeHeaderValue(data.email);
|
||||
const sanitizedName = sanitizeHeaderValue(data.name);
|
||||
|
||||
const newContact = {
|
||||
id,
|
||||
name: data.name,
|
||||
email: data.email,
|
||||
name: sanitizedName,
|
||||
email: sanitizedEmail,
|
||||
message: data.message,
|
||||
status: 'new' as const,
|
||||
createdAt: now,
|
||||
};
|
||||
|
||||
// Always store the message in admin, regardless of email outcome
|
||||
await (db as any).insert(contacts).values(newContact);
|
||||
|
||||
// Send email notification to support email (non-blocking)
|
||||
try {
|
||||
// Retrieve support_email from legal_settings
|
||||
const settings = await dbGet<any>(
|
||||
(db as any).select().from(legalSettings).limit(1)
|
||||
);
|
||||
|
||||
const supportEmail = settings?.supportEmail;
|
||||
|
||||
if (supportEmail) {
|
||||
const websiteUrl = process.env.FRONTEND_URL || 'https://spanglish.com';
|
||||
|
||||
// Sanitize all values for HTML display
|
||||
const safeName = sanitizeHtml(sanitizedName);
|
||||
const safeEmail = sanitizeHtml(sanitizedEmail);
|
||||
const safeMessage = sanitizeHtml(data.message);
|
||||
|
||||
const subject = `New Contact Form Message – ${websiteUrl}`;
|
||||
|
||||
const bodyHtml = `
|
||||
<p><strong>${safeName}</strong> (${safeEmail}) sent a message:</p>
|
||||
<div style="padding: 16px 20px; background-color: #f8fafc; border-left: 4px solid #3b82f6; margin: 16px 0; white-space: pre-wrap; font-size: 15px; line-height: 1.6;">${safeMessage}</div>
|
||||
<p style="color: #64748b; font-size: 13px;">Reply directly to this email to respond to ${safeName}.</p>
|
||||
`;
|
||||
|
||||
const bodyText = [
|
||||
`${sanitizedName} (${sanitizedEmail}) sent a message:`,
|
||||
'',
|
||||
data.message,
|
||||
'',
|
||||
`Reply directly to this email to respond to ${sanitizedName}.`,
|
||||
].join('\n');
|
||||
|
||||
const emailResult = await emailService.sendCustomEmail({
|
||||
to: supportEmail,
|
||||
subject,
|
||||
bodyHtml,
|
||||
bodyText,
|
||||
replyTo: sanitizedEmail,
|
||||
});
|
||||
|
||||
if (!emailResult.success) {
|
||||
console.error('[Contact Form] Failed to send email notification:', emailResult.error);
|
||||
}
|
||||
} else {
|
||||
console.warn('[Contact Form] No support email configured in legal settings – skipping email notification');
|
||||
}
|
||||
} catch (emailError: any) {
|
||||
// Log the error but do NOT break the contact form UX
|
||||
console.error('[Contact Form] Error sending email notification:', emailError?.message || emailError);
|
||||
}
|
||||
|
||||
return c.json({ message: 'Message sent successfully' }, 201);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user