Gitea Actions Runner Test / test-job (push) Successful in 2s
CI / check (push) Successful in 30s
CI / tests-integration (push) Successful in 1m42s
CI / tests-unit (push) Failing after 1m49s
CI / tests-ui (push) Successful in 2m31s
CI / preflight (push) Skipped
CI / deploy (push) Skipped
Second review pass covering security, performance, admin tooling and the public/room flows. All HIGH and MEDIUM findings from the audit are resolved; nothing in this commit changes the visible feature set. Authentication & session security - CSP is now set on the request headers in the proxy, which is what Next.js uses to derive the render nonce, so the nonce is effective. - 2FA: an already-enabled user cannot re-enroll, the setup endpoint is rate-limited per account, and confirmed codes are persisted so the second secret no longer silently never applies. - Password reset revokes the ticket, authTicket and all personal access tokens, and bumps the token version so existing sessions die. The same revocation is now wired into the staff-side password reset. - /reset and /verify return a stable error code instead of raw text; the mail lookups are ordered by id so duplicates cannot vary between runs. - Resending the verification mail gets a per-address cooldown on top of the per-user limit. - Issue API tokens with the narrower radio/ticket ability set instead of "*". Authorization & input handling - Mid-rank staff can no longer keep dynamically granted non-view admin.* permissions: existing grants are revoked by migration and the grant lookup is restricted to "%.view". Rank guards use the dynamic super-admin check. - Alerting a user is permission-checked and audited like the other tools. - Material mutations (giveCredits/giveDuckets/giveDiamonds, the admin user actions route, bulk user actions) are capped and rank-guarded, and bulk ids are bounded. - updateRoom / updateRoomItem write through a field allowlist, and items may only be edited through their own room. - Classnames reaching the filesystem are validated before use so a crafted value cannot escape the asset directories. - The word filter now also covers offline mails, guild forum threads and replies, and user mottos. - Media uploads are validated by magic bytes, /api/media requires the page edit permission, APP_URL must be configured once mail is enabled, and the diagnostics error route checks the fetch site header. Admin tooling - Secret settings render masked and cannot be overwritten with a blank or an arbitrary raw key; radio credentials are new password inputs. - Commandocentrum balance changes are audited. - Admin list pagination reads the caller's per-page instead of the max, and the log exporter caps offset and search length. Performance - Catalog translations are cached per module, with a cheap revision hash; the public online count uses a stale window instead of hammering the DB. - The cache warmup now primes the payload the home route actually reads. - TopHeader batches its queries into one round trip, and LCP avatars load eagerly. - motion/react and sonner are no longer part of the root layout; the nav dropdown and mobile nav panels are lazy client chunks. Anonymous visitors again get the navigation chrome, and public pages get an edge cacheable response. Accessibility - Nested <main> elements in phase pages became <section>; the page entrance and route progress animations are pure CSS that respect reduced motion.
149 lines
4.5 KiB
TypeScript
149 lines
4.5 KiB
TypeScript
import "server-only";
|
|
|
|
import { asc, desc, eq, gte } from "drizzle-orm";
|
|
import { cached } from "@/lib/cache";
|
|
import { CameraWeb, db, User, WebsiteTeams } from "@/lib/db";
|
|
import { logger } from "@/lib/logger";
|
|
import { apiCacheKey, redisCache } from "@/lib/redis-cache";
|
|
import { cachedHomePayload } from "@/lib/services/home-payload";
|
|
import { getNewsList } from "@/lib/services/news-list";
|
|
import {
|
|
countArticles,
|
|
countOnline,
|
|
countPhotos,
|
|
countRooms,
|
|
countUsers,
|
|
} from "@/lib/services/public-counters";
|
|
import { siteSettings } from "@/lib/services/site-settings";
|
|
|
|
/**
|
|
* Prime the hot public cache keys right after boot.
|
|
*
|
|
* Every deploy starts with an empty in-process cache, and any key that also
|
|
* expired while the old process was down has to be recomputed from the database.
|
|
* With no warm-up, the first visitor after each deploy pays for a burst of
|
|
* simultaneous misses; with it, the site is already warm before traffic arrives.
|
|
*
|
|
* Warming works by cache *key*, not by call site: these use exactly the keys the
|
|
* routes and pages read, so priming an entry serves every reader of it. Failures
|
|
* are logged and ignored — a warm-up that cannot reach the database must never
|
|
* stop the server from serving.
|
|
*/
|
|
|
|
const COUNTER_TTL_MS = 300_000;
|
|
const ONLINE_TTL_MS = 10_000;
|
|
|
|
async function warm<T>(name: string, load: () => Promise<T>): Promise<void> {
|
|
try {
|
|
await load();
|
|
} catch (error) {
|
|
logger.warn("[cache] warm-up failed", {
|
|
key: name,
|
|
error: String(error),
|
|
});
|
|
}
|
|
}
|
|
|
|
export async function warmPublicCaches(): Promise<void> {
|
|
// Elke `warm` wordt afgewacht voordat de volgende begint, dus de COUNT(*)
|
|
// queries gaan één voor één in plaats van als een burst op een database die
|
|
// nog aan het opstarten is. Dat is goed genoeg; kunstmatige sleeps zouden
|
|
// de warme start alleen maar vertragen zonder iets te winnen.
|
|
await warm("online_count", () =>
|
|
cached("online_count", ONLINE_TTL_MS, countOnline, { staleMs: 15_000 }),
|
|
);
|
|
await warm("total_users", () =>
|
|
cached("total_users", COUNTER_TTL_MS, countUsers, {
|
|
staleMs: COUNTER_TTL_MS,
|
|
}),
|
|
);
|
|
await warm("total_rooms", () =>
|
|
cached("total_rooms", COUNTER_TTL_MS, countRooms, {
|
|
staleMs: COUNTER_TTL_MS,
|
|
}),
|
|
);
|
|
await warm("total_photos", () =>
|
|
cached("total_photos", COUNTER_TTL_MS, countPhotos, {
|
|
staleMs: COUNTER_TTL_MS,
|
|
}),
|
|
);
|
|
await warm("total_articles", () =>
|
|
cached("total_articles", COUNTER_TTL_MS, countArticles, {
|
|
staleMs: COUNTER_TTL_MS,
|
|
}),
|
|
);
|
|
await warm("online_users", () =>
|
|
cached("online_users", ONLINE_TTL_MS, () => listOnlineUsers(100), {
|
|
staleMs: 15_000,
|
|
}),
|
|
);
|
|
await warm("api:staff", () =>
|
|
redisCache(apiCacheKey("staff"), 300, loadStaff, { staleMs: 300 }),
|
|
);
|
|
await warm("api:teams", () =>
|
|
redisCache(apiCacheKey("teams"), 300, loadTeams, { staleMs: 600 }),
|
|
);
|
|
// Prime the real payload the route serves — a placeholder here used to be
|
|
// cached under the shared key and served to every client after a restart.
|
|
await warm("news:home", cachedHomePayload);
|
|
await warm("news_list", () => getNewsList(4));
|
|
// The homepage reads its own roster/photo keys, so priming only the counters
|
|
// left the first visitor after a deploy paying for the sections anyway.
|
|
await warm("home_online_users", () =>
|
|
cached("home_online_users", 15_000, () => listOnlineUsers(12), {
|
|
staleMs: 30_000,
|
|
}),
|
|
);
|
|
await warm("home_recent_photos", () =>
|
|
cached("home_recent_photos", 60_000, loadRecentPhotos, {
|
|
staleMs: 120_000,
|
|
}),
|
|
);
|
|
}
|
|
|
|
async function loadRecentPhotos() {
|
|
return db
|
|
.select({ id: CameraWeb.id, url: CameraWeb.url })
|
|
.from(CameraWeb)
|
|
.orderBy(desc(CameraWeb.timestamp))
|
|
.limit(4);
|
|
}
|
|
|
|
async function listOnlineUsers(limit: number) {
|
|
return db
|
|
.select({ id: User.id, username: User.username, look: User.look })
|
|
.from(User)
|
|
.where(eq(User.online, "1"))
|
|
.limit(limit);
|
|
}
|
|
|
|
async function loadStaff() {
|
|
const minStaffRank =
|
|
Number(await siteSettings.get("min_staff_rank", "7")) || 7;
|
|
return db
|
|
.select({
|
|
username: User.username,
|
|
look: User.look,
|
|
rank: User.rank,
|
|
motto: User.motto,
|
|
})
|
|
.from(User)
|
|
.where(gte(User.rank, minStaffRank))
|
|
.orderBy(desc(User.rank), asc(User.username))
|
|
.limit(100);
|
|
}
|
|
|
|
async function loadTeams() {
|
|
return db
|
|
.select({
|
|
id: WebsiteTeams.id,
|
|
rankName: WebsiteTeams.rankName,
|
|
badge: WebsiteTeams.badge,
|
|
jobDescription: WebsiteTeams.jobDescription,
|
|
staffColor: WebsiteTeams.staffColor,
|
|
})
|
|
.from(WebsiteTeams)
|
|
.where(eq(WebsiteTeams.hiddenRank, false))
|
|
.orderBy(asc(WebsiteTeams.id));
|
|
}
|