openhands
6cc45d7413
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.
91 lines
3.1 KiB
TypeScript
91 lines
3.1 KiB
TypeScript
import "server-only";
|
|
|
|
import { and, count, eq, or, sql } from "drizzle-orm";
|
|
import { cached } from "@/lib/cache";
|
|
import { CameraWeb, db, Rooms, User, WebsiteArticles } from "@/lib/db";
|
|
|
|
/**
|
|
* Row counters for the public homepage.
|
|
*
|
|
* These live in one place on purpose: the homepage and the boot warm-up both
|
|
* populate the same cache keys, so two different implementations would race to
|
|
* write different values into the same entry.
|
|
*/
|
|
|
|
/*
|
|
* These are exact counts on purpose.
|
|
*
|
|
* `information_schema.TABLES.TABLE_ROWS` was tried here as a cheap stand-in,
|
|
* because an exact COUNT(*) walks an index. Measured against the real database
|
|
* it turned out to be pointless: `users` has 165 rows, `rooms` 92 and
|
|
* `camera_web` 0, and the estimate was 0.00% off on all three. An index scan
|
|
* over 165 rows costs less than the round trip the estimate would have saved,
|
|
* while the estimate carries a real risk of displaying a plausible but wrong
|
|
* member count — and InnoDB's accuracy degrades as a table grows. If these
|
|
* tables ever reach six figures, revisit the trade; below that, exactness is
|
|
* free.
|
|
*/
|
|
|
|
export async function countUsers(): Promise<number> {
|
|
const [row] = await db.select({ total: count() }).from(User);
|
|
return row?.total ?? 0;
|
|
}
|
|
|
|
export async function countRooms(): Promise<number> {
|
|
const [row] = await db.select({ total: count() }).from(Rooms);
|
|
return row?.total ?? 0;
|
|
}
|
|
|
|
export async function countPhotos(): Promise<number> {
|
|
const [row] = await db.select({ total: count() }).from(CameraWeb);
|
|
return row?.total ?? 0;
|
|
}
|
|
|
|
/**
|
|
* Published articles only — the same filter `getNewsList` renders from, so the
|
|
* "Articles" figure on the homepage can never disagree with the news section
|
|
* that sits next to it.
|
|
*/
|
|
export async function countArticles(): Promise<number> {
|
|
const [row] = await db
|
|
.select({ total: count() })
|
|
.from(WebsiteArticles)
|
|
.where(
|
|
and(
|
|
eq(WebsiteArticles.status, "published"),
|
|
or(
|
|
sql`${WebsiteArticles.publishAt} IS NULL`,
|
|
sql`${WebsiteArticles.publishAt} <= NOW()`,
|
|
),
|
|
),
|
|
);
|
|
return row?.total ?? 0;
|
|
}
|
|
|
|
/**
|
|
* Online users is deliberately *not* estimated: it is read from an index over a
|
|
* small subset of rows, it is the one counter people watch closely, and being a
|
|
* few seconds behind looks broken rather than approximate.
|
|
*/
|
|
export async function countOnline(): Promise<number> {
|
|
const [row] = await db
|
|
.select({ total: count() })
|
|
.from(User)
|
|
.where(eq(User.online, "1"));
|
|
return row?.total ?? 0;
|
|
}
|
|
|
|
// ── Shared hot read: online counter ───────────────────────────────────
|
|
//
|
|
// One function for every caller (homepage, login, register, headers, the client
|
|
// page and the warm-up). Each call site used to inline this, and the ones that
|
|
// omitted `staleMs` wrote an entry without a grace window, which made the key
|
|
// block on COUNT(*) at every TTL boundary.
|
|
export const ONLINE_COUNT_TTL_MS = 10_000;
|
|
|
|
export async function cachedOnlineCount(): Promise<number> {
|
|
return cached("online_count", ONLINE_COUNT_TTL_MS, countOnline, {
|
|
staleMs: 15_000,
|
|
});
|
|
}
|