mirror of
https://github.com/koala73/worldmonitor.git
synced 2026-04-25 17:14:57 +02:00
* fix(brief): per-run slot URL so same-day digests link to distinct briefs
Digest emails at 8am and 1pm on the same day pointed to byte-identical
magazine URLs because the URL was keyed on YYYY-MM-DD in the user tz.
Each compose run overwrote the single daily envelope in place, and the
composer rolling 24h story window meant afternoon output often looked
identical to morning. Readers clicking an older email got whatever the
latest cron happened to write.
Slot format is now YYYY-MM-DD-HHMM (local tz, per compose run). The
magazine URL, carousel URLs, and Redis key all carry the slot, and each
digest dispatch gets its own frozen envelope that lives out the 7d TTL.
envelope.data.date stays YYYY-MM-DD for rendering "19 April 2026".
The digest cron also writes a brief:latest:{userId} pointer (7d TTL,
overwritten each compose) so the dashboard panel and share-url endpoint
can locate the most recent brief without knowing the slot. The
previous date-probing strategy does not work once keys carry HHMM.
No back-compat for the old YYYY-MM-DD format: the verifier rejects it,
the composer only ever writes the new shape, and any in-flight
notifications signed under the old format will 403 on click. Acceptable
at the rollout boundary per product decision.
* fix(brief): carve middleware bot allowlist to accept slot-format carousel path
BRIEF_CAROUSEL_PATH_RE in middleware.ts was still matching only the
pre-slot YYYY-MM-DD segment, so every slot-based carousel URL emitted
by the digest cron (YYYY-MM-DD-HHMM) would miss the social allowlist
and fall into the generic bot gate. Telegram/Slack/Discord/LinkedIn
image fetchers would 403 on sendMediaGroup, breaking previews for the
new digest links.
CI missed this because tests/middleware-bot-gate.test.mts still
exercised the old /YYYY-MM-DD/ path shape. Swap the fixture to the
slot format and add a regression asserting the pre-slot shape is now
rejected, so legacy links cannot silently leak the allowlist after
the rollout.
* fix(brief): preserve caller-requested slot + correct no-brief share-url error
Two contract bugs in the slot rollout that silently misled callers:
1. GET /api/latest-brief?slot=X where X has no envelope was returning
{ status: 'composing', issueDate: <today UTC> } — which reads as
"today's brief is composing" instead of "the specific slot you
asked about doesn't exist". A caller probing a known historical
slot would get a completely unrelated "today" signal. Now we echo
the requested slot back (issueSlot + issueDate derived from its
date portion) when the caller supplied ?slot=, and keep the
UTC-today placeholder only for the no-param path.
2. POST /api/brief/share-url with no slot and no latest-pointer was
falling into the generic invalid_slot_shape 400 branch. That is
not an input-shape problem; it is "no brief exists yet for this
user". Return 404 brief_not_found — the same code the
existing-envelope check returns — so callers get one coherent
contract: either the brief exists and is shareable, or it doesn't
and you get 404.
82 lines
2.9 KiB
JavaScript
82 lines
2.9 KiB
JavaScript
// HMAC URL signer for scripts/ cron code.
|
|
//
|
|
// Port of the sign path in server/_shared/brief-url.ts. The edge
|
|
// route still owns verify (that code runs unchanged); the digest
|
|
// cron only needs to mint magazine URLs to embed in notification
|
|
// bodies.
|
|
//
|
|
// Kept in parity with the TS module — any change to the signing
|
|
// formula MUST happen in both places in the same PR. A regression
|
|
// test in tests/brief-url-sign.test.mjs produces a token with this
|
|
// helper and verifies it via the edge's verifyBriefToken.
|
|
//
|
|
// No node:crypto — Web Crypto (crypto.subtle + btoa) only. That lets
|
|
// the same helper run on Node 18+, Vercel Edge, Cloudflare Workers,
|
|
// and Tauri if ever needed from a non-cron path.
|
|
|
|
const USER_ID_RE = /^[A-Za-z0-9_-]{1,128}$/;
|
|
// YYYY-MM-DD-HHMM issue slot (local hour+minute of the compose run,
|
|
// in the user's tz). Slot-per-run gives each digest dispatch its own
|
|
// frozen magazine URL; same-day reruns no longer collide.
|
|
const ISSUE_DATE_RE = /^\d{4}-\d{2}-\d{2}-\d{4}$/;
|
|
|
|
export class BriefUrlError extends Error {
|
|
constructor(code, message) {
|
|
super(message);
|
|
this.code = code;
|
|
this.name = 'BriefUrlError';
|
|
}
|
|
}
|
|
|
|
function assertShape(userId, issueDate) {
|
|
if (!USER_ID_RE.test(userId)) {
|
|
throw new BriefUrlError('invalid_user_id', 'userId must match [A-Za-z0-9_-]{1,128}');
|
|
}
|
|
if (!ISSUE_DATE_RE.test(issueDate)) {
|
|
throw new BriefUrlError('invalid_issue_date', 'issueDate must match YYYY-MM-DD-HHMM');
|
|
}
|
|
}
|
|
|
|
function base64url(bytes) {
|
|
let bin = '';
|
|
for (const b of bytes) bin += String.fromCharCode(b);
|
|
return btoa(bin).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
|
|
}
|
|
|
|
async function hmacSha256(secret, message) {
|
|
const key = await crypto.subtle.importKey(
|
|
'raw',
|
|
new TextEncoder().encode(secret),
|
|
{ name: 'HMAC', hash: 'SHA-256' },
|
|
false,
|
|
['sign'],
|
|
);
|
|
const sig = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(message));
|
|
return new Uint8Array(sig);
|
|
}
|
|
|
|
/**
|
|
* Deterministically sign `${userId}:${issueDate}` and return a
|
|
* base64url-encoded token (43 chars, no padding).
|
|
* @param {string} userId @param {string} issueDate @param {string} secret
|
|
* @returns {Promise<string>}
|
|
*/
|
|
export async function signBriefToken(userId, issueDate, secret) {
|
|
assertShape(userId, issueDate);
|
|
if (!secret) {
|
|
throw new BriefUrlError('missing_secret', 'BRIEF_URL_SIGNING_SECRET is not configured');
|
|
}
|
|
const sig = await hmacSha256(secret, `${userId}:${issueDate}`);
|
|
return base64url(sig);
|
|
}
|
|
|
|
/**
|
|
* @param {{ userId: string; issueDate: string; baseUrl: string; secret: string }} opts
|
|
* @returns {Promise<string>}
|
|
*/
|
|
export async function signBriefUrl({ userId, issueDate, baseUrl, secret }) {
|
|
const token = await signBriefToken(userId, issueDate, secret);
|
|
const trimmed = baseUrl.replace(/\/+$/, '');
|
|
return `${trimmed}/api/brief/${encodeURIComponent(userId)}/${encodeURIComponent(issueDate)}?t=${token}`;
|
|
}
|