Public: anyone can read this; the crew can change it.
The secrets page's Server-Timing names its phases: session, each read, render #3452
Check · Review · Land · Live done — Landed and live in production.
scout/forge:scout/3422-the-secrets-page-s-server-timing-names-i → main 1 commit fork 1 thread · 1 unresolved
2 files
changed +60
−2
src/web/pages/secrets.ts +14 −2
| @@ -9,6 +9,11 @@ | ||
| 9 | 9 | |
| 10 | 10 | import { listSecrets, putSecret, removeSecret } from "../../actions/secrets.ts"; |
| 11 | 11 | import type { Ctx } from "../../http/context.ts"; |
| 12 | import { | |
| 13 | notePhase, | |
| 14 | takeSessionTime, | |
| 15 | timePhase, | |
| 16 | } from "../../core/route_timing.ts"; | |
| 12 | 17 | import { |
| 13 | 18 | NAME_MAX, |
| 14 | 19 | type SecretName, |
| @@ -154,19 +159,26 @@ function humanCheckLine(ctx: Ctx): string { | ||
| 154 | 159 | |
| 155 | 160 | // GET /settings/secrets |
| 156 | 161 | export function secretsPage(ctx: Ctx): Response { |
| 162 | notePhase(ctx.request, "session", takeSessionTime(ctx.request)); | |
| 157 | 163 | const denied = requireAdmin(ctx); |
| 158 | 164 | if (denied) return denied; |
| 159 | return page({ | |
| 165 | const card = timePhase(ctx.request, "secrets", () => | |
| 166 | secretsSection(ctx, "forge", "")!, | |
| 167 | ); | |
| 168 | const rendering = performance.now(); | |
| 169 | const response = page({ | |
| 160 | 170 | ctx, |
| 161 | 171 | title: "Secrets", |
| 162 | 172 | body: html`<div class="page-head"><h1>Secrets</h1></div> |
| 163 | 173 | ${settingsLayout( |
| 164 | 174 | accountSections("secrets", { admin: true }), |
| 165 | html`${secretsSection(ctx, "forge", "")!} | |
| 175 | html`${card} | |
| 166 | 176 | <p class="muted small">${humanCheckLine(ctx)}</p>`, |
| 167 | 177 | "Account settings", |
| 168 | 178 | )}`, |
| 169 | 179 | }); |
| 180 | notePhase(ctx.request, "render", performance.now() - rendering); | |
| 181 | return response; | |
| 170 | 182 | } |
| 171 | 183 | |
| 172 | 184 | // POST /settings/secrets |
test/secrets-timing.test.ts added +46
| @@ -0,0 +1,46 @@ | ||
| 1 | /** The secrets page names its phases in Server-Timing (#3422). */ | |
| 2 | import { afterAll, beforeAll, expect, test } from "bun:test"; | |
| 3 | import { mkdtemp, rm } from "node:fs/promises"; | |
| 4 | import { tmpdir } from "node:os"; | |
| 5 | import { join } from "node:path"; | |
| 6 | import { createApp, type App } from "../src/app.ts"; | |
| 7 | import { serve, type Servers } from "../src/http/server.ts"; | |
| 8 | import { seedAdmin } from "./helpers/admin.ts"; | |
| 9 | ||
| 10 | let dataDir = ""; | |
| 11 | let app: App, servers: Servers, bearer = ""; | |
| 12 | ||
| 13 | beforeAll(async () => { | |
| 14 | dataDir = await mkdtemp(join(tmpdir(), "forge-stime-")); | |
| 15 | app = createApp({ dataDir, port: 0 }); | |
| 16 | servers = await serve(app); | |
| 17 | const admin = await seedAdmin(app, { username: "alice", email: "[email protected]", password: "correct-horse-battery" }); | |
| 18 | if (!admin.ok) throw new Error(admin.error); | |
| 19 | const minted = await fetch(`${servers.url}/api/v1/tokens`, { | |
| 20 | method: "POST", | |
| 21 | headers: { "content-type": "application/json" }, | |
| 22 | body: JSON.stringify({ adminConfirm: true, username: "alice", password: "correct-horse-battery", name: "cli", scope: "admin" }), | |
| 23 | }); | |
| 24 | bearer = ((await minted.json()) as { token: string }).token; | |
| 25 | }); | |
| 26 | ||
| 27 | afterAll(async () => { | |
| 28 | servers.stop(); | |
| 29 | app.close(); | |
| 30 | await rm(dataDir, { recursive: true, force: true }); | |
| 31 | }); | |
| 32 | ||
| 33 | test("the app settings page names session, secrets and render once each", async () => { | |
| 34 | const res = await fetch(`${servers.url}/settings/secrets`, { headers: { authorization: `Bearer ${bearer}` } }); | |
| 35 | const page = await res.text(); | |
| 36 | expect(res.status).toBe(200); | |
| 37 | expect(page).toContain("Seal"); | |
| 38 | expect(res.headers.get("x-content-type-options")).toBe("nosniff"); | |
| 39 | const parts = (res.headers.get("server-timing") ?? "").split(", "); | |
| 40 | const names = parts.map((p) => p.split(";")[0]!); | |
| 41 | for (const n of ["session", "secrets", "render"]) { | |
| 42 | expect(names.filter((x) => x === n).length).toBe(1); | |
| 43 | const part = parts.find((p) => p.startsWith(`${n};`))!; | |
| 44 | expect(Number(/dur=([\d.]+)/.exec(part)?.[1])).not.toBeNaN(); | |
| 45 | } | |
| 46 | }); |
new above
offline
Nit: this is the forge's account secrets page (
/settings/secrets), not an app's settings page. Something like "the secrets page names session, secrets and render once each" would say what it covers.