mirror of
https://github.com/juherr/kill-the-news.git
synced 2026-06-20 22:03:48 +00:00
4a4c276859
- Add `blocked_senders` field to FeedConfig (alongside existing `allowed_senders`) - Refactor sender matching to priority-based logic: exact block > exact allow > domain block > domain allow, enabling exceptions (e.g. allow toto@gmail.com despite blocking gmail.com) - Add `POST /admin/feeds/:feedId/sender-filter` endpoint for quick allow/block from email detail view; returns 409 on conflict with opposite list - Add ⋮ dropdown on From field in email detail with 4 options (allow/block sender/domain), inline success/error feedback - Add blocked_senders textarea to create/edit feed forms - 209 tests passing Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
470 lines
14 KiB
TypeScript
470 lines
14 KiB
TypeScript
import { describe, it, expect, beforeEach } from "vitest";
|
|
import "../test/setup";
|
|
import { createMockEnv, MockR2 } from "../test/setup";
|
|
import {
|
|
processEmail,
|
|
ProcessEmailInput,
|
|
RawAttachment,
|
|
} from "./email-processor";
|
|
|
|
const VALID_FEED_ID = "apple.mountain.42";
|
|
const VALID_TO = `${VALID_FEED_ID}@test.getmynews.app`;
|
|
|
|
function makeInput(
|
|
overrides: Partial<ProcessEmailInput> = {},
|
|
): ProcessEmailInput {
|
|
return {
|
|
toAddress: VALID_TO,
|
|
from: "Sender <sender@example.com>",
|
|
senders: ["sender@example.com"],
|
|
subject: "Test Subject",
|
|
content: "<p>Hello</p>",
|
|
receivedAt: 1700000000000,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
describe("processEmail", () => {
|
|
let env: ReturnType<typeof createMockEnv>;
|
|
|
|
beforeEach(() => {
|
|
env = createMockEnv();
|
|
});
|
|
|
|
it("returns 400 when toAddress has no valid feedId", async () => {
|
|
const res = await processEmail(
|
|
makeInput({ toAddress: "invalid@domain.com" }),
|
|
env as any,
|
|
);
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it("returns 404 when feed does not exist", async () => {
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(404);
|
|
});
|
|
|
|
it("returns 403 when sender is not in allowlist", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({ allowed_senders: ["allowed@example.com"] }),
|
|
);
|
|
const res = await processEmail(
|
|
makeInput({ senders: ["other@example.com"] }),
|
|
env as any,
|
|
);
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it("returns 200 and stores email when sender is allowed by exact match", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({ allowed_senders: ["sender@example.com"] }),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(200);
|
|
});
|
|
|
|
it("returns 200 and stores email when sender matches by domain", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({ allowed_senders: ["example.com"] }),
|
|
);
|
|
const res = await processEmail(
|
|
makeInput({ senders: ["anyone@example.com"] }),
|
|
env as any,
|
|
);
|
|
expect(res.status).toBe(200);
|
|
});
|
|
|
|
it("returns 200 when no allowlist is set", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({ allowed_senders: [] }),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(200);
|
|
});
|
|
|
|
it("returns 403 when sender is in blocklist by exact address", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({ blocked_senders: ["sender@example.com"] }),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it("returns 403 when sender is in blocklist by domain", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({ blocked_senders: ["example.com"] }),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it("returns 200 when sender is not in blocklist", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({ blocked_senders: ["other@example.com"] }),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(200);
|
|
});
|
|
|
|
it("exact block takes precedence over domain allow", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({
|
|
allowed_senders: ["example.com"],
|
|
blocked_senders: ["sender@example.com"],
|
|
}),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it("exact allow overrides domain block (exception use case)", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({
|
|
allowed_senders: ["sender@example.com"],
|
|
blocked_senders: ["example.com"],
|
|
}),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(200);
|
|
});
|
|
|
|
it("exact block takes precedence over exact allow", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({
|
|
allowed_senders: ["sender@example.com"],
|
|
blocked_senders: ["sender@example.com"],
|
|
}),
|
|
);
|
|
const res = await processEmail(makeInput(), env as any);
|
|
expect(res.status).toBe(403);
|
|
});
|
|
|
|
it("stores email data and updates metadata in KV", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
|
|
const input = makeInput({ subject: "My Subject", content: "<b>body</b>" });
|
|
await processEmail(input, env as any);
|
|
|
|
const metadata = await env.EMAIL_STORAGE.get(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
"json",
|
|
);
|
|
expect(metadata.emails).toHaveLength(1);
|
|
expect(metadata.emails[0].subject).toBe("My Subject");
|
|
|
|
const emailData = await env.EMAIL_STORAGE.get(
|
|
metadata.emails[0].key,
|
|
"json",
|
|
);
|
|
expect(emailData.subject).toBe("My Subject");
|
|
expect(emailData.content).toBe("<b>body</b>");
|
|
expect(emailData.from).toBe("Sender <sender@example.com>");
|
|
});
|
|
|
|
it("prepends to existing metadata", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
JSON.stringify({
|
|
emails: [{ key: "old-key", subject: "Old", receivedAt: 1, size: 100 }],
|
|
}),
|
|
);
|
|
|
|
await processEmail(makeInput({ subject: "New" }), env as any);
|
|
|
|
const metadata = await env.EMAIL_STORAGE.get(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
"json",
|
|
);
|
|
expect(metadata.emails).toHaveLength(2);
|
|
expect(metadata.emails[0].subject).toBe("New");
|
|
expect(metadata.emails[1].subject).toBe("Old");
|
|
});
|
|
|
|
it("trims oldest emails when total size exceeds FEED_MAX_SIZE_BYTES", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
|
|
const oldKey1 = `feed:${VALID_FEED_ID}:111`;
|
|
const oldKey2 = `feed:${VALID_FEED_ID}:222`;
|
|
const bigContent = "x".repeat(200);
|
|
const email1 = JSON.stringify({
|
|
subject: "Old1",
|
|
from: "a@b.com",
|
|
content: bigContent,
|
|
receivedAt: 111,
|
|
headers: {},
|
|
});
|
|
const email2 = JSON.stringify({
|
|
subject: "Old2",
|
|
from: "a@b.com",
|
|
content: bigContent,
|
|
receivedAt: 222,
|
|
headers: {},
|
|
});
|
|
await env.EMAIL_STORAGE.put(oldKey1, email1);
|
|
await env.EMAIL_STORAGE.put(oldKey2, email2);
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
JSON.stringify({
|
|
emails: [
|
|
{
|
|
key: oldKey2,
|
|
subject: "Old2",
|
|
receivedAt: 222,
|
|
size: email2.length,
|
|
},
|
|
{
|
|
key: oldKey1,
|
|
subject: "Old1",
|
|
receivedAt: 111,
|
|
size: email1.length,
|
|
},
|
|
],
|
|
}),
|
|
);
|
|
|
|
const tinyEnv = { ...env, FEED_MAX_SIZE_BYTES: "50" };
|
|
const res = await processEmail(
|
|
makeInput({ subject: "New" }),
|
|
tinyEnv as any,
|
|
);
|
|
expect(res.status).toBe(200);
|
|
|
|
const metadata = await env.EMAIL_STORAGE.get(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
"json",
|
|
);
|
|
expect(metadata.emails).toHaveLength(1);
|
|
expect(metadata.emails[0].subject).toBe("New");
|
|
|
|
const deleted1 = await env.EMAIL_STORAGE.get(oldKey1, "json");
|
|
const deleted2 = await env.EMAIL_STORAGE.get(oldKey2, "json");
|
|
expect(deleted1).toBeNull();
|
|
expect(deleted2).toBeNull();
|
|
});
|
|
|
|
it("keeps entries within size budget untouched", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
const bigEnv = { ...env, FEED_MAX_SIZE_BYTES: String(10 * 1024 * 1024) };
|
|
await processEmail(makeInput({ subject: "First" }), bigEnv as any);
|
|
await processEmail(makeInput({ subject: "Second" }), bigEnv as any);
|
|
const metadata = await env.EMAIL_STORAGE.get(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
"json",
|
|
);
|
|
expect(metadata.emails).toHaveLength(2);
|
|
});
|
|
|
|
it("calls ctx.waitUntil with notifySubscribers when ctx is provided", async () => {
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({
|
|
title: "Test",
|
|
language: "en",
|
|
created_at: Date.now(),
|
|
}),
|
|
);
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
JSON.stringify({ emails: [] }),
|
|
);
|
|
|
|
let waitUntilCalled = false;
|
|
const ctx = {
|
|
waitUntil: (p: Promise<unknown>) => {
|
|
waitUntilCalled = true;
|
|
void p; // don't actually await it
|
|
},
|
|
passThroughOnException: () => {},
|
|
} as unknown as ExecutionContext;
|
|
|
|
const res = await processEmail(makeInput(), env as any, ctx);
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(waitUntilCalled).toBe(true);
|
|
});
|
|
|
|
it("does not call ctx.waitUntil on error paths (feed not found)", async () => {
|
|
let waitUntilCalled = false;
|
|
const ctx = {
|
|
waitUntil: (p: Promise<unknown>) => {
|
|
waitUntilCalled = true;
|
|
void p;
|
|
},
|
|
passThroughOnException: () => {},
|
|
} as unknown as ExecutionContext;
|
|
|
|
// Feed ID is valid format but config doesn't exist → 404
|
|
const res = await processEmail(
|
|
makeInput({ toAddress: `no.such.99@test.getmynews.app` }),
|
|
env as any,
|
|
ctx,
|
|
);
|
|
|
|
expect(res.status).toBe(404);
|
|
expect(waitUntilCalled).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("processEmail — attachments", () => {
|
|
const pdfContent = new TextEncoder().encode("PDF bytes")
|
|
.buffer as ArrayBuffer;
|
|
|
|
const pdfAttachment: RawAttachment = {
|
|
filename: "report.pdf",
|
|
contentType: "application/pdf",
|
|
content: pdfContent,
|
|
};
|
|
|
|
it("skips R2 upload when ATTACHMENT_BUCKET is not configured", async () => {
|
|
const env = createMockEnv();
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
const res = await processEmail(
|
|
makeInput({ attachments: [pdfAttachment] }),
|
|
env as any,
|
|
);
|
|
expect(res.status).toBe(200);
|
|
|
|
const metadata = await env.EMAIL_STORAGE.get(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
"json",
|
|
);
|
|
const emailData = await env.EMAIL_STORAGE.get(
|
|
metadata.emails[0].key,
|
|
"json",
|
|
);
|
|
expect(emailData.attachments).toBeUndefined();
|
|
});
|
|
|
|
it("uploads attachments to R2 and stores AttachmentData in emailData", async () => {
|
|
const env = createMockEnv({ withR2: true });
|
|
const mockR2 = (env as any).ATTACHMENT_BUCKET as unknown as MockR2;
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
const res = await processEmail(
|
|
makeInput({ attachments: [pdfAttachment] }),
|
|
env as any,
|
|
);
|
|
expect(res.status).toBe(200);
|
|
|
|
const metadata = await env.EMAIL_STORAGE.get(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
"json",
|
|
);
|
|
const emailData = await env.EMAIL_STORAGE.get(
|
|
metadata.emails[0].key,
|
|
"json",
|
|
);
|
|
|
|
expect(emailData.attachments).toHaveLength(1);
|
|
expect(emailData.attachments[0].filename).toBe("report.pdf");
|
|
expect(emailData.attachments[0].contentType).toBe("application/pdf");
|
|
expect(emailData.attachments[0].size).toBe(pdfContent.byteLength);
|
|
|
|
const id = emailData.attachments[0].id;
|
|
expect(mockR2._has(id)).toBe(true);
|
|
});
|
|
|
|
it("stores attachmentIds in EmailMetadata for trim-time cleanup", async () => {
|
|
const env = createMockEnv({ withR2: true });
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
await processEmail(makeInput({ attachments: [pdfAttachment] }), env as any);
|
|
|
|
const metadata = await env.EMAIL_STORAGE.get(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
"json",
|
|
);
|
|
expect(metadata.emails[0].attachmentIds).toHaveLength(1);
|
|
expect(typeof metadata.emails[0].attachmentIds[0]).toBe("string");
|
|
});
|
|
|
|
it("deletes R2 objects when a trimmed email had attachments", async () => {
|
|
const env = createMockEnv({ withR2: true });
|
|
const mockR2 = (env as any).ATTACHMENT_BUCKET as unknown as MockR2;
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:config`,
|
|
JSON.stringify({}),
|
|
);
|
|
|
|
// Store an old email with attachment in KV and metadata
|
|
const oldKey = `feed:${VALID_FEED_ID}:111`;
|
|
const oldAttachmentId = "old-attachment-uuid";
|
|
const bigContent = "x".repeat(200);
|
|
const oldEmail = JSON.stringify({
|
|
subject: "Old",
|
|
from: "a@b.com",
|
|
content: bigContent,
|
|
receivedAt: 111,
|
|
headers: {},
|
|
attachments: [
|
|
{
|
|
id: oldAttachmentId,
|
|
filename: "old.pdf",
|
|
contentType: "application/pdf",
|
|
size: 100,
|
|
},
|
|
],
|
|
});
|
|
await env.EMAIL_STORAGE.put(oldKey, oldEmail);
|
|
|
|
// Also put the attachment in mock R2
|
|
await mockR2.put(oldAttachmentId, new ArrayBuffer(100));
|
|
|
|
await env.EMAIL_STORAGE.put(
|
|
`feed:${VALID_FEED_ID}:metadata`,
|
|
JSON.stringify({
|
|
emails: [
|
|
{
|
|
key: oldKey,
|
|
subject: "Old",
|
|
receivedAt: 111,
|
|
size: oldEmail.length,
|
|
attachmentIds: [oldAttachmentId],
|
|
},
|
|
],
|
|
}),
|
|
);
|
|
|
|
// Process with tight size budget to force trimming
|
|
const tinyEnv = { ...env, FEED_MAX_SIZE_BYTES: "50" };
|
|
const res = await processEmail(
|
|
makeInput({ subject: "New" }),
|
|
tinyEnv as any,
|
|
);
|
|
expect(res.status).toBe(200);
|
|
|
|
// Old attachment should be deleted from R2
|
|
expect(mockR2._has(oldAttachmentId)).toBe(false);
|
|
});
|
|
});
|