Compare commits

..
3 Commits
Author SHA1 Message Date
dmg c2ac2ad16b feat(auth): verify machine tokens for admin read APIs
CI / validate (push) Successful in 6m49s
Release / release (push) Successful in 11m24s
2026-09-10 14:53:47 -04:00
dmg 2402e9e42d feat(admin): browse Discord suggestions in the portal
CI / validate (push) Successful in 7m26s
Release / release (push) Successful in 9m43s
2026-09-10 08:21:08 -04:00
dmg 0af4884f7e fix(deps): patch framework and tooling vulnerabilities
CI / validate (push) Successful in 7m32s
Release / release (push) Successful in 10m52s
2026-09-10 08:00:50 -04:00
27 changed files with 1348 additions and 372 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ Open `http://localhost:3000`.
## Admin suggestions
Administrators can read the configured Discord forum through the session-protected [suggestions API](docs/admin-suggestions-api.md). Set `DISCORD_SUGGESTIONS_FORUM_ID` through GitOps; the existing bot token stays server-side. This integration is read-only and does not synchronize data into the database.
Administrators can browse the configured Discord forum at `/admin/suggestions` or use the same session-protected [suggestions API](docs/admin-suggestions-api.md). The portal includes active/archive browsing, original posts, reactions, and paginated discussion. Set `DISCORD_SUGGESTIONS_FORUM_ID` through GitOps; the existing bot token stays server-side. This integration is read-only and does not synchronize data into the database.
## Product design
+3 -2
View File
@@ -19,8 +19,9 @@
"@minecraft-account-manager/network": "*",
"d3-geo": "^3.1.1",
"drizzle-orm": "^0.45.1",
"jose": "^6.2.12",
"leaflet": "^1.9.4",
"next": "^16.2.1",
"next": "^16.3.4",
"next-auth": "^4.24.13",
"rcon-client": "^4.2.5",
"react": "^19.2.3",
@@ -38,7 +39,7 @@
"@types/react-dom": "^19.2.3",
"@types/topojson-client": "^3.1.5",
"eslint": "^9.39.4",
"eslint-config-next": "^16.2.1",
"eslint-config-next": "^16.3.4",
"jsdom": "^30.0.1",
"tailwindcss": "^4.2.1",
"typescript": "^5.9.3",
@@ -39,6 +39,7 @@ export default async function AdminConsoleLayout({ children }: { children: React
<Link className="hover:text-accent" href="/admin/users">Users</Link>
<Link className="hover:text-accent" href="/admin/groups">Groups</Link>
<Link className="hover:text-accent" href="/admin/rcon">RCON</Link>
<Link className="hover:text-accent" href="/admin/suggestions">Suggestions</Link>
<Link className="hover:text-accent" href="/admin/events">Events</Link>
</nav>
<AdminSignOutButton />
@@ -0,0 +1,16 @@
import Link from "next/link";
import { notFound } from "next/navigation";
import { SuggestionReader } from "@/components/suggestion-reader";
import { requireAdminSession } from "@/lib/auth/require-admin";
export const dynamic = "force-dynamic";
export default async function SuggestionPage({ params }: { params: Promise<{ id: string }> }) {
await requireAdminSession();
const { id } = await params;
if (!/^[1-9]\d{16,19}$/.test(id)) notFound();
return <main className="mx-auto max-w-6xl px-6 py-14">
<Link className="mb-8 inline-block font-mono text-[10px] font-bold uppercase tracking-wider underline underline-offset-4 hover:text-accent" href="/admin/suggestions"> All suggestions</Link>
<SuggestionReader id={id} key={id} />
</main>;
}
@@ -0,0 +1,14 @@
import { renderToStaticMarkup } from "react-dom/server";
import { expect, it, vi } from "vitest";
vi.mock("next-auth", () => ({ getServerSession: async () => ({ user: { roles: ["ops"] } }) }));
vi.mock("@/lib/auth/admin-auth", () => ({ adminAuthOptions: {}, requiredAdminRole: "ops" }));
vi.mock("next/headers", () => ({ headers: async () => new Headers() }));
vi.mock("@minecraft-account-manager/database", () => ({ recordEvent: vi.fn() }));
vi.mock("@/lib/database", () => ({ db: {} }));
vi.mock("@/components/admin-sign-out-button", () => ({ AdminSignOutButton: () => <button>Sign out</button> }));
import AdminConsoleLayout from "../layout";
it("adds suggestions to administrator navigation", async () => {
const markup = renderToStaticMarkup(await AdminConsoleLayout({ children: <p>Console</p> }));
expect(markup).toContain('href="/admin/suggestions"');
expect(markup).toContain("Suggestions</a>");
});
@@ -0,0 +1,26 @@
import { renderToStaticMarkup } from "react-dom/server";
import { beforeEach, expect, it, vi } from "vitest";
const mocks = vi.hoisted(() => ({ requireAdmin: vi.fn() }));
vi.mock("@/lib/auth/require-admin", () => ({ requireAdminSession: mocks.requireAdmin }));
vi.mock("@/components/suggestions-browser", () => ({ SuggestionsBrowser: () => <div>Suggestions browser</div> }));
vi.mock("@/components/suggestion-reader", () => ({ SuggestionReader: ({ id }: { id: string }) => <div>Reader {id}</div> }));
import SuggestionsPage from "./page";
import SuggestionPage from "./[id]/page";
const params = Promise.resolve({ id: "100000000000000009" });
beforeEach(() => { mocks.requireAdmin.mockReset(); });
it("independently requires the admin guard before rendering either page", async () => {
mocks.requireAdmin.mockRejectedValue(new Error("Admin sign-in required"));
await expect(SuggestionsPage()).rejects.toThrow("Admin sign-in required");
await expect(SuggestionPage({ params })).rejects.toThrow("Admin sign-in required");
});
it("renders the browser and detail in the existing portal layout", async () => {
mocks.requireAdmin.mockResolvedValue({ name: "Admin" });
expect(renderToStaticMarkup(await SuggestionsPage())).toContain("Suggestions browser");
const detail = renderToStaticMarkup(await SuggestionPage({ params }));
expect(detail).toContain("Reader");
expect(detail).toContain('href="/admin/suggestions"');
});
it("rejects malformed IDs rather than constructing arbitrary API URLs", async () => {
mocks.requireAdmin.mockResolvedValue({ name: "Admin" });
await expect(SuggestionPage({ params: Promise.resolve({ id: "../secret" }) })).rejects.toThrow("NEXT_HTTP_ERROR_FALLBACK;404");
});
@@ -0,0 +1,19 @@
import { SuggestionsBrowser } from "@/components/suggestions-browser";
import { requireAdminSession } from "@/lib/auth/require-admin";
export const dynamic = "force-dynamic";
export default async function SuggestionsPage() {
await requireAdminSession();
return <main className="mx-auto max-w-6xl px-6 py-14">
<header className="relative overflow-hidden border-b border-line pb-8">
<p className="font-mono text-xs font-bold uppercase tracking-[0.25em] text-accent">Community / Idea desk</p>
<h1 className="mt-4 font-display text-5xl font-black uppercase sm:text-7xl">Suggestions</h1>
<div className="mt-5 flex flex-wrap items-end justify-between gap-5">
<p className="max-w-2xl text-sm leading-6 text-muted">Ideas from the Discord forum, brought into the operations desk. Read proposals and discussion here; keep the conversation in Discord.</p>
<span className="border border-ink bg-signal px-3 py-2 font-mono text-[10px] font-bold uppercase tracking-widest">Admin-only / Read-only</span>
</div>
</header>
<SuggestionsBrowser />
</main>;
}
@@ -0,0 +1,57 @@
import { afterEach, beforeAll, beforeEach, expect, it, vi } from "vitest";
import { exportJWK, generateKeyPair, SignJWT } from "jose";
const auth = vi.hoisted(() => ({ session: vi.fn() }));
vi.mock("next-auth", () => ({ getServerSession: auth.session }));
vi.mock("@/lib/auth/admin-auth", () => ({ adminAuthOptions: {}, requiredAdminRole: "ops" }));
const issuer = "https://sso.example/realms/operators";
let signed: string;
const fetcher = vi.fn();
beforeAll(async () => {
const keys = await generateKeyPair("RS256");
const jwks = { keys: [{ ...await exportJWK(keys.publicKey), kid: "whoami-key", alg: "RS256" }] };
fetcher.mockImplementation(async () => Response.json(jwks));
signed = await new SignJWT({ resource_access: { portal: { roles: ["ops"] } }, name: "Not exposed", email: "private@example.test" })
.setProtectedHeader({ alg: "RS256", kid: "whoami-key" }).setIssuer(issuer).setAudience("portal")
.setSubject("machine-subject").setExpirationTime("5m").sign(keys.privateKey);
});
beforeEach(() => {
vi.stubEnv("KEYCLOAK_ISSUER_URL", issuer);
vi.stubEnv("KEYCLOAK_CLIENT_ID", "portal");
vi.stubGlobal("fetch", fetcher);
});
afterEach(() => { auth.session.mockReset(); vi.unstubAllEnvs(); vi.unstubAllGlobals(); });
import { GET as get } from "./route";
function request(authorization?: string) {
return new Request("https://portal.example/api/admin/whoami", { headers: authorization === undefined ? {} : { authorization } });
}
it("returns only a safe machine identity through real bearer verification", async () => {
auth.session.mockResolvedValue({ user: { roles: ["ops"] } });
const response = await get(request(`Bearer ${signed}`));
expect(response.status).toBe(200);
expect(response.headers.get("cache-control")).toBe("no-store");
expect(await response.json()).toEqual({ authenticationMethod: "bearer", subject: "machine-subject", name: null, email: null });
expect(auth.session).not.toHaveBeenCalled();
});
it("returns the existing browser identity without roles or session internals", async () => {
auth.session.mockResolvedValue({ user: { name: "Admin", email: "admin@example.test", roles: ["ops"], image: "private-image" }, expires: "private-expiry" });
const response = await get(request());
expect(response.status).toBe(200);
expect(response.headers.get("cache-control")).toBe("no-store");
expect(await response.json()).toEqual({ authenticationMethod: "session", subject: null, name: "Admin", email: "admin@example.test" });
});
it.each([401, 403, 503])("returns a safe %s problem for browser auth failures", async (status) => {
if (status === 503) auth.session.mockRejectedValue(new Error("private-session-error"));
else auth.session.mockResolvedValue(status === 401 ? null : { user: { roles: [] } });
const response = await get(request());
expect(response.status).toBe(status);
expect(response.headers.get("content-type")).toBe("application/problem+json");
expect(response.headers.get("www-authenticate")).toBe(status === 401 ? 'Bearer realm="admin-api"' : null);
expect(await response.json()).toMatchObject({ status, instance: "/api/admin/whoami" });
});
it("never falls back to browser auth for a supplied invalid token", async () => {
auth.session.mockResolvedValue({ user: { roles: ["ops"] } });
const response = await get(request("Bearer invalid"));
expect(response.status).toBe(401);
expect(auth.session).not.toHaveBeenCalled();
});
@@ -0,0 +1,10 @@
import { authorizeAdminApi } from "@/lib/auth/admin-api-auth";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
export async function GET(request: Request) {
const authorization = await authorizeAdminApi(request);
if (authorization.response) return authorization.response;
return Response.json(authorization.identity, { headers: { "cache-control": "no-store" } });
}
@@ -0,0 +1,70 @@
import { afterEach, beforeAll, beforeEach, expect, it, vi } from "vitest";
import { exportJWK, generateKeyPair, SignJWT } from "jose";
const auth = vi.hoisted(() => ({ session: vi.fn() }));
vi.mock("next-auth", () => ({ getServerSession: auth.session }));
vi.mock("@/lib/auth/admin-auth", () => ({ adminAuthOptions: {}, requiredAdminRole: "ops" }));
import { GET as list, POST } from "./route";
import { GET as detail } from "./[id]/route";
import { GET as messages } from "./[id]/messages/route";
const issuer = "https://sso.example/realms/operators";
const guildId = "100000000000000001";
const forumId = "100000000000000002";
const threadId = "100000000000000009";
const context = { params: Promise.resolve({ id: threadId }) };
const thread = { id: threadId, guild_id: guildId, parent_id: forumId, type: 11, name: "Suggestion", owner_id: "100000000000000003", applied_tags: [], message_count: 0, thread_metadata: { archived: false, locked: false } };
let signed: string;
let roleless: string;
let jwks: unknown;
const fetcher = vi.fn();
beforeAll(async () => {
const keys = await generateKeyPair("RS256");
jwks = { keys: [{ ...await exportJWK(keys.publicKey), kid: "suggestions-key", alg: "RS256" }] };
const sign = (roles: string[]) => new SignJWT({ resource_access: { portal: { roles } }, realm_access: { roles: ["ops"] } })
.setProtectedHeader({ alg: "RS256", kid: "suggestions-key" }).setIssuer(issuer).setAudience("portal")
.setSubject("machine-subject").setExpirationTime("5m").sign(keys.privateKey);
signed = await sign(["ops"]);
roleless = await sign([]);
});
beforeEach(() => {
vi.stubEnv("KEYCLOAK_ISSUER_URL", issuer);
vi.stubEnv("KEYCLOAK_CLIENT_ID", "portal");
vi.stubEnv("DISCORD_BOT_TOKEN", "test-only-bot-token");
vi.stubEnv("DISCORD_GUILD_ID", guildId);
vi.stubEnv("DISCORD_SUGGESTIONS_FORUM_ID", forumId);
auth.session.mockResolvedValue({ user: { roles: ["ops"] } });
fetcher.mockImplementation(async (input: string) => {
if (input === `${issuer}/protocol/openid-connect/certs`) return Response.json(jwks);
const path = String(input).replace("https://discord.com/api/v10", "");
if (path === `/channels/${forumId}`) return Response.json({ id: forumId, guild_id: guildId, type: 15, available_tags: [] });
if (path === `/guilds/${guildId}/threads/active`) return Response.json({ threads: [] });
if (path === `/channels/${threadId}`) return Response.json(thread);
if (path === `/channels/${threadId}/messages/${threadId}`) return new Response(null, { status: 404 });
if (path === `/channels/${threadId}/messages?limit=25`) return Response.json([]);
throw new Error("Unexpected transport request");
});
vi.stubGlobal("fetch", fetcher);
});
afterEach(() => { vi.resetAllMocks(); vi.unstubAllEnvs(); vi.unstubAllGlobals(); });
function request(token: string) {
return new Request("https://portal.example/api/suggestions", { headers: { authorization: `Bearer ${token}` } });
}
it.each([list, detail, messages])("accepts signed machine credentials on each read route", async (handler) => {
const response = await handler(request(signed), context);
expect(response.status).toBe(200);
expect(response.headers.get("cache-control")).toBe("no-store");
expect(auth.session).not.toHaveBeenCalled();
});
it.each([list, detail, messages])("denies invalid or role-less bearer credentials even with an admin session and cached data", async (handler) => {
expect((await handler(request(signed), context)).status).toBe(200);
fetcher.mockClear();
expect((await handler(request("invalid"), context)).status).toBe(401);
expect((await handler(request(roleless), context)).status).toBe(403);
expect(fetcher).not.toHaveBeenCalled();
expect(auth.session).not.toHaveBeenCalled();
});
it("does not enable writes for machine identities", async () => {
const response = await POST(request(signed));
expect(response.status).toBe(405);
expect(response.headers.get("allow")).toBe("GET, HEAD");
expect(auth.session).not.toHaveBeenCalled();
});
@@ -8,6 +8,19 @@ import { GET as messages } from "./[id]/messages/route";
const context = { params: Promise.resolve({ id: "100000000000000009" }) };
const request = () => new Request("https://portal.example/api/suggestions");
it.each(["Bearer invalid", "Basic invalid", "", "Bearer", "Bearer a, Bearer b"])("rejects supplied authorization %j without session fallback", async (authorization) => {
auth.session.mockResolvedValue({ user: { roles: ["ops"] } });
const fetcher = vi.fn();
vi.stubGlobal("fetch", fetcher);
const response = await GET(new Request(request(), { headers: { authorization } }));
expect(response.status).toBe(401);
expect(response.headers.get("www-authenticate")).toBe('Bearer realm="admin-api"');
expect(response.headers.get("content-type")).toBe("application/problem+json");
expect(response.headers.get("cache-control")).toBe("no-store");
expect(await response.json()).toMatchObject({ type: "urn:error:unauthorized", status: 401, instance: "/api/suggestions" });
expect(auth.session).not.toHaveBeenCalled();
expect(fetcher).not.toHaveBeenCalled();
});
afterEach(() => { vi.resetAllMocks(); vi.unstubAllGlobals(); vi.unstubAllEnvs(); });
it("serves suggestions to the existing admin session using runtime env configuration", async () => {
auth.session.mockResolvedValue({ user: { roles: ["ops"] } });
@@ -68,4 +81,5 @@ it("rejects unauthenticated readers with a JSON problem instead of a redirect",
expect(response.status).toBe(401);
expect(response.headers.get("content-type")).toBe("application/problem+json");
expect(response.headers.get("location")).toBeNull();
expect(response.headers.get("www-authenticate")).toBe('Bearer realm="admin-api"');
});
@@ -0,0 +1,68 @@
// @vitest-environment jsdom
import { cleanup, fireEvent, render, screen } from "@testing-library/react";
import { afterEach, expect, it, vi } from "vitest";
import { SuggestionReader } from "./suggestion-reader";
const id = "100000000000000009";
const original = { id, author: { id: "100000000000000003", name: "Builder" }, content: "<script>unsafe()</script> Please build stations.", createdAt: "2026-01-01T00:00:00Z", editedAt: null, reactions: [{ emoji: "👍", count: 4 }], discordUrl: `https://discord.com/channels/100000000000000001/${id}/${id}` };
const detail = { id, title: "More railway stations", authorId: original.author.id, createdAt: original.createdAt, archived: false, locked: false, tags: [{ id: "100000000000000004", name: "World" }], messageCount: 3, discordUrl: `https://discord.com/channels/100000000000000001/${id}`, originalPost: original };
it("paginates discussion without duplicating the original post", async () => {
const fetcher = vi.fn().mockImplementation(async (url: string) => {
if (!url.includes("/messages")) return Response.json(detail);
const older = url.includes("cursor=");
return Response.json({ items: [original, { ...original, id: "100000000000000020", content: older ? "Earlier reply" : "Latest reply", editedAt: "2026-01-01T01:00:00Z" }], nextCursor: older ? null : "100000000000000020" });
});
vi.stubGlobal("fetch", fetcher);
render(<SuggestionReader id={id} />);
await screen.findByText("Latest reply");
expect(screen.getAllByText(original.content)).toHaveLength(1);
fireEvent.click(screen.getByRole("button", { name: "Next page" }));
await screen.findByText("Earlier reply");
expect(fetcher.mock.lastCall?.[0]).toBe(`/api/suggestions/${id}/messages?limit=25&cursor=100000000000000020`);
expect(screen.getByText("2026-01-01T01:00:00Z")).toBeTruthy();
fireEvent.click(screen.getByRole("button", { name: "Previous page" }));
await screen.findByText("Latest reply");
});
it("distinguishes deleted starters and empty discussion", async () => {
vi.stubGlobal("fetch", vi.fn().mockImplementation(async (url: string) => Response.json(url.includes("/messages") ? { items: [], nextCursor: null } : { ...detail, originalPost: null })));
render(<SuggestionReader id={id} />);
expect(await screen.findByText("The original post was deleted or is unavailable.")).toBeTruthy();
expect(await screen.findByText("No replies on this page.")).toBeTruthy();
});
it("handles detail access denial without loading the discussion", async () => {
const fetcher = vi.fn().mockResolvedValue(Response.json({}, { status: 403 }));
vi.stubGlobal("fetch", fetcher);
render(<SuggestionReader id={id} />);
await screen.findByRole("link", { name: "Admin sign-in" });
expect(screen.queryByRole("heading", { name: "More railway stations" })).toBeNull();
expect(fetcher).toHaveBeenCalledTimes(1);
});
it("makes empty message content explicit and retries discussion failures without writes", async () => {
let messageReads = 0;
const fetcher = vi.fn().mockImplementation(async (url: string) => {
if (!url.includes("/messages")) return Response.json({ ...detail, originalPost: { ...original, content: "" } });
messageReads += 1;
return messageReads === 1 ? new Response(null, { status: 503 }) : Response.json({ items: [], nextCursor: null });
});
vi.stubGlobal("fetch", fetcher);
render(<SuggestionReader id={id} />);
await screen.findByText("No text was returned. View this message in Discord.");
await screen.findByRole("alert");
fireEvent.click(screen.getByRole("button", { name: "Try again" }));
await screen.findByText("No replies on this page.");
expect(fetcher.mock.calls.every(([, options]) => options.method === undefined || options.method === "GET")).toBe(true);
});
afterEach(() => { cleanup(); vi.unstubAllGlobals(); });
it("reads suggestion details and safely renders starter text, tags, reactions and Discord links", async () => {
const fetcher = vi.fn().mockImplementation(async (url: string) => Response.json(url.includes("/messages") ? { items: [], nextCursor: null } : detail));
vi.stubGlobal("fetch", fetcher);
render(<SuggestionReader id={id} />);
expect(screen.getByRole("status").textContent).toContain("Loading suggestion");
await screen.findByRole("heading", { name: "More railway stations", level: 1 });
expect(screen.getByText(original.content)).toBeTruthy();
expect(document.querySelector("script")).toBeNull();
expect(screen.getByText("World")).toBeTruthy();
expect(screen.getByText("👍 4")).toBeTruthy();
expect(screen.getByRole("link", { name: "Open in Discord" }).getAttribute("href")).toBe(detail.discordUrl);
expect(fetcher.mock.calls[0]?.[0]).toBe(`/api/suggestions/${id}`);
expect(screen.queryByRole("textbox")).toBeNull();
});
@@ -0,0 +1,67 @@
"use client";
import type { MessagePage, SuggestionDetail, SuggestionMessage } from "@/lib/discord/suggestion-types";
import { SuggestionBadges, SuggestionFailure, SuggestionLoading, SuggestionPagination, suggestionControl, useSuggestionRead, useSuggestionPages, type SuggestionPaging } from "./suggestion-shared";
export function SuggestionReader({ id }: { id: string }) {
const { data, error, retry } = useSuggestionRead<SuggestionDetail>(`/api/suggestions/${id}`);
if (error) return <SuggestionFailure error={error} retry={retry} />;
if (!data) return <SuggestionLoading>Loading suggestion</SuggestionLoading>;
return <>
<header className="border-b border-line pb-8">
<p className="mb-5 font-mono text-xs font-bold uppercase tracking-[0.25em] text-accent">Community proposal / Read-only</p>
<SuggestionBadges suggestion={data} />
<h1 className="mt-5 break-words font-display text-4xl font-black sm:text-6xl">{data.title}</h1>
<div className="mt-6 flex flex-wrap items-center justify-between gap-5">
<p className="break-all font-mono text-[10px] leading-5 text-muted">Thread / {data.id}<br /><time dateTime={data.createdAt}>{data.createdAt}</time></p>
<a className={`${suggestionControl} bg-ink text-panel`} href={data.discordUrl} rel="noopener noreferrer" target="_blank">Open in Discord</a>
</div>
</header>
<section aria-labelledby="original-post-heading" className="mt-10 border border-ink bg-panel shadow-[8px_8px_0_var(--color-shadow)]">
<div className="border-b border-line px-6 py-4"><h2 className="font-mono text-[10px] font-bold uppercase tracking-[0.2em]" id="original-post-heading">Original suggestion</h2></div>
{data.originalPost ? <MessageCard message={data.originalPost} /> : <p className="p-6 text-sm text-muted">The original post was deleted or is unavailable.</p>}
</section>
<Discussion id={id} />
<p className="mt-6 text-xs leading-5 text-muted">Discord remains the source of truth. Open Discord for attachments, formatting, replies, and reactions. Message text may be unavailable if the bot lacks Message Content access.</p>
</>;
}
function Discussion({ id }: { id: string }) {
const paging = useSuggestionPages();
const query = new URLSearchParams({ limit: "25" });
if (paging.cursor) query.set("cursor", paging.cursor);
const url = `/api/suggestions/${id}/messages?${query}`;
return <section aria-labelledby="discussion-heading" className="mt-12">
<header className="mb-5 flex flex-wrap items-end justify-between gap-3">
<h2 className="font-display text-3xl font-black uppercase" id="discussion-heading">Discussion</h2>
<p className="font-mono text-[10px] uppercase tracking-wider text-muted">Newest messages first / Read-only</p>
</header>
<DiscussionPage id={id} key={url} paging={paging} url={url} />
</section>;
}
function DiscussionPage({ id, url, paging }: { id: string; url: string; paging: SuggestionPaging }) {
const { data, error, retry } = useSuggestionRead<MessagePage>(url);
if (error) return <SuggestionFailure error={error} retry={retry} />;
if (!data) return <SuggestionLoading>Loading discussion</SuggestionLoading>;
const replies = data.items.filter((message) => message.id !== id);
return <>
<div className="divide-y divide-line border border-line bg-panel">
{replies.map((message) => <MessageCard key={message.id} message={message} />)}
{!replies.length && <p className="p-8 text-sm text-muted">No replies on this page.</p>}
</div>
<SuggestionPagination nextCursor={data.nextCursor} {...paging} />
</>;
}
function MessageCard({ message }: { message: SuggestionMessage }) {
return <article className="min-w-0 p-6 sm:p-8">
<header className="flex flex-wrap items-baseline justify-between gap-3">
<h3 className="break-words font-display text-lg font-black">{message.author.name}</h3>
<a aria-label={`Open message by ${message.author.name} in Discord`} className="font-mono text-[10px] text-muted underline underline-offset-4 hover:text-accent" href={message.discordUrl} rel="noopener noreferrer" target="_blank"><time dateTime={message.createdAt}>{message.createdAt}</time></a>
</header>
<p className="mt-5 whitespace-pre-wrap break-words text-sm leading-7 [overflow-wrap:anywhere]">{message.content || "No text was returned. View this message in Discord."}</p>
{message.editedAt && <p className="mt-3 font-mono text-[10px] text-muted">Edited <time dateTime={message.editedAt}>{message.editedAt}</time></p>}
{!!message.reactions.length && <ul aria-label="Reaction counts" className="mt-5 flex flex-wrap gap-2">{message.reactions.map((reaction, index) => <li className="border border-line bg-canvas px-3 py-1 font-mono text-xs" key={`${reaction.emoji}-${index}`}>{reaction.emoji} {reaction.count}</li>)}</ul>}
</article>;
}
@@ -0,0 +1,80 @@
"use client";
import Link from "next/link";
import { useEffect, useRef, useState } from "react";
import type { Suggestion } from "@/lib/discord/suggestion-types";
export const suggestionControl = "border border-ink px-4 py-3 font-mono text-[10px] font-bold uppercase tracking-wider transition-colors hover:bg-ink hover:text-panel disabled:cursor-not-allowed disabled:opacity-40";
// Consumers remount on URL changes so previous-page data is never shown as new data.
type ReadFailure = { status: number; message: string };
class ReadError extends Error { constructor(public status: number) { super("Suggestions request failed"); } }
function readFailure(error: unknown): ReadFailure {
const status = error instanceof ReadError ? error.status : 0;
const messages: Record<number, string> = {
401: "Your admin session has expired. Sign in to continue.",
403: "Your account does not have the required administrator role.",
404: "This suggestion is no longer available in the configured forum.",
503: "Discord suggestions are temporarily unavailable or not configured. Try again shortly.",
};
return { status, message: messages[status] ?? "Suggestions could not be loaded. Try again shortly." };
}
export function useSuggestionRead<T>(url: string) {
const [result, setResult] = useState<{ data: T | null; error: ReadFailure | null }>({ data: null, error: null });
const [attempt, setAttempt] = useState(0);
useEffect(() => {
const controller = new AbortController();
fetch(url, { credentials: "same-origin", cache: "no-store", signal: controller.signal })
.then(async (response) => {
if (!response.ok) throw new ReadError(response.status);
return await response.json() as T;
})
.then((data) => { if (!controller.signal.aborted) setResult({ data, error: null }); })
.catch((error: unknown) => { if (!controller.signal.aborted) setResult({ data: null, error: readFailure(error) }); });
return () => controller.abort();
}, [url, attempt]);
return { ...result, retry: () => { setResult({ data: null, error: null }); setAttempt((value) => value + 1); } };
}
export function SuggestionBadges({ suggestion }: { suggestion: Suggestion }) {
return <div className="flex flex-wrap gap-2 font-mono text-[10px] font-bold uppercase tracking-wider">
<span className={`border border-ink px-2 py-1 ${suggestion.archived ? "bg-canvas text-muted" : "bg-signal text-ink"}`}>{suggestion.archived ? "Archived" : "Active"}</span>
{suggestion.locked && <span className="border border-line px-2 py-1 text-muted">Locked</span>}
{suggestion.tags.map((tag) => <span className="border border-line px-2 py-1 text-muted" key={tag.id}>{tag.name}</span>)}
</div>;
}
export function SuggestionFailure({ error, retry }: { error: ReadFailure; retry: () => void }) {
const authError = error.status === 401 || error.status === 403;
return <div className="border-l-4 border-accent bg-panel p-6" role="alert">
<h2 className="font-display text-2xl font-black uppercase">{authError ? "Admin access required" : "Unable to load suggestions"}</h2>
<p className="mt-3 text-sm leading-6 text-muted">{error.message}</p>
<div className="mt-5">{authError ? <Link className="font-mono text-xs font-bold underline underline-offset-4" href="/admin/login">Admin sign-in</Link> : <button className={suggestionControl} onClick={retry} type="button">Try again</button>}</div>
</div>;
}
export function useSuggestionPages() {
const [state, setState] = useState<{ cursors: (string | undefined)[]; hasPaged: boolean }>({ cursors: [undefined], hasPaged: false });
return {
cursor: state.cursors.at(-1), page: state.cursors.length, focusOnMount: state.hasPaged,
onNext: (cursor: string) => setState((current) => ({ cursors: [...current.cursors, cursor], hasPaged: true })),
onPrevious: () => setState((current) => ({ cursors: current.cursors.length > 1 ? current.cursors.slice(0, -1) : current.cursors, hasPaged: true })),
reset: () => setState({ cursors: [undefined], hasPaged: false }),
};
}
export type SuggestionPaging = { focusOnMount: boolean; onNext: (cursor: string) => void; onPrevious: () => void; page: number };
export function SuggestionPagination({ nextCursor, onNext, onPrevious, page, focusOnMount }: SuggestionPaging & { nextCursor: string | null }) {
const label = useRef<HTMLParagraphElement>(null);
useEffect(() => { if (focusOnMount) label.current?.focus(); }, [focusOnMount]);
return <nav aria-label="Pagination" className="mt-8 flex flex-wrap items-center justify-between gap-3 border-t border-line pt-6">
<button className={suggestionControl} disabled={page <= 1} onClick={onPrevious} type="button">Previous page</button>
<p aria-live="polite" className="font-mono text-[10px] uppercase tracking-wider text-muted" ref={label} tabIndex={-1}>Page {page}</p>
<button className={suggestionControl} disabled={!nextCursor} onClick={() => { if (nextCursor) onNext(nextCursor); }} type="button">Next page</button>
</nav>;
}
export function SuggestionLoading({ children }: { children: string }) {
return <div className="border border-line bg-panel p-8" role="status"><p className="font-mono text-xs uppercase tracking-widest">{children}</p><div aria-hidden="true" className="mt-6 h-1 w-20 bg-accent" /></div>;
}
@@ -0,0 +1,70 @@
// @vitest-environment jsdom
import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
import { afterEach, expect, it, vi } from "vitest";
import { SuggestionsBrowser } from "./suggestions-browser";
const suggestion = { id: "100000000000000009", title: "More railway stations", authorId: "100000000000000003", createdAt: "2026-01-01T00:00:00Z", archived: false, locked: false, tags: [{ id: "100000000000000004", name: "World" }], messageCount: 3, discordUrl: "https://discord.com/channels/100000000000000001/100000000000000009" };
it("switches archives, pages forward and back, and resets pagination on status change", async () => {
const fetcher = vi.fn().mockImplementation(async (url: string) => {
const archived = url.includes("status=archived");
const next = url.includes("cursor=");
return Response.json({ items: [{ ...suggestion, title: archived ? (next ? "Earlier archived idea" : "Archived idea") : "Active idea", archived }], nextCursor: next ? null : "2026-01-01T00:00:00Z" });
});
vi.stubGlobal("fetch", fetcher);
render(<SuggestionsBrowser />);
await screen.findByRole("link", { name: "Active idea" });
fireEvent.click(screen.getByRole("button", { name: "Archived" }));
await screen.findByRole("link", { name: "Archived idea" });
fireEvent.click(screen.getByRole("button", { name: "Next page" }));
await screen.findByRole("link", { name: "Earlier archived idea" });
expect(fetcher.mock.lastCall?.[0]).toContain("cursor=2026-01-01T00%3A00%3A00Z");
expect(document.activeElement?.textContent).toBe("Page 2");
expect((screen.getByRole("button", { name: "Next page" }) as HTMLButtonElement).disabled).toBe(true);
fireEvent.click(screen.getByRole("button", { name: "Previous page" }));
await screen.findByRole("link", { name: "Archived idea" });
expect(document.activeElement?.textContent).toBe("Page 1");
fireEvent.click(screen.getByRole("button", { name: "Active" }));
await screen.findByRole("link", { name: "Active idea" });
expect(fetcher.mock.lastCall?.[0]).toBe("/api/suggestions?status=active&limit=25");
expect((screen.getByRole("button", { name: "Previous page" }) as HTMLButtonElement).disabled).toBe(true);
});
it("shows an explicit empty state", async () => {
vi.stubGlobal("fetch", vi.fn().mockResolvedValue(Response.json({ items: [], nextCursor: null })));
render(<SuggestionsBrowser />);
expect(await screen.findByText("No suggestions on this page.")).toBeTruthy();
});
it("retries failed reads and distinguishes expired admin access", async () => {
const fetcher = vi.fn().mockResolvedValueOnce(Response.json({ detail: "private upstream text" }, { status: 503 })).mockResolvedValueOnce(Response.json({ items: [], nextCursor: null }));
vi.stubGlobal("fetch", fetcher);
render(<SuggestionsBrowser />);
expect((await screen.findByRole("alert")).textContent).not.toContain("private upstream text");
fireEvent.click(screen.getByRole("button", { name: "Try again" }));
await screen.findByText("No suggestions on this page.");
fetcher.mockResolvedValueOnce(Response.json({}, { status: 401 }));
fireEvent.click(screen.getByRole("button", { name: "Archived" }));
expect((await screen.findByRole("link", { name: "Admin sign-in" })).getAttribute("href")).toBe("/admin/login");
expect(screen.queryByRole("button", { name: "Try again" })).toBeNull();
});
it("ignores a late response from the previously selected status", async () => {
let resolveActive!: (response: Response) => void;
const fetcher = vi.fn().mockImplementationOnce(() => new Promise<Response>((resolve) => { resolveActive = resolve; })).mockResolvedValueOnce(Response.json({ items: [{ ...suggestion, title: "Archived result", archived: true }], nextCursor: null }));
vi.stubGlobal("fetch", fetcher);
render(<SuggestionsBrowser />);
fireEvent.click(screen.getByRole("button", { name: "Archived" }));
await screen.findByRole("link", { name: "Archived result" });
resolveActive(Response.json({ items: [suggestion], nextCursor: null }));
await waitFor(() => expect(fetcher.mock.calls[0]?.[1].signal.aborted).toBe(true));
expect(screen.queryByRole("link", { name: "More railway stations" })).toBeNull();
});
afterEach(() => { cleanup(); vi.unstubAllGlobals(); });
it("loads and displays suggestions with tags and links through the admin API", async () => {
const fetcher = vi.fn().mockResolvedValue(Response.json({ items: [suggestion], nextCursor: null }));
vi.stubGlobal("fetch", fetcher);
render(<SuggestionsBrowser />);
expect(screen.getByRole("status").textContent).toContain("Loading suggestions");
const link = await screen.findByRole("link", { name: "More railway stations" });
expect(link.getAttribute("href")).toBe(`/admin/suggestions/${suggestion.id}`);
expect(screen.getByText("World")).toBeTruthy();
expect(screen.getByRole("link", { name: "Open More railway stations in Discord" }).getAttribute("href")).toBe(suggestion.discordUrl);
expect(fetcher).toHaveBeenCalledWith("/api/suggestions?status=active&limit=25", expect.objectContaining({ credentials: "same-origin", cache: "no-store" }));
});
@@ -0,0 +1,44 @@
"use client";
import Link from "next/link";
import { useState } from "react";
import type { SuggestionPage } from "@/lib/discord/suggestion-types";
import { SuggestionBadges, SuggestionFailure, SuggestionLoading, SuggestionPagination, suggestionControl, useSuggestionRead, useSuggestionPages, type SuggestionPaging } from "./suggestion-shared";
export function SuggestionsBrowser() {
const [status, setStatus] = useState<"active" | "archived">("active");
const paging = useSuggestionPages();
const query = new URLSearchParams({ status, limit: "25" });
if (paging.cursor) query.set("cursor", paging.cursor);
const url = `/api/suggestions?${query}`;
return <section aria-label="Suggestions" className="mt-10">
<div className="mb-6 flex flex-wrap items-center justify-between gap-4">
<div aria-label="Suggestion status" className="flex gap-2">
{(["active", "archived"] as const).map((value) => <button aria-pressed={status === value} className={`${suggestionControl} ${status === value ? "bg-ink text-panel" : "bg-panel"}`} key={value} onClick={() => { setStatus(value); paging.reset(); }} type="button">{value === "active" ? "Active" : "Archived"}</button>)}
</div>
<p className="font-mono text-[10px] uppercase tracking-wider text-muted">{status === "active" ? "Newest ideas first" : "Most recently archived first"}</p>
</div>
<SuggestionList key={url} paging={paging} url={url} />
</section>;
}
function SuggestionList({ url, paging }: { url: string; paging: SuggestionPaging }) {
const { data, error, retry } = useSuggestionRead<SuggestionPage>(url);
if (error) return <SuggestionFailure error={error} retry={retry} />;
if (!data) return <SuggestionLoading>Loading suggestions</SuggestionLoading>;
return <><ol className="divide-y divide-line border border-line bg-panel shadow-[8px_8px_0_var(--color-shadow)]">
{!data.items.length && <li className="p-10"><h2 className="font-display text-2xl font-black uppercase">No suggestions on this page.</h2><p className="mt-3 text-sm text-muted">Try the other status, or return to the previous page.</p></li>}
{data.items.map((suggestion, index) => <li className="grid gap-5 p-6 sm:grid-cols-[3rem_1fr_auto] sm:p-8" key={suggestion.id}>
<span aria-hidden="true" className="font-mono text-sm text-muted">{String(index + 1).padStart(2, "0")}</span>
<div className="min-w-0">
<SuggestionBadges suggestion={suggestion} />
<h2 className="mt-4 break-words font-display text-2xl font-black sm:text-3xl"><Link className="underline decoration-line underline-offset-4 hover:text-accent" href={`/admin/suggestions/${suggestion.id}`}>{suggestion.title}</Link></h2>
<p className="mt-3 break-words font-mono text-[10px] leading-5 text-muted"><time dateTime={suggestion.createdAt}>{suggestion.createdAt}</time><br />Author / {suggestion.authorId}</p>
</div>
<div className="flex items-end justify-between gap-6 sm:flex-col sm:items-end">
<p className="font-mono text-[10px] uppercase text-muted">~{suggestion.messageCount} messages</p>
<a aria-label={`Open ${suggestion.title} in Discord`} className="font-mono text-[10px] font-bold uppercase underline underline-offset-4 hover:text-accent" href={suggestion.discordUrl} rel="noopener noreferrer" target="_blank">Discord </a>
</div>
</li>)}
</ol><SuggestionPagination nextCursor={data.nextCursor} {...paging} /></>;
}
@@ -0,0 +1,164 @@
import { afterEach, beforeAll, beforeEach, expect, it, vi } from "vitest";
import { exportJWK, generateKeyPair, SignJWT, type JWTPayload } from "jose";
const auth = vi.hoisted(() => ({ session: vi.fn() }));
vi.mock("next-auth", () => ({ getServerSession: auth.session }));
vi.mock("./admin-auth", () => ({ adminAuthOptions: {}, requiredAdminRole: "ops" }));
const issuer = "https://sso.example/realms/operators";
const audience = "portal-admin";
let keys: Awaited<ReturnType<typeof generateKeyPair>>;
let jwks: { keys: unknown[] };
let authorize: typeof import("./admin-api-auth").authorizeAdminApi;
const fetcher = vi.fn();
beforeAll(async () => {
keys = await generateKeyPair("RS256");
jwks = { keys: [{ ...await exportJWK(keys.publicKey), kid: "test-key", alg: "RS256", use: "sig" }] };
});
beforeEach(async () => {
vi.resetModules();
vi.stubEnv("KEYCLOAK_ISSUER_URL", issuer);
vi.stubEnv("KEYCLOAK_CLIENT_ID", audience);
vi.stubEnv("KEYCLOAK_CLIENT_SECRET", ""); // Machine verification needs no client secret.
auth.session.mockResolvedValue({ user: { name: "Browser Admin", email: "admin@example.test", roles: ["ops"] } });
fetcher.mockImplementation(async () => Response.json(jwks));
vi.stubGlobal("fetch", fetcher);
authorize = (await import("./admin-api-auth")).authorizeAdminApi;
});
afterEach(() => { vi.useRealTimers(); vi.resetAllMocks(); vi.unstubAllGlobals(); vi.unstubAllEnvs(); });
async function token(overrides: JWTPayload = {}, header: Record<string, unknown> = {}) {
return new SignJWT({
iss: issuer, aud: audience, sub: "machine-subject", exp: Math.floor(Date.now() / 1000) + 300,
resource_access: { [audience]: { roles: ["ops"] } },
...overrides,
}).setProtectedHeader({ alg: "RS256", kid: "test-key", ...header }).sign(keys.privateKey);
}
function request(bearer: string) {
return new Request("https://portal.example/api/admin/whoami", { headers: { authorization: `Bearer ${bearer}` } });
}
async function rejected(bearer: string, status = 401) {
const result = await authorize(request(bearer));
expect(result.identity).toBeUndefined();
expect(result.response?.status).toBe(status);
expect(result.response?.headers.get("content-type")).toBe("application/problem+json");
expect(result.response?.headers.get("cache-control")).toBe("no-store");
expect(result.response?.headers.get("www-authenticate")).toBe(status === 401 ? 'Bearer realm="admin-api"' : null);
expect(await result.response?.json()).toMatchObject({ status, instance: "/api/admin/whoami" });
expect(auth.session).not.toHaveBeenCalled();
}
it("verifies real RS256 signatures and caches only the configured issuer JWKS", async () => {
const signed = await token({ email: "private@example.test", name: "Private", arbitrary: "private" }, { jku: "https://attacker.example/keys" });
for (let i = 0; i < 2; i++) {
expect(await authorize(request(signed))).toEqual({ identity: {
authenticationMethod: "bearer", subject: "machine-subject", name: null, email: null,
} });
}
expect(auth.session).not.toHaveBeenCalled();
expect(fetcher).toHaveBeenCalledTimes(1);
expect(String(fetcher.mock.calls[0]?.[0])).toBe(`${issuer}/protocol/openid-connect/certs`);
expect(fetcher.mock.calls[0]?.[1]).toMatchObject({ redirect: "manual", method: "GET" });
});
it("accepts an audience list and case-insensitive bearer scheme", async () => {
const signed = await token({ aud: ["other", audience] });
const req = new Request(request(signed), { headers: { authorization: `bEaReR ${signed}` } });
expect((await authorize(req)).identity?.subject).toBe("machine-subject");
});
it.each([
["expired", { exp: 1 }], ["missing expiry", { exp: undefined }],
["missing subject", { sub: undefined }], ["empty subject", { sub: "" }], ["blank subject", { sub: " " }],
["future nbf", { nbf: 9999999999 }], ["wrong issuer", { iss: "https://attacker.example" }],
["wrong audience", { aud: "another-client" }], ["missing audience", { aud: undefined }],
] satisfies [string, JWTPayload][])("rejects %s despite an available privileged browser session", async (_name, claims) => {
await rejected(await token(claims));
});
it("rejects tampering with a signed payload", async () => {
const parts = (await token()).split(".");
const payload = JSON.parse(Buffer.from(parts[1]!, "base64url").toString());
parts[1] = Buffer.from(JSON.stringify({ ...payload, sub: "tampered" })).toString("base64url");
await rejected(parts.join("."));
});
it.each([
undefined, {}, { [audience]: { roles: [] } }, { another: { roles: ["ops"] } },
{ [audience]: { roles: "ops" } }, { [audience]: { roles: ["player"] } },
])("requires the configured client role, never a realm role (%j)", async (resource_access) => {
await rejected(await token({ resource_access, realm_access: { roles: ["ops"] } }), 403);
});
it("rejects HS256 algorithm confusion", async () => {
const signed = await new SignJWT({ iss: issuer, aud: audience, sub: "machine", exp: 9999999999 })
.setProtectedHeader({ alg: "HS256", kid: "test-key" }).sign(new TextEncoder().encode("test-only-key-with-at-least-32-bytes"));
await rejected(signed);
expect(fetcher).not.toHaveBeenCalled();
});
it("rejects an otherwise valid but non-allowlisted asymmetric algorithm", async () => {
const ec = await generateKeyPair("ES256");
fetcher.mockImplementation(async () => Response.json({ keys: [{ ...await exportJWK(ec.publicKey), kid: "ec-key" }] }));
const signed = await new SignJWT({ iss: issuer, aud: audience, sub: "machine", exp: 9999999999 })
.setProtectedHeader({ alg: "ES256", kid: "ec-key" }).sign(ec.privateKey);
await rejected(signed);
expect(fetcher).not.toHaveBeenCalled();
});
it("rejects an unknown signing key", async () => { await rejected(await token({}, { kid: "unknown" })); });
it("rejects a signature from an untrusted key even when its kid matches", async () => {
const other = await generateKeyPair("RS256");
const signed = await new SignJWT({ iss: issuer, aud: audience, sub: "machine", exp: 9999999999 })
.setProtectedHeader({ alg: "RS256", kid: "test-key" }).sign(other.privateKey);
await rejected(signed);
});
it("coalesces concurrent JWKS reads and refreshes rotated keys after cooldown", async () => {
vi.useFakeTimers({ toFake: ["Date"] });
const signed = await token();
const results = await Promise.all(Array.from({ length: 8 }, () => authorize(request(signed))));
expect(results.every((result) => result.identity?.subject === "machine-subject")).toBe(true);
expect(fetcher).toHaveBeenCalledTimes(1);
const rotated = await generateKeyPair("RS256");
fetcher.mockImplementation(async () => Response.json({ keys: [{ ...await exportJWK(rotated.publicKey), kid: "rotated-key", alg: "RS256" }] }));
const next = await new SignJWT({ iss: issuer, aud: audience, sub: "machine", exp: Math.floor(Date.now() / 1000) + 300, resource_access: { [audience]: { roles: ["ops"] } } })
.setProtectedHeader({ alg: "RS256", kid: "rotated-key" }).sign(rotated.privateKey);
await rejected(next);
expect(fetcher).toHaveBeenCalledTimes(1);
vi.setSystemTime(Date.now() + 31_000);
expect((await authorize(request(next))).identity?.subject).toBe("machine");
expect(fetcher).toHaveBeenCalledTimes(2);
});
it.each(["redirect", "non-JSON", "invalid JWKS", "HTTP failure"])("fails closed on a %s JWKS response", async (kind) => {
fetcher.mockImplementation(async () => {
if (kind === "redirect") return new Response(null, { status: 302, headers: { location: "https://attacker.example/keys" } });
if (kind === "non-JSON") return new Response("private malformed response");
if (kind === "invalid JWKS") return Response.json({ keys: "private malformed keys" });
return new Response("private upstream failure", { status: 500 });
});
await rejected(await token(), 503);
expect(fetcher).toHaveBeenCalledTimes(1);
});
it("fails closed and sanitizes a JWKS transport outage", async () => {
fetcher.mockRejectedValue(new Error("private network details"));
const result = await authorize(request(await token()));
expect(result.response?.status).toBe(503);
expect(await result.response?.text()).not.toContain("private");
expect(auth.session).not.toHaveBeenCalled();
});
it.each(["", "http://sso.example/realms/operators", "not a URL", `${issuer}?query=1`, "https://user:password@sso.example/realm"])("fails closed on unsafe/missing issuer configuration %s", async (value) => {
vi.stubEnv("KEYCLOAK_ISSUER_URL", value);
await rejected(await token(), 503);
expect(fetcher).not.toHaveBeenCalled();
});
it("fails closed on missing client ID", async () => {
vi.stubEnv("KEYCLOAK_CLIENT_ID", "");
await rejected(await token(), 503);
expect(fetcher).not.toHaveBeenCalled();
});
it.each([null, { user: {} }, { user: { roles: ["player"] } }])("preserves missing/unauthorized browser behavior (%j)", async (session) => {
auth.session.mockResolvedValue(session);
const result = await authorize(new Request("https://portal.example/api/admin/whoami"));
expect(result.response?.status).toBe(session ? 403 : 401);
expect(fetcher).not.toHaveBeenCalled();
});
it("preserves browser identity without requiring machine configuration", async () => {
vi.stubEnv("KEYCLOAK_ISSUER_URL", "");
expect(await authorize(new Request("https://portal.example/api/admin/whoami"))).toEqual({ identity: {
authenticationMethod: "session", subject: null, name: "Browser Admin", email: "admin@example.test",
} });
expect(fetcher).not.toHaveBeenCalled();
});
+94
View File
@@ -0,0 +1,94 @@
import { getServerSession } from "next-auth";
import { createRemoteJWKSet, errors, jwtVerify } from "jose";
import { problemDetails } from "@minecraft-account-manager/contracts";
import { problemInstance, problemResponse } from "@/lib/problem-response";
import { adminAuthOptions, requiredAdminRole } from "./admin-auth";
export type AdminApiIdentity = {
authenticationMethod: "session" | "bearer";
subject: string | null;
name: string | null;
email: string | null;
};
type Authorization = { identity: AdminApiIdentity; response?: never } | { response: Response; identity?: never };
function failure(request: Request, status: 401 | 403 | 503): Authorization {
const problems = {
401: ["unauthorized", "Authentication required", "Supply valid administrator credentials."],
403: ["forbidden", "Administrator role required", "This API is restricted to administrators."],
503: ["admin-auth-unavailable", "Authentication unavailable", "Administrator authentication is temporarily unavailable."],
} as const;
const [code, title, detail] = problems[status];
const response = problemResponse(problemDetails(`urn:error:${code}`, title, status, detail, problemInstance(request)));
if (status === 401) response.headers.set("www-authenticate", 'Bearer realm="admin-api"');
return { response };
}
// One bounded, process-local resolver. jose coalesces fetches and refreshes rotated keys.
let remote: { issuer: string; keys: ReturnType<typeof createRemoteJWKSet> } | undefined;
function bearerConfiguration() {
const issuer = process.env.KEYCLOAK_ISSUER_URL?.trim() ?? "";
const audience = process.env.KEYCLOAK_CLIENT_ID?.trim() ?? "";
const url = new URL(issuer);
if (!audience || url.protocol !== "https:" || url.username || url.password || url.search || url.hash) {
throw new Error("Invalid administrator authentication configuration");
}
if (!remote || remote.issuer !== issuer) {
// Never discover a key URL from untrusted token claims or headers (jku/x5u/iss).
const jwksUrl = new URL(`${issuer.replace(/\/$/, "")}/protocol/openid-connect/certs`);
remote = { issuer, keys: createRemoteJWKSet(jwksUrl, {
timeoutDuration: 5_000, cooldownDuration: 30_000, cacheMaxAge: 600_000,
}) };
}
return { issuer, audience, keys: remote.keys };
}
function record(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
}
async function authorizeBearer(request: Request): Promise<Authorization> {
const match = /^Bearer +([A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)$/i.exec(request.headers.get("authorization") ?? "");
if (!match) return failure(request, 401);
let configuration: ReturnType<typeof bearerConfiguration>;
try {
configuration = bearerConfiguration();
} catch {
return failure(request, 503);
}
try {
const { issuer, audience, keys } = configuration;
const { payload } = await jwtVerify(match[1]!, keys, {
issuer, audience, algorithms: ["RS256"], requiredClaims: ["exp", "sub"],
});
if (typeof payload.sub !== "string" || !payload.sub.trim()) return failure(request, 401);
const access = payload.resource_access;
const client = record(access) && Object.hasOwn(access, audience) ? access[audience] : undefined;
const roles = record(client) ? client.roles : undefined;
if (!Array.isArray(roles) || !roles.includes(requiredAdminRole)) return failure(request, 403);
return { identity: { authenticationMethod: "bearer", subject: payload.sub, name: null, email: null } };
} catch (error) {
// Verification failures are invalid credentials; transport/configuration failures are unavailable.
const invalid = error instanceof errors.JWTClaimValidationFailed || error instanceof errors.JWTExpired
|| error instanceof errors.JWSInvalid || error instanceof errors.JWTInvalid
|| error instanceof errors.JWSSignatureVerificationFailed || error instanceof errors.JOSEAlgNotAllowed
|| error instanceof errors.JWKSNoMatchingKey || error instanceof errors.JOSENotSupported;
return failure(request, invalid ? 401 : 503);
}
}
/** API-only authorization; never use bearer tokens to authorize browser actions. */
export async function authorizeAdminApi(request: Request): Promise<Authorization> {
// Presence, including an empty/unsupported header, is authoritative. Never fall back.
if (request.headers.has("authorization")) return authorizeBearer(request);
try {
const session = await getServerSession(adminAuthOptions);
if (!session) return failure(request, 401);
const roles = (session.user as { roles?: unknown } | undefined)?.roles;
if (!Array.isArray(roles) || !roles.includes(requiredAdminRole)) return failure(request, 403);
return { identity: {
authenticationMethod: "session", subject: null,
name: session.user?.name ?? null, email: session.user?.email ?? null,
} };
} catch {
return failure(request, 503);
}
}
+3 -6
View File
@@ -1,6 +1,5 @@
import { getServerSession } from "next-auth";
import { problemDetails } from "@minecraft-account-manager/contracts";
import { adminAuthOptions, requiredAdminRole } from "@/lib/auth/admin-auth";
import { authorizeAdminApi } from "@/lib/auth/admin-api-auth";
import { problemInstance, problemResponse } from "@/lib/problem-response";
import { createSuggestionsClient, SuggestionsError } from "./suggestions";
@@ -17,11 +16,9 @@ function getClient() {
}
export async function suggestionsApi(request: Request, operation: (client: Client) => Promise<unknown>) {
const authorization = await authorizeAdminApi(request);
if (authorization.response) return authorization.response;
try {
const session = await getServerSession(adminAuthOptions);
if (!session) throw new SuggestionsError(401, "unauthorized", "Sign in as an administrator.");
const roles = (session.user as { roles?: unknown } | undefined)?.roles;
if (!Array.isArray(roles) || !roles.includes(requiredAdminRole)) throw new SuggestionsError(403, "forbidden", "This API is restricted to administrators.");
return Response.json(await operation(getClient()), { headers: { "cache-control": "no-store" } });
} catch (error) {
const safe = error instanceof SuggestionsError ? error : new SuggestionsError(503, "discord-unavailable", "Discord suggestions are unavailable.");
@@ -26,6 +26,18 @@ it("reads archived forum pages using Discord's archive timestamp cursor", async
expect(await client.list({ status: "archived", limit: 1, cursor })).toEqual({ items: [], nextCursor: null });
});
it("normalizes offset archive timestamps without losing cursor precision", async () => {
const raw = "2026-01-01T00:00:00.123456+00:00";
const cursor = "2026-01-01T00:00:00.123456Z";
const { client } = setup({
[`/channels/${forumId}`]: forum,
[`/channels/${forumId}/threads/archived/public?limit=1`]: { threads: [{ ...thread, thread_metadata: { ...thread.thread_metadata, archived: true, archive_timestamp: raw } }], has_more: true },
[`/channels/${forumId}/threads/archived/public?limit=1&before=${encodeURIComponent(cursor)}`]: { threads: [], has_more: false },
});
const first = await client.list({ status: "archived", limit: 1 });
expect(first.nextCursor).toBe(cursor);
expect(await client.list({ status: "archived", limit: 1, cursor: first.nextCursor! })).toEqual({ items: [], nextCursor: null });
});
const message = { id: threadId, content: "Please add stations", timestamp: "2026-01-01T00:00:00.000Z", edited_timestamp: null, author: { id: "100000000000000003", username: "builder", global_name: "Builder" }, reactions: [{ emoji: { name: "👍" }, count: 4 }] };
it("returns the starter post and paginates discussion with authors and reactions", async () => {
const { client } = setup({
+8 -1
View File
@@ -30,6 +30,13 @@ function timestamp(value: string | number) {
return new Date(value).toISOString().replace(/\.\d{3}Z$/, "Z");
}
function archiveCursor(value: string) {
// Discord timestamps may use +00:00 and microseconds. Date alone truncates
// that precision, potentially skipping posts at the archive page boundary.
const fraction = value.match(/\.(\d{1,6})(?:Z|[+-]\d{2}:\d{2})$/)?.[1];
return new Date(value).toISOString().replace(/\.\d{3}Z$/, fraction && /[1-9]/.test(fraction) ? `.${fraction}Z` : "Z");
}
export function createSuggestionsClient(options: { token: string; guildId: string; forumId: string; fetch?: typeof fetch }) {
const { token, guildId, forumId } = options;
const fetcher = options.fetch ?? fetch;
@@ -144,7 +151,7 @@ export function createSuggestionsClient(options: { token: string; guildId: strin
const data = await get<{ threads: Thread[]; has_more: boolean }>(`/channels/${forumId}/threads/archived/public?limit=${limit}${before}`);
return {
items: data.threads.filter(belongs).map((thread) => summary(thread, forum)),
nextCursor: data.has_more && data.threads.length ? data.threads.at(-1)!.thread_metadata.archive_timestamp.replace(/\.000Z$/, "Z") : null,
nextCursor: data.has_more && data.threads.length ? archiveCursor(data.threads.at(-1)!.thread_metadata.archive_timestamp) : null,
};
}
const data = await get<{ threads: Thread[] }>(`/guilds/${guildId}/threads/active`);
+88
View File
@@ -0,0 +1,88 @@
# Admin API authentication
Implemented for `GET /api/admin/whoami` and the read-only [suggestions API](admin-suggestions-api.md). The shared guard is `apps/web/src/lib/auth/admin-api-auth.ts`. This is not browser token login, a general admin mutation API, or the Velocity admission credential mechanism. Browser pages, privileged server actions, RCON, and Velocity authentication are unchanged. OpenAPI publication is separate work (US-026).
## Credential selection
- **No Authorization header:** use the existing NextAuth administrator session and its configured role check. Player sessions do not qualify. Existing browser realm/client role behavior remains intact.
- **Any Authorization header supplied:** exclusively use bearer authentication. Empty, malformed, duplicated/combined, unsupported, expired, or otherwise invalid credentials never fall back to a browser session, including a privileged session cookie.
- The bearer scheme is case-insensitive. Send one compact signed JWT, not a client secret, bot token, or refresh token.
## Machine verification
The web application directly depends on `jose` 6. Verification uses real cryptographic signature checking, not decoded-token role extraction:
- Only **RS256** is accepted.
- `iss` must exactly equal the trimmed `KEYCLOAK_ISSUER_URL` configuration.
- `aud` must contain `KEYCLOAK_CLIENT_ID` (a string or audience array is supported). `azp` does not substitute for `aud`.
- `exp` and a nonblank string `sub` are required. Expired tokens and future `nbf` are rejected with no added clock tolerance.
- The required role (configured `KEYCLOAK_REQUIRED_ROLE`, default `minecraft-account-manager-admin`) must appear in `resource_access[KEYCLOAK_CLIENT_ID].roles`. Realm roles or roles for other clients are not accepted.
- The configured issuer must be HTTPS with no embedded credentials, query, or fragment. Keys come only from `<issuer-without-final-slash>/protocol/openid-connect/certs`; token `iss`, `jku`, and `x5u` never select a key URL. Redirects are not followed.
One bounded, process-local remote JWKS resolver caches keys for ten minutes, coalesces concurrent fetches, permits refresh for unknown keys after a 30-second cooldown, and bounds each network fetch to five seconds. A changed configured issuer replaces the resolver. Replicas do not share the cache. Key rotation can temporarily reject a new key during cooldown; removed keys may remain usable until the cache refreshes. Access-token validity is local JWT verification, not per-request revocation/introspection. Use suitably short token lifetimes and synchronized clocks.
`KEYCLOAK_CLIENT_SECRET` is not needed for machine verification. This implementation does not obtain tokens or alter identity-provider clients, role/audience mappers, credentials, or deployments. See [OIDC setup](admin-oidc-keycloak-setup.md) for the distinct browser configuration.
## Safe identity endpoint
`GET /api/admin/whoami` authenticates and checks administrator permission before returning JSON with `Cache-Control: no-store`:
```json
{
"authenticationMethod": "bearer",
"subject": "machine-subject",
"name": null,
"email": null
}
```
For browser sessions, `authenticationMethod` is `session`, `subject` is `null` (the existing session does not expose it), and `name`/`email` are the existing session values or `null`. Machine profile claims are not returned. No raw token, role list, session expiry, key material, client secret, or arbitrary claims are exposed. This endpoint requires no Discord or database access.
## Failures
All guard failures use RFC 9457 `application/problem+json`, `Cache-Control: no-store`, a matching HTTP/body status, and a request-path instance. There are no sign-in redirects or token/error-detail logs.
| Status | Type | Meaning |
| --- | --- | --- |
| 401 | `urn:error:unauthorized` | Missing session or invalid supplied credentials; includes `WWW-Authenticate: Bearer realm="admin-api"`. |
| 403 | `urn:error:forbidden` | Authenticated identity lacks the required permission. |
| 503 | `urn:error:admin-auth-unavailable` | Invalid/missing machine configuration, JWKS transport/format failure, or browser session service failure. |
Authentication is checked before suggestions cache access or Discord requests. Valid machine credentials do not enable writes: suggestions write methods remain 405. Errors do not reveal credentials, raw claims, upstream response bodies, or exception messages.
## Verification and rollout boundary
Focused coverage lives in:
- `apps/web/src/lib/auth/admin-api-auth.test.ts`: real signed JWTs, controlled JWKS HTTP transport (not mocked `jwtVerify`), validation failures, client-role isolation, configuration/network safety, caching, concurrent reads, and rotation.
- `apps/web/src/app/api/admin/whoami/route.test.ts`: safe identity projection and guard failures through the route.
- `apps/web/src/app/api/suggestions/{route,machine-auth}.test.ts`: browser regression, bearer precedence, all three read routes, cache authorization, and read-only behavior.
Run from the source repository:
```sh
npm test --workspace @minecraft-account-manager/web -- src/lib/auth/admin-api-auth.test.ts src/app/api/admin/whoami/route.test.ts src/app/api/suggestions
npm test
npm run lint
npm run typecheck
npm run build
npm run velocity:build
```
### Test-first implementation evidence (US-025)
The following runs were observed against the local implementation; no commit or publication is part of this task:
| Slice / focused test arguments after `npm test --workspace @minecraft-account-manager/web --` | Red before implementation | Green after implementation |
| --- | --- | --- |
| `src/app/api/suggestions/route.test.ts` | 6 failures: supplied headers fell through to the browser path (503 instead of 401), and missing-session 401 lacked the challenge. | 21 passing after shared-guard integration. |
| `src/lib/auth/admin-api-auth.test.ts` | 15 failures: valid signed tokens were rejected; client-role and unavailable-service responses were not implemented. | 53 passing with the suggestions regression suite after actual JWT/JWKS verification. |
| `src/app/api/admin/whoami/route.test.ts` | 6 explicit route-absence assertion failures (suite ran without a broken module import). | 59 passing across all three suites after adding the route; route discovery then refactored to a direct import. |
Additional integration/resilience regression coverage brought the focused suite to **72 passing tests**: every suggestions read route, authorization before cached reads, unchanged write denial, untrusted signing keys, algorithm restrictions, concurrent JWKS fetching, key rotation, malformed upstream responses, and redirect refusal. Negative-token tests use an available privileged browser session to verify that invalid bearer credentials never fall back. The tests sign actual JWTs and exercise `jose` verification against controlled transport responses; `jwtVerify` is never mocked.
Full local verification passed: `npm test` (**252 tests**, including 214 web tests), `npm run lint` (zero errors; two existing navigation warnings in unchanged `map-view-toggle.tsx`), `npm run typecheck`, `npm run build` (whoami emitted as a dynamic route), and `npm run velocity:build` (`clean test shadowJar`, Java 17). The unrelated `next-env.d.ts` addition generated by Next.js during the build was removed to keep the source diff scoped.
Security scan: `semgrep scan --config p/typescript --config p/jwt --metrics=off` on the shared guard, suggestions wrapper, and whoami implementation completed with **74 rules, three files, zero findings**. The initial `--config auto --metrics=off` invocation was rejected by Semgrep; the explicit-rule run is the successful result. This is scoped static-analysis evidence, not a complete security audit.
Offline tests do not establish live Keycloak audience/role issuance, JWKS reachability, or production authorization. Production deployment remains separately gated. After explicit release approval, verify machine whoami and suggestions reads, rejection of an unauthorized identity, and browser session access using approved credential handling (never token values in chat, command arguments, or logs).
+8 -2
View File
@@ -1,6 +1,6 @@
# Admin OIDC setup
The admin console will use Keycloak OIDC and JWT-backed Auth.js sessions, following the established pattern in the sibling Retro application.
The admin console uses Keycloak OIDC and JWT-backed NextAuth sessions.
## Application environment
@@ -21,4 +21,10 @@ Allow exact callback and logout URLs for each environment. Avoid wildcard origin
Create the realm role `minecraft-account-manager-admin` and assign it directly or through an admin group. Ensure realm roles are emitted in `realm_access.roles`.
The admin console will reject sign-in when the required role is absent, even when Keycloak authentication itself succeeds.
The admin console rejects sign-in when the required role is absent, even when Keycloak authentication itself succeeds. Existing browser sign-in accepts realm or configured-client roles; this behavior is unchanged.
## Read-only machine API access
The [admin API guard](admin-api-authentication.md) independently verifies signed Keycloak access tokens. Machine tokens must include `KEYCLOAK_CLIENT_ID` in `aud` and `KEYCLOAK_REQUIRED_ROLE` in `resource_access[KEYCLOAK_CLIENT_ID].roles`. A realm role alone is **not** sufficient for bearer access. The identity provider must emit both the portal audience and this client role; a token's `azp` is not an audience substitute.
Verification uses the HTTPS issuer's `/protocol/openid-connect/certs` JWKS endpoint and RS256 only. It does not use `KEYCLOAK_CLIENT_SECRET`, exchange tokens, or create a browser session. Browser client configuration above remains required for interactive SSO. Provisioning or changing machine clients, role/audience mappers, credentials, and production deployment requires separate operational approval; this source implementation performs none of those operations.
+14 -5
View File
@@ -1,6 +1,14 @@
# Admin suggestions API
The portal provides a read-only view of one Discord **forum channel**, using the existing NextAuth admin session and configured Keycloak role. Player sessions and Discord bot credentials are not accepted as API credentials. Sign in at `/admin/login` first; same-origin browser calls send the session cookie. Unattended machine authentication is not provided.
The portal provides a read-only view of one Discord **forum channel**, using the existing NextAuth admin session or a verified Keycloak machine bearer token. Player sessions and Discord bot credentials are not accepted as API credentials. Browser users sign in at `/admin/login`; same-origin calls send the session cookie. Machine clients use `Authorization: Bearer <access-token>` with the configured portal audience and **client** role. See [Admin API authentication](admin-api-authentication.md) for verification rules, safe identity checks, and failure behavior.
## Portal interface
Open `/admin/suggestions` from the administrator navigation. The idea desk lists active or archived forum posts with tags, status, approximate message counts, author IDs, timestamps, and Discord links. Select a title to open `/admin/suggestions/:id`, read the starter post and its reaction counts, and page through discussion newest-first. The starter is not duplicated in the discussion view.
The UI uses these same admin-protected GET endpoints with its browser session, not a second integration. Both pages independently check admin access before rendering; the APIs recheck it on every read. Expired/unauthorized API access offers an admin sign-in link. Loading, empty/deleted content, missing-text, and retryable failure states are explicit. Changing status aborts obsolete requests, and pagination restores keyboard focus to the page indicator. Text is rendered literally with React escaping, never as HTML or interpreted Discord Markdown. No bot token, forum configuration value, reply input, vote button, or moderation control is added to the client bundle.
Pagination history is page-local and resets when switching status or leaving the page. Reload the browser to refresh a view; upstream reads may use the documented 30-second cache. The real forum ID is still configured only through GitOps, not the UI or source.
## Runtime configuration
@@ -21,7 +29,7 @@ The bot must have **View Channel** and **Read Message History** for the forum an
| `/api/suggestions/:id` | Suggestion metadata and `originalPost`; `null` when the starter message was deleted. |
| `/api/suggestions/:id/messages?limit=25` | Discussion messages, newest first, including the starter if reached. |
Lists return `{ items, nextCursor }`. Pass `nextCursor` back as the URL-encoded `cursor` parameter with the same status. Limits are integers from 1 to 100. Active cursors are thread IDs; archived cursors are UTC archive timestamps; message cursors are message IDs. Treat cursors as opaque. Messages may yield a final empty page because Discord does not provide a `has_more` flag for messages. Active threads are fetched via the guild active-threads endpoint, filtered to the forum, sorted, and paginated locally. Archives are paginated by Discord. This is a live view, not a consistent snapshot: threads can move between active and archived lists.
Lists return `{ items, nextCursor }`. Pass `nextCursor` back as the URL-encoded `cursor` parameter with the same status. Limits are integers from 1 to 100. Active cursors are thread IDs; archived cursors are UTC archive timestamps normalized to `Z` while preserving fractional precision; message cursors are message IDs. Treat cursors as opaque. Messages may yield a final empty page because Discord does not provide a `has_more` flag for messages. Active threads are fetched via the guild active-threads endpoint, filtered to the forum, sorted, and paginated locally. Archives are paginated by Discord. This is a live view, not a consistent snapshot: threads can move between active and archived lists.
Suggestion fields: `id`, `title`, `authorId`, `createdAt`, `archived`, `locked`, `tags`, `messageCount`, `discordUrl`. Discord's message count is approximate, not a vote count. Detail messages include `id`, `author` (`id`, `name`), `content`, `createdAt`, `editedAt`, `reactions` (`emoji`, `count`), and `discordUrl`. Reactions remain reaction counts, not interpreted votes. Attachments, embeds, and rendered Discord Markdown are not mirrored; use Discord links for the original presentation.
@@ -29,8 +37,9 @@ Suggestion fields: `id`, `title`, `authorId`, `createdAt`, `archived`, `locked`,
Errors use RFC 9457 `application/problem+json`, HTTP-matching `status`, stable `urn:error:*` types, and safe details:
- `401 unauthorized`: no admin session; no redirect.
- `403 forbidden`: session lacks the required role.
- `401 unauthorized`: no admin session or invalid supplied credentials; no redirect; includes `WWW-Authenticate: Bearer realm="admin-api"`.
- `403 forbidden`: verified identity lacks the required role (configured-client role for bearer tokens).
- `503 admin-auth-unavailable`: authentication configuration, browser session service, or JWKS service unavailable; no session fallback for supplied credentials.
- `400 invalid-request`: invalid ID, cursor, limit, status, or list/message query parameter.
- `404 suggestion-not-found`: inaccessible/deleted thread, or thread outside the configured forum.
- `405 method-not-allowed`: writes are unsupported; `Allow: GET, HEAD`.
@@ -42,6 +51,6 @@ The client checks the configured forum's guild/type and each requested thread's
## Verification before rollout
Run the source checks and focused tests in `apps/web/src/lib/discord/suggestions.test.ts` and `apps/web/src/app/api/suggestions/route.test.ts`. Under the separately approved GitOps/release plan, verify one known active post, one archived post, message content, and admin/non-admin access against the actual forum. Offline fixtures do not establish live Discord permissions or intent approval.
Run the source checks and focused API tests in `apps/web/src/lib/discord/suggestions.test.ts` and `apps/web/src/app/api/suggestions/route.test.ts`, plus UI tests in `apps/web/src/components/suggestions-browser.test.tsx`, `suggestion-reader.test.tsx`, and `apps/web/src/app/admin/(console)/suggestions/`. Under the separately approved GitOps/release plan, verify one known active post, one archived post, message content, and admin/non-admin access against the actual forum. Offline fixtures do not establish live Discord permissions or intent approval.
References: [Discord threads](https://discord.com/developers/docs/topics/threads), [Channel resource](https://discord.com/developers/docs/resources/channel), [Message content intent](https://discord.com/developers/docs/events/gateway#message-content-intent).
+8 -5
View File
@@ -1,6 +1,6 @@
# Security review
Review date: 2026-08-02
Review timestamp: 2026-09-10T12:20:32Z
## Scope
@@ -8,10 +8,12 @@ Next.js portal and APIs, Discord bot, PostgreSQL persistence, Keycloak admin aut
## Automated checks
- Semgrep `auto`: 0 findings
- `npm audit`: 0 known vulnerabilities after dependency overrides
- TypeScript, ESLint, unit tests, Next.js production build: passing
- Velocity Java tests and shaded plugin build: passing
- Full source Semgrep `auto`: 0 findings across 178 scanned files (331 rules; 13 files excluded by ignore patterns).
- `npm audit` and `npm audit --omit=dev`: 0 known vulnerabilities after remediation. Baseline had six affected entries (two moderate, two high, two critical), covering Next.js/Sharp, the NextAuth dependency path, Vitest/mocker, and js-yaml.
- Resolved patched versions: Next.js and eslint-config-next 16.3.4, Sharp 0.35.4, Vitest/mocker 4.1.11, js-yaml 4.3.2. Retained Next.js's PostCSS override at 8.5.25. No forced major dependency upgrades or database changes.
- TypeScript, 196 workspace tests, Next.js production build, and Velocity Java tests/shaded plugin build pass with patched dependencies. ESLint exits successfully with two new framework-rule warnings about existing `window.location.assign()` calls in `map-view-toggle.tsx`; those unrelated navigation behaviors were not changed.
- Verification is local source evidence, not a claim that patched artifacts have been deployed. API CI run 1979 passed for `1a01c0ed641f4eda83f81c855c38651aa116933e`; dependency-fix CI run 1985 passed for `0af4884f7e16161d0c0ea3a8f9c26b3fa9384cf9`.
- Suggestions UI tests verify both page guards, malformed-ID rejection, literal text rendering (including script-like content), read-only API usage, explicit auth/error states, aborted obsolete reads, and pagination focus. Actual Discord permissions/Message Content access and production browser acceptance remain rollout checks.
## Implemented controls
@@ -19,6 +21,7 @@ Next.js portal and APIs, Discord bot, PostgreSQL persistence, Keycloak admin aut
- Login links expire after ten minutes, are single use, and are rate limited per Discord user with a PostgreSQL advisory lock.
- Session cookies are `httpOnly`, `sameSite=lax`, path-scoped, and secure in production.
- Admin access uses Keycloak OIDC and a required role.
- Every suggestions API route independently requires that admin session/role before reading cached or live Discord data. The configured forum is guild/type-checked and requested threads are parent/type-checked before message access. Discord credentials remain server-side; fixed-host, validated-ID requests have bounded caching, concurrency, timeouts, and rate-limit backoff. Responses are uncached and errors use safe RFC 9457 problems. See [suggestions API](admin-suggestions-api.md) for live Discord permission/intent requirements.
- User mutations verify ownership server-side.
- Mojang lookup is server-side and targets a fixed host, avoiding client-forged validation and SSRF.
- Velocity credentials are high-entropy bearer tokens stored only as hashes.
+387 -348
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -18,9 +18,9 @@
},
"overrides": {
"esbuild": "0.25.12",
"next@16.2.12": {
"next@16.3.4": {
"postcss": "8.5.25",
"sharp": "0.35.3"
"sharp": "0.35.4"
}
},
"engines": {