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.
117 lines
4.3 KiB
TypeScript
117 lines
4.3 KiB
TypeScript
import { eq } from "drizzle-orm";
|
|
import { LogOut } from "lucide-react";
|
|
import { redirect } from "next/navigation";
|
|
import { getTranslations } from "next-intl/server";
|
|
import type { ReactNode } from "react";
|
|
import { AdminHubChrome } from "@/components/admin/admin-hub-chrome";
|
|
import { AdminMobileWrapper } from "@/components/admin/admin-mobile-wrapper";
|
|
import { AdminSidebarNav } from "@/components/admin/admin-sidebar-nav";
|
|
import { AdminToaster } from "@/components/admin/admin-toaster";
|
|
import { AdminTopbar } from "@/components/admin/admin-topbar";
|
|
import { LanguageSwitcher } from "@/components/language-switcher";
|
|
import Link from "@/components/link";
|
|
import { ThemeSwitcher } from "@/components/theme-switcher";
|
|
import { requireStaff } from "@/lib/admin/guard";
|
|
import { loadAdminNavigation } from "@/lib/admin/navigation";
|
|
import { db, User } from "@/lib/db";
|
|
import { readCsrfCookieToken } from "@/lib/foundation/security";
|
|
import { siteSettings } from "@/lib/services/site-settings";
|
|
|
|
// Request-time auth, existing CSRF cookie, and optional 2FA gate cannot be
|
|
// statically rendered. The root layout's Cache Components opt-out
|
|
// (instant = false) covers this route tree — leaf opt-outs are redundant.
|
|
|
|
export default async function AdminLayout({
|
|
children,
|
|
}: {
|
|
children: ReactNode;
|
|
}) {
|
|
const staff = await requireStaff();
|
|
const navigation = await loadAdminNavigation();
|
|
const csrfToken = await readCsrfCookieToken();
|
|
if (await siteSettings.getBool("force_staff_2fa", false)) {
|
|
const u = await db
|
|
.select({ twoFactorConfirmedAt: User.twoFactorConfirmedAt })
|
|
.from(User)
|
|
.where(eq(User.id, staff.id))
|
|
.limit(1)
|
|
.then((rows) => rows[0] ?? null)
|
|
.catch(() => null);
|
|
if (!u?.twoFactorConfirmedAt) redirect("/settings/2fa?error=staffrequired");
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{csrfToken ? <meta name="csrf-token" content={csrfToken} /> : null}
|
|
<AdminMobileWrapper sidebar={<Sidebar staff={staff} />}>
|
|
<div
|
|
data-admin
|
|
className="flex flex-col min-w-0 p-5 lg:p-6 min-h-full"
|
|
style={{ backgroundColor: "var(--admin-canvas)" }}
|
|
>
|
|
<AdminTopbar staff={staff} navigation={navigation} />
|
|
<section className="admin-page flex-1">
|
|
<AdminHubChrome>{children}</AdminHubChrome>
|
|
</section>
|
|
</div>
|
|
</AdminMobileWrapper>
|
|
<AdminToaster />
|
|
</>
|
|
);
|
|
}
|
|
|
|
async function Sidebar({
|
|
staff,
|
|
}: {
|
|
staff: { id: number; username: string; rank: number };
|
|
}) {
|
|
const t = await getTranslations("pages.admin.nav");
|
|
const initial = staff.username.charAt(0).toUpperCase();
|
|
const { allowedPermissions, isSuperAdmin, navConfig } =
|
|
await loadAdminNavigation();
|
|
|
|
return (
|
|
<aside
|
|
data-admin
|
|
className="max-lg:static sticky top-0 flex h-full max-h-screen min-h-0 w-full flex-col self-start overflow-hidden bg-[var(--admin-sidebar-background)] text-[var(--admin-sidebar-text-readable)] shadow-xl lg:h-screen"
|
|
>
|
|
<div className="flex shrink-0 items-center gap-3 border-b border-[var(--admin-border)] px-4 py-5">
|
|
<span
|
|
className="flex-none w-10 h-10 rounded-xl grid place-items-center font-extrabold text-base text-[var(--admin-accent-foreground)] bg-[var(--admin-accent)] shadow-lg shadow-[var(--admin-accent)]/20"
|
|
aria-hidden
|
|
>
|
|
{initial}
|
|
</span>
|
|
<div className="min-w-0 flex-1">
|
|
<div className="font-semibold text-sm text-[var(--admin-sidebar-text-readable)] truncate">
|
|
{staff.username}
|
|
</div>
|
|
<span className="inline-block mt-0.5 text-[0.6rem] font-bold uppercase tracking-widest text-[var(--admin-sidebar-muted-readable)]">
|
|
{t("rankLabel", { rank: staff.rank })}
|
|
</span>
|
|
</div>
|
|
<div className="flex items-center gap-1.5 shrink-0">
|
|
<LanguageSwitcher variant="admin" />
|
|
<ThemeSwitcher variant="admin" />
|
|
</div>
|
|
</div>
|
|
|
|
<AdminSidebarNav
|
|
allowedPermissions={allowedPermissions}
|
|
isSuperAdmin={isSuperAdmin}
|
|
navConfig={navConfig}
|
|
/>
|
|
|
|
<div className="shrink-0 border-t border-[var(--admin-border)] px-3 py-3">
|
|
<Link
|
|
href="/"
|
|
className="flex items-center gap-2.5 px-2.5 py-2 rounded-lg text-[var(--admin-sidebar-muted-readable)] text-xs font-medium hover:text-[var(--admin-sidebar-text-readable)] hover:bg-[var(--admin-accent)]/10 transition-all duration-150 no-underline"
|
|
>
|
|
<LogOut size={14} />
|
|
<span>{t("backToSite")}</span>
|
|
</Link>
|
|
</div>
|
|
</aside>
|
|
);
|
|
}
|