pgkiln 0.62.0 → 0.64.0

package/src/builder/routes.ts

@@ -32,6 +32,11 @@ import { isIP } from 'node:net';
 import { giveChallenge, takeChallenge } from './security.ts';
 import { relyingParty, verifyAssertion, WebAuthnError } from '../webauthn.ts';
 import { chooseLanguage, langCookieOptions, languageRoutes, signInLanguageLinks } from './language.ts';
+import { builderSsoRoutes, leavesNoBreakGlass } from './builder-sso.ts';
+import { builderDirectory, builderProvider, builderSources, linkDeveloper, resolveDeveloper, ssoRequired } from '../devsso.ts';
+import { ldapAuthenticate, LdapError } from '../ldap.ts';
+import { onBuilderSso, SsoError, startSignIn } from '../sso.ts';
+import { startSamlSignIn } from '../saml.ts';
 
 // Builder pages: sign-in, workspace and app home, settings, activity and
 // developers. Shared Components, the page designer and the SQL Workshop
@@ -70,6 +75,8 @@ export async function builderRoutes(app: FastifyInstance) {
     const next = safeNext(req.query?.next);
     // (sprint 128) a passkey alone, when the instance allows it and the address is a host name
     const alone = (await passkeySignin()) && !isIP(relyingParty(req).rpId);
+    // (sprint 129, SEC-1) identity providers and directories that sign developers in
+    const sources = await builderSources();
     const field = (name: string, label: string, ic: string, value: string, opts: { type?: string; required?: boolean; auto?: string; placeholder?: string; reveal?: boolean }) =>
       html`<div class="field signin-field"><label class="sr-only" for="f_${name}">${label}</label>
         <div class="signin-input">${icon(ic)}<input id="f_${name}" name="${name}" type="${opts.type ?? 'text'}" value="${value}" placeholder="${opts.placeholder ?? label}"${opts.required ? raw(' required') : ''}${opts.auto ? raw(` autocomplete="${opts.auto}"`) : ''}>
@@ -91,6 +98,10 @@ export async function builderRoutes(app: FastifyInstance) {
               ${error ? html`<div class="alert alert-error" role="alert">${error}</div>` : ''}
               ${csrf(s)}<input type="hidden" name="next" value="${next}">
               ${field('workspace', tx('signin.workspace'), 'database', r?.w ?? '', { placeholder: tx('signin.workspace_placeholder'), auto: 'organization' })}
+              ${sources.directories.length ? html`<div class="field signin-field"><label class="sr-only" for="f_method">${tx('signin.method')}</label>
+                <div class="signin-input">${icon('server')}<select id="f_method" name="method" aria-label="${tx('signin.method')}">
+                  <option value="">${tx('signin.method_pgkiln')}</option>
+                  ${sources.directories.map((d) => html`<option value="ldap:${d.name}">${d.display_name}</option>`)}</select></div></div>` : ''}
               ${field('username', tx('signin.username'), 'user', r?.u ?? '', { required: true, auto: 'username' })}
               ${field('password', tx('signin.password'), 'key', '', { type: 'password', required: true, auto: 'current-password', reveal: true })}
               <label class="check signin-remember"><input type="checkbox" name="remember" value="1"${r ? raw(' checked') : ''}> ${tx('signin.remember')}</label>
@@ -98,6 +109,7 @@ export async function builderRoutes(app: FastifyInstance) {
               ${alone ? html`<input type="hidden" name="credentialId"><input type="hidden" name="clientDataJSON"><input type="hidden" name="authenticatorData"><input type="hidden" name="signature"><input type="hidden" name="userHandle">
                 <button class="btn signin-submit signin-passkey" hidden data-passkey="${BASE}/login/passkey/options" data-passkey-submit="${BASE}/login/passkey" data-passkey-error="${tx('mfa.passkey_failed')}">${icon('fingerprint')} ${tx('signin.passkey')}</button>
                 <p class="small" role="status" data-passkey-status></p>` : ''}
+              ${sources.providers.map((p) => html`<a class="btn signin-submit signin-idp" href="${BASE}/sso/${p.name}${next === `${BASE}/home` ? '' : `?next=${encodeURIComponent(next)}`}">${icon('log-in')} ${tx('signin.with', { provider: p.display_name })}</a>`)}
               <p class="muted small signin-hint">${tx('signin.hint')}</p>
               <nav class="signin-actions" aria-label="${tx('signin.quick')}">
                 <a href="${BASE}/find-workspace">${icon('search')} ${tx('signin.find_ws')}</a>
@@ -135,29 +147,63 @@ export async function builderRoutes(app: FastifyInstance) {
       flash(s, tx('signin.throttled'), 'error');
       return back(reply, s, again);
     }
-    // bcrypt always runs (dummy salt for unknown users) so timing does not reveal accounts
-    const dev = await owner.one(
-      `select d.username, d.language
-         from (select $1::text as u) x
-         left join meta.developer d on d.username = x.u
-        where crypt($2, coalesce(d.password_hash, gen_salt('bf', 10))) = d.password_hash`,
-      [username, password],
-    );
+    // (sprint 129, SEC-1) an LDAP directory checks the password; the developer is the one linked to the entry
+    const method = String(req.body?.method ?? '');
+    const directory = method.startsWith('ldap:') ? await builderDirectory(method.slice(5)) : undefined;
+    if (method && !directory) {
+      flash(s, tx('signin.expired'), 'error');
+      return back(reply, s, again);
+    }
+    let dev: { username: string; language: string | null } | undefined;
+    if (directory) {
+      let why = 'invalid';
+      try {
+        const u = await ldapAuthenticate(directory, username, password);
+        if (u) {
+          const name = await resolveDeveloper({ kind: 'directory', ...directory }, { subject: u.subject, username: u.username, name: u.displayName, email: u.email, mayLink: true, groups: u.groups });
+          dev = await owner.one('select username, language from meta.developer where username = $1', [name]);
+        }
+      } catch (e) {
+        if (!(e instanceof SsoError)) req.log.warn({ err: e, directory: directory.name }, 'builder ldap sign-in failed');
+        why = e instanceof SsoError ? e.message : e instanceof LdapError ? e.message : 'unreachable';
+      }
+      if (!dev) {
+        await logActivity({ username: username.slice(0, 100), event: 'login_failed', ip, detail: `builder ldap:${directory.name}: ${why}` });
+        flash(s, why === 'invalid' ? tx('signin.invalid') : why === 'unreachable' ? tx('signin.ldap_unavailable', { directory: directory.display_name }) : why, 'error');
+        return back(reply, s, again);
+      }
+    } else
+      // bcrypt always runs (dummy salt for unknown users) so timing does not reveal accounts
+      dev = await owner.one(
+        `select d.username, d.language
+           from (select $1::text as u) x
+           left join meta.developer d on d.username = x.u
+          where crypt($2, coalesce(d.password_hash, gen_salt('bf', 10))) = d.password_hash`,
+        [username, password],
+      );
     // a workspace, when given, must be one of the developer's (administrators: any); the same answer otherwise
     const ws = dev && workspace ? await workspaceOf(workspace, dev.username) : undefined;
     if (!dev || (workspace && !ws)) {
-      await logActivity({ username: username.slice(0, 100), event: 'login_failed', ip, detail: workspace ? 'builder (workspace)' : 'builder' });
+      await logActivity({ username: username.slice(0, 100), event: 'login_failed', ip, detail: directory ? `builder ldap:${directory.name} (workspace)` : workspace ? 'builder (workspace)' : 'builder' });
       flash(s, tx(workspace ? 'signin.invalid_ws' : 'signin.invalid'), 'error');
       return back(reply, s, again);
     }
+    // (sprint 129) a workspace of the developer requires single sign-on: not the pgkiln password (break-glass excepted)
+    if (!directory && (await ssoRequired(dev.username))) {
+      await logActivity({ username: dev.username, event: 'login_failed', ip, detail: 'builder: single sign-on required' });
+      flash(s, tx('signin.sso_required'), 'error');
+      return back(reply, s, again);
+    }
+    const weak = !directory && (password === 'admin' || password === dev.username);
+    const detail = directory ? `builder ldap:${directory.name}` : 'builder';
     // (sprint 126, SEC-2) a developer with a second factor: the password was right, the session comes after the code;
     // (sprint 127) unless this browser was trusted after a second factor, for the instance's number of days
     if ((await hasFactor(dev.username)) && !(await isTrustedBrowser(dev.username, req.cookies?.[TRUST_COOKIE]))) {
-      s.state.__MFA = JSON.stringify({ u: dev.username, ws: ws ? String(ws.id) : null, w: workspace, next, remember: req.body?.remember === '1', weak: password === 'admin' || password === dev.username, at: Date.now() });
+      s.state.__MFA = JSON.stringify({ u: dev.username, ws: ws ? String(ws.id) : null, w: workspace, next, remember: req.body?.remember === '1', weak, at: Date.now() });
       await saveState(s);
       return reply.redirect(`${BASE}/login/2fa`, 303);
     }
-    return finishSignIn(req, reply, s, { username: dev.username, language: dev.language }, { ws: ws ? String(ws.id) : null, workspace, next, remember: req.body?.remember === '1', weak: password === 'admin' || password === dev.username, picked, detail: 'builder' });
+    return finishSignIn(req, reply, s, { username: dev.username, language: dev.language }, { ws: ws ? String(ws.id) : null, workspace, next, remember: req.body?.remember === '1', weak, picked, detail });
   });
 
   /** A workspace by name, when it is one of the developer's (administrators: any). */
@@ -170,6 +216,57 @@ export async function builderRoutes(app: FastifyInstance) {
       [workspace, username],
     );
 
+  // (sprint 129, SEC-1) signing in through an identity provider (OpenID Connect or SAML; devsso.ts). The
+  // provider returns to the runtime's callback (/sso/…, registered at the provider for applications too),
+  // which hands sign-ins without an application to the function below.
+  const SSO_COOKIE = 'pgkiln_sso';
+  app.get(`${BASE}/sso/:provider`, async (req: Req, reply) => {
+    const p = await builderProvider(String(req.params.provider));
+    if (!p) return reply.code(404).send('Not found');
+    try {
+      const next = safeNext(req.query?.next);
+      const { url, browserKey } = p.protocol === 'saml' ? await startSamlSignIn(p, null, next) : await startSignIn(p, null, next);
+      reply.setCookie(SSO_COOKIE, browserKey, { path: '/sso', httpOnly: true, sameSite: 'lax', secure: process.env.COOKIE_SECURE === 'true', maxAge: 600 });
+      return reply.redirect(url);
+    } catch (e) {
+      req.log.warn({ err: e }, 'builder sso start failed');
+      const s = await getSession(req, reply, null, BASE);
+      flash(s, translatorFor(validBuilderLanguage(s.state.__BLANG) ?? cookieLanguage(req))('signin.sso_unavailable', { provider: p.display_name }), 'error');
+      return back(reply, s, `${BASE}/login`);
+    }
+  });
+  /** Linking an identity from the Security page (security.ts): the signed-in developer starts it. */
+  app.post(`${BASE}/security/link/:provider`, async (req: Req, reply) => {
+    const s = await developer(req, reply);
+    if (!s) return;
+    const p = await builderProvider(String(req.params.provider));
+    if (!p) return reply.code(404).send('Not found');
+    try {
+      const { url, browserKey } = p.protocol === 'saml' ? await startSamlSignIn(p, null, `${BASE}/security`, s.username!) : await startSignIn(p, null, `${BASE}/security`, s.username!);
+      reply.setCookie(SSO_COOKIE, browserKey, { path: '/sso', httpOnly: true, sameSite: 'lax', secure: process.env.COOKIE_SECURE === 'true', maxAge: 600 });
+      return reply.redirect(url, 303);
+    } catch (e) {
+      req.log.warn({ err: e }, 'builder sso link failed');
+      flash(s, tr(s)('signin.sso_unavailable', { provider: p.display_name }), 'error');
+      return back(reply, s, `${BASE}/security`);
+    }
+  });
+  // the end of both (the runtime's callback; SsoError → an error page there)
+  onBuilderSso(async (req: Req, reply, p, result, ip) => {
+    if (!p.builder || !result.identity) throw new SsoError('This identity provider does not sign developers in.');
+    const src = { kind: 'provider' as const, ...p };
+    if (result.link) {
+      // the browser that started this was signed in as result.link (the start needs the session and its CSRF token)
+      await linkDeveloper(src, result.identity.subject, result.link);
+      logActivity({ username: result.link, event: 'sso_linked', ip, detail: p.name });
+      return reply.redirect(`${BASE}/security?linked=${encodeURIComponent(p.name)}`, 303);
+    }
+    const username = await resolveDeveloper(src, { ...result.identity, username: result.username, groups: result.groups });
+    const dev = await owner.one<{ username: string; language: string | null }>('select username, language from meta.developer where username = $1', [username]);
+    if (!dev) throw new SsoError('The developer was removed.');
+    return finishSignIn(req, reply, null, dev, { ws: null, workspace: '', next: safeNext(result.next), remember: false, weak: false, picked: null, detail: `builder sso:${p.name}`, sso: p.name });
+  });
+
   // (sprint 128, SEC-2) signing in with a passkey alone: no user name, no password. The browser offers the
   // passkeys it holds for this site (discoverable credentials); the authenticator must verify the developer
   // (fingerprint, face, PIN), so the passkey counts as both factors. Failures count with wrong passwords.
@@ -219,9 +316,11 @@ export async function builderRoutes(app: FastifyInstance) {
     }
     const ws = !why && workspace ? await workspaceOf(workspace, who) : undefined;
     if (!why && workspace && !ws) why = 'not a workspace of the developer';
+    // (sprint 129) a passkey alone is not single sign-on
+    if (!why && (await ssoRequired(who))) why = 'single sign-on required';
     if (why) {
       await logActivity({ username: who.slice(0, 100), event: 'login_failed', ip, detail: `builder passkey: ${why}` });
-      flash(s, tx(why === 'not a workspace of the developer' ? 'signin.invalid_ws' : 'mfa.passkey_failed'), 'error');
+      flash(s, tx(why === 'not a workspace of the developer' ? 'signin.invalid_ws' : why === 'single sign-on required' ? 'signin.sso_required' : 'mfa.passkey_failed'), 'error');
       return back(reply, s, again);
     }
     const dev = await owner.one<{ username: string; language: string | null }>('select username, language from meta.developer where username = $1', [who]);
@@ -229,12 +328,15 @@ export async function builderRoutes(app: FastifyInstance) {
     return finishSignIn(req, reply, s, dev, { ws: ws ? String(ws.id) : null, workspace, next, remember: req.body?.remember === '1', weak: false, picked, detail: 'builder passkey' });
   });
 
-  /** The session after a successful sign-in (password, and the second factor when the developer has one). */
-  async function finishSignIn(req: Req, reply: Parameters<typeof back>[0], s: Awaited<ReturnType<typeof getSession>>, dev: { username: string; language: string | null },
-    o: { ws: string | null; workspace: string; next: string; remember: boolean; weak: boolean; picked: ReturnType<typeof validBuilderLanguage>; detail: string }) {
+  /**
+   * The session after a successful sign-in (password, and the second factor when the developer has one;
+   * or an identity provider, sso: its name; s null: the sign-in page's session is not at hand there).
+   */
+  async function finishSignIn(req: Req, reply: Parameters<typeof back>[0], s: Awaited<ReturnType<typeof getSession>> | null, dev: { username: string; language: string | null },
+    o: { ws: string | null; workspace: string; next: string; remember: boolean; weak: boolean; picked: ReturnType<typeof validBuilderLanguage>; detail: string; sso?: string }) {
     const ip = clientIp(req);
     const { picked, next, workspace } = o;
-    await destroySession(reply, s, BASE);
+    if (s) await destroySession(reply, s, BASE);
     const ns = await createSession(reply, null, BASE, dev.username);
     // the builder theme chosen earlier on this device
     const theme = validTheme(req.cookies?.[THEME_COOKIE]);
@@ -247,8 +349,12 @@ export async function builderRoutes(app: FastifyInstance) {
       if (dev.language && ns.state.__BLANG !== 'en') reply.setCookie(LANG_COOKIE, ns.state.__BLANG, langCookieOptions());
     }
     if (o.weak) ns.state.__WEAK = '1';
+    // (sprint 129) the identity provider decided on the second factor: no enrolment in pgkiln (ui.ts)
+    if (o.sso) ns.state.__SSO = o.sso;
     await saveState(ns);
-    if (o.remember)
+    if (o.sso) {
+      // the sign-in page's "remember" stays as it was
+    } else if (o.remember)
       reply.setCookie(REMEMBER_COOKIE, Buffer.from(JSON.stringify({ w: workspace, u: dev.username })).toString('base64url'), {
         path: BASE, httpOnly: true, sameSite: 'lax', maxAge: 365 * 24 * 3600, secure: process.env.COOKIE_SECURE === 'true',
       });
@@ -447,6 +553,7 @@ export async function builderRoutes(app: FastifyInstance) {
   await workspaceRoutes(app);
   await instanceRoutes(app);
   await securityRoutes(app);
+  await builderSsoRoutes(app);
   await wizardRoutes(app);
   await appFromFileRoutes(app);
 
@@ -928,7 +1035,10 @@ export async function builderRoutes(app: FastifyInstance) {
   app.get(`${BASE}/developers`, async (req: Req, reply) => {
     const s = await developer(req, reply);
     if (!s) return;
-    const devs = (await owner.query(`select username, is_admin, email, exists (select 1 from meta.developer_factor f where f.username = d.username) as mfa
+    const devs = (await owner.query(`select username, is_admin, email, break_glass, exists (select 1 from meta.developer_factor f where f.username = d.username) as mfa,
+                                            (select string_agg(coalesce(p.display_name, l.display_name), ', ' order by 1) from meta.developer_identity i
+                                               left join meta.auth_provider p on p.id = i.provider_id left join meta.ldap_directory l on l.id = i.directory_id
+                                              where i.username = d.username) as identities
                                        from meta.developer d order by 1`)).rows;
     const admin = devs.some((d) => d.username === s.username && d.is_admin);
     const me = devs.find((d) => d.username === s.username);
@@ -947,7 +1057,7 @@ export async function builderRoutes(app: FastifyInstance) {
         ${region(tx('dev.accounts'), html`
           <p class="muted u-mt0">${tx('dev.accounts_help')}</p>
           <div class="table-wrap"><table class="report report-reflow"><thead><tr><th>${tx('dev.username')}</th><th>${tx('dev.role')}</th><th>${tx('dev.email_col')}</th><th>${tx('mfa.column')}</th><th></th></tr></thead><tbody>
-            ${devs.map((d) => html`<tr><td data-label="${tx('dev.username')}">${d.username}${d.username === s.username ? ` ${tx('dev.you')}` : ''}</td><td data-label="${tx('dev.role')}">${d.is_admin ? tx('dev.administrator') : tx('dev.developer')}</td>
+            ${devs.map((d) => html`<tr><td data-label="${tx('dev.username')}">${d.username}${d.username === s.username ? ` ${tx('dev.you')}` : ''}</td><td data-label="${tx('dev.role')}">${d.is_admin ? tx('dev.administrator') : tx('dev.developer')}${d.break_glass ? html` <span class="badge badge-warn" title="${tx('bsso.break_glass_help')}">${tx('bsso.break_glass')}</span>` : ''}${d.identities ? html`<br><span class="muted small">${icon('log-in')} ${d.identities}</span>` : ''}</td>
               <td data-label="${tx('dev.email_col')}">${admin && d.username !== s.username
                 ? html`<form method="post" action="${BASE}/developers/email" class="search u-m0 u-mwnone">${csrf(s)}<input type="hidden" name="username" value="${d.username}"><input name="email" type="email" value="${d.email ?? ''}" aria-label="${tx('dev.email_of', { user: d.username })}" placeholder="${tx('dev.none')}"><button class="btn">${tx('dev.save')}</button></form>`
                 : html`<span class="wrap-anywhere">${d.email ?? ''}</span>`}</td>
@@ -955,6 +1065,7 @@ export async function builderRoutes(app: FastifyInstance) {
                   ${input(`reason_${d.username}`.replace(/[^\w]/g, '_'), tx('mfa.reason'), '', { required: true, help: tx('mfa.reset_help', { user: d.username }) })}
                   <button class="btn btn-sm btn-danger">${tx('mfa.reset_btn')}</button></form></div></details>` : ''}` : html`<span class="muted">${tx('mfa.off')}</span>`}</td><td>${d.username === s.username || !admin ? '' : html`
               <form method="post" action="${BASE}/developers/admin" class="u-inline">${csrf(s)}<input type="hidden" name="username" value="${d.username}"><input type="hidden" name="is_admin" value="${d.is_admin ? 'false' : 'true'}"><button class="link-button">${d.is_admin ? tx('dev.make_dev') : tx('dev.make_admin')}</button></form>
+              ${d.is_admin ? html`· <form method="post" action="${BASE}/developers/break-glass" class="u-inline">${csrf(s)}<input type="hidden" name="username" value="${d.username}"><input type="hidden" name="break_glass" value="${d.break_glass ? 'false' : 'true'}"><button class="link-button" title="${tx('bsso.break_glass_help')}">${d.break_glass ? tx('bsso.break_glass_remove') : tx('bsso.break_glass_make')}</button></form>` : ''}
               · <form method="post" action="${BASE}/developers/delete" class="u-inline">${csrf(s)}<input type="hidden" name="username" value="${d.username}"><button class="link-button" data-confirm="${tx('dev.remove_confirm', { user: d.username })}">${tx('dev.remove')}</button></form>`}</td></tr>`)}
           </tbody></table></div>
           ${admin
@@ -1042,7 +1153,12 @@ export async function builderRoutes(app: FastifyInstance) {
         flash(s, tr(s)('mfa.keep_admins'), 'error');
         return back(reply, s, `${BASE}/developers`);
       }
-      await owner.query('update meta.developer set is_admin = $2 where username = $1', [req.body.username, req.body.is_admin === 'true']);
+      // (sprint 129) break-glass is for administrators: a developer loses it, unless they are the last one needed
+      if (req.body.is_admin !== 'true' && (await leavesNoBreakGlass(req.body.username))) {
+        flash(s, tr(s)('bsso.keep_break_glass'), 'error');
+        return back(reply, s, `${BASE}/developers`);
+      }
+      await owner.query('update meta.developer set is_admin = $2, break_glass = break_glass and $2 where username = $1', [req.body.username, req.body.is_admin === 'true']);
       flash(s, tr(s)('dev.role_changed'));
     }
     return back(reply, s, `${BASE}/developers`);
@@ -1053,7 +1169,7 @@ export async function builderRoutes(app: FastifyInstance) {
     if (!s) return;
     if (!(await isAdmin(s.username))) return reply.code(403).send('Only administrators remove developers.');
     if (req.body?.username && req.body.username !== s.username) {
-      if (await leavesTooFewAdmins(req.body.username)) {
+      if ((await leavesTooFewAdmins(req.body.username)) || (await leavesNoBreakGlass(req.body.username))) {
         flash(s, tr(s)('mfa.keep_admins'), 'error');
         return back(reply, s, `${BASE}/developers`);
       }

package/src/builder/security.ts

@@ -14,6 +14,7 @@ import { clientIp, logActivity, saveState, type Session } from '../session.ts';
 import { ALGORITHMS, newChallenge, relyingParty, verifyRegistration, WebAuthnError } from '../webauthn.ts';
 import { tr } from './i18n.ts';
 import { isAdmin } from './locks.ts';
+import { identitiesRegion } from './builder-sso.ts';
 import { back, BASE, csrf, developer, flash, input, region, send, shell, type Req } from './ui.ts';
 
 // (sprint 126, SEC-2 and SEC-6) Developer › Security: a developer's second factors (authenticator apps, TOTP)
@@ -135,7 +136,8 @@ export async function securityRoutes(app: FastifyInstance) {
           ${days || trusted ? html`<h3>${tx('mfa.trusted_title')}</h3>
             <p class="u-mt0">${days ? tx('mfa.trusted_count', { n: trusted, days }) : tx('mfa.trusted_off')}</p>
             ${trusted ? html`<form method="post" action="${BASE}/security/forget-browsers">${csrf(s)}<button class="btn">${tx('mfa.forget_browsers')}</button></form>` : ''}` : ''}`)}
-      </div>`;
+      </div>
+      ${await identitiesRegion(s, typeof req.query?.linked === 'string' ? req.query.linked : undefined)}`;
     return send(reply, s, shell(s, tx('mfa.title'), [[tx('mfa.title')]], main, 'developers'));
   });
 

package/src/builder/ui.ts

@@ -333,7 +333,8 @@ export async function developer(req: Req, reply: FastifyReply) {
     reply.redirect(`${BASE}/developers`);
     return null;
   }
-  const due = await enrolmentDue(s.username, admin);
+  // (sprint 129) signed in through an identity provider: it decides on the second factor
+  const due = s.state.__SSO ? null : await enrolmentDue(s.username, admin);
   if (due?.due === 'grace') s.state.__MFA_DUE = due.until.toISOString();
   else if (due && !weakFirst && !/^\/builder\/(security|logout|language|theme)(?:[/?]|$)/.test(req.url)) {
     reply.redirect(`${BASE}/security`);

package/src/builder/users.ts

@@ -4,9 +4,13 @@ import { owner } from '../db.ts';
 import { appAllowed } from './workspaces.ts';
 import { html, raw } from '../html.ts';
 import { accountSettings, clearAccountSettings, passwordProblem } from '../accounts.ts';
+import { accountCodesLeft, accountFactors, resetAccountFactors } from '../account-mfa.ts';
+import { icon } from '../icons.ts';
+import { clientIp, logActivity } from '../session.ts';
 import { loginMaxFailuresPerUser, loginWindowMinutes } from '../security.ts';
 import { acsUrl, metadataUrl, spEntityId } from '../saml.ts';
 import { discover, publicUrl, redirectUri } from '../sso.ts';
+import { builderSignInRegion } from './builder-sso.ts';
 import { administrator, back, BASE, csrf, developer, flash, input, region, select, send, shell, type Req } from './ui.ts';
 
 // The workspace user directory (like APEX's workspace users with
@@ -106,7 +110,8 @@ export async function usersRoutes(app: FastifyInstance) {
     const users = (
       await owner.query(
         `select a.*, coalesce((select jsonb_agg(jsonb_build_object('alias', p.alias, 'roles', aa.roles) order by p.alias)
-                                 from meta.app_access aa join meta.app p on p.id = aa.app_id where aa.account_id = a.id), '[]') as apps
+                                 from meta.app_access aa join meta.app p on p.id = aa.app_id where aa.account_id = a.id), '[]') as apps,
+                exists (select 1 from meta.account_factor f where f.account_id = a.id) as mfa
            from meta.account a
           where $1 = '' or a.username ilike '%' || $1 || '%' or a.display_name ilike '%' || $1 || '%' or a.email ilike '%' || $1 || '%'
           order by lower(a.username)
@@ -124,16 +129,17 @@ export async function usersRoutes(app: FastifyInstance) {
             <input type="search" name="q" value="${q}" placeholder="${tx('us.search_ph')}" aria-label="${tx('us.search_label')}"><button class="btn">${tx('us.search')}</button>
           </form>
           <div class="table-wrap"><table class="report report-reflow">
-            <thead><tr><th>${tx('us.username')}</th><th>${tx('us.name')}</th><th>${tx('us.apps_roles')}</th><th>${tx('us.signin')}</th><th>${tx('us.status')}</th></tr></thead>
+            <thead><tr><th>${tx('us.username')}</th><th>${tx('us.name')}</th><th>${tx('us.apps_roles')}</th><th>${tx('us.signin')}</th><th>${tx('mfa.column')}</th><th>${tx('us.status')}</th></tr></thead>
             <tbody>${users.length
               ? users.map((u) => html`<tr>
                   <td data-label="${tx('us.username')}"><a href="${BASE}/users/${u.id}">${u.username}</a></td>
                   <td data-label="${tx('us.name')}">${u.display_name ?? ''}${u.email ? html`<div class="muted">${u.email}</div>` : ''}</td>
                   <td data-label="${tx('us.applications')}">${u.apps.length ? u.apps.map((x: any) => html`<span class="chip">${x.alias}${x.roles.length ? `: ${x.roles.join(', ')}` : ''}</span> `) : html`<span class="muted">${tx('us.none')}</span>`}</td>
                   <td data-label="${tx('us.signin')}">${u.password_hash ? tx('us.password') : html`<span class="muted">${tx('us.no_password')}</span>`}</td>
+                  <td data-label="${tx('mfa.column')}">${u.mfa ? html`${icon('lock')} ${tx('mfa.on')}` : html`<span class="muted">${tx('mfa.off')}</span>`}</td>
                   <td data-label="${tx('us.status')}">${u.active ? tx('us.active') : html`<b>${tx('us.inactive')}</b>`}${u.last_login_at ? html`<div class="muted">${tx('us.last', { at: String(u.last_login_at).slice(0, 16) })}</div>` : ''}</td>
                 </tr>`)
-              : html`<tr><td colspan="5" class="empty">${tx('us.no_accounts')}</td></tr>`}</tbody>
+              : html`<tr><td colspan="6" class="empty">${tx('us.no_accounts')}</td></tr>`}</tbody>
           </table></div>`)}
         ${region(tx('us.create'), html`
           <form method="post" action="${BASE}/users">${csrf(s)}
@@ -214,6 +220,7 @@ export async function usersRoutes(app: FastifyInstance) {
       owner.query(`select id, name, alias from meta.app where id not in (select app_id from meta.app_access where account_id = $1) order by name`, [u.id]),
     ]);
     const hints = await roleHints([...access.rows.map((a) => a.app_id), ...apps.rows.map((a) => a.id)]);
+    const [factors, codes] = await Promise.all([accountFactors(u.id), accountCodesLeft(u.id)]);
     const main = html`
       <div class="title-row"><h1>${u.username}</h1></div>
       <div class="columns">
@@ -243,6 +250,13 @@ export async function usersRoutes(app: FastifyInstance) {
             <div class="buttons"><button class="btn">${tx('us.set_password')}</button>
               ${u.password_hash ? html`<button class="btn" name="remove" value="1" data-confirm="${tx('us.remove_confirm')}">${tx('us.remove_password')}</button>` : ''}</div>
           </form>
+          <h3 id="two-factor">${tx('us.mfa_title')}</h3>
+          <p>${factors.length ? tx('us.mfa_status', { n: factors.length, codes }) : tx('us.mfa_none')}</p>
+          ${factors.length
+            ? html`<form method="post" action="${BASE}/users/${u.id}/reset-2fa" class="danger-zone">${csrf(s)}
+                <div class="form-grid">${input('reason', tx('mfa.reason'), '', { required: true, help: tx('us.mfa_reset_help', { user: u.username }) })}</div>
+                <div class="buttons"><button class="btn btn-danger">${tx('mfa.reset_btn')}</button></div></form>`
+            : ''}
           <form method="post" action="${BASE}/users/${u.id}/delete" class="danger-zone">${csrf(s)}
             <button class="btn btn-danger" data-confirm="${tx('us.delete_confirm', { user: u.username })}">${tx('us.delete')}</button>
           </form>`)}
@@ -325,6 +339,24 @@ export async function usersRoutes(app: FastifyInstance) {
     return back(reply, s, `${BASE}/users/${req.params.id}`);
   });
 
+  // (sprint 130, SEC-3) remove an account's authenticator apps and recovery codes (a lost phone), with a reason
+  app.post(`${BASE}/users/:id(^\\d+$)/reset-2fa`, async (req: Req, reply) => {
+    const s = await developer(req, reply);
+    if (!s) return;
+    const tx = tr(s);
+    const reason = String(req.body?.reason ?? '').trim().slice(0, 200);
+    const acc = await owner.one<{ id: number; username: string }>('select id, username from meta.account where id = $1', [req.params.id]);
+    if (!acc) return reply.code(404).send('Not found');
+    if (!reason) {
+      flash(s, tx('us.mfa_reason_needed'), 'error');
+      return back(reply, s, `${BASE}/users/${acc.id}#two-factor`);
+    }
+    await resetAccountFactors(acc.id);
+    await logActivity({ username: acc.username, event: '2fa_reset', ip: clientIp(req), detail: `by ${s.username}: ${reason}` });
+    flash(s, tx('us.mfa_reset_done', { user: acc.username }));
+    return back(reply, s, `${BASE}/users/${acc.id}`);
+  });
+
   app.post(`${BASE}/users/:id(^\\d+$)/delete`, async (req: Req, reply) => {
     const s = await developer(req, reply);
     if (!s) return;
@@ -476,6 +508,7 @@ export async function usersRoutes(app: FastifyInstance) {
           <p class="muted">${tx.rich('idp.public_url', { env: html`<code>PUBLIC_URL</code>` })}</p>
           <p>${tx.rich('idp.grant', { type: html`<b>${tx('idp.auth_code')}</b>`, scopes: html`<code>${pr.scopes}</code>`, claim: html`<code>${pr.groups_claim}</code>` })}</p>
           <form method="post" action="${BASE}/users/providers/${pr.id}/test">${csrf(s)}<button class="btn">${tx('idp.test')}</button></form>`)}
+        ${await builderSignInRegion(s, 'provider', pr)}
       </div>`;
     return send(reply, s, shell(s, pr.display_name, [['Users', `${BASE}/users`], [tx('idp.title'), `${BASE}/users/providers`], [pr.display_name]], main, 'users'));
   });

package/src/builder/workspaces.ts

@@ -9,6 +9,7 @@ import { icon } from '../icons.ts';
 import { clientIp, logActivity, type BuilderWorkspace, type Session } from '../session.ts';
 import { isAdmin } from './locks.ts';
 import { setWorkspaceRequired } from '../mfa.ts';
+import { breakGlassAdmins } from '../devsso.ts';
 import { back, BANNER_COLORS, BASE, csrf, developer, flash, input, region, select, send, shell, type Req } from './ui.ts';
 
 // Workspaces (064; APEX: workspaces). A workspace groups applications and the
@@ -216,7 +217,7 @@ function serviceRegion(s: Session, w: { id: number; message: string | null; bann
 }
 
 /** (093) Workspace preferences: the SQL Workshop and the applications' REST modules on or off. */
-function preferencesRegion(s: Session, w: { id: number; sql_workshop: boolean; rest_services: boolean; builder_home: string | null; mfa_required_since: Date | null }, without: string[]) {
+function preferencesRegion(s: Session, w: { id: number; sql_workshop: boolean; rest_services: boolean; builder_home: string | null; mfa_required_since: Date | null; sso_only: boolean }, without: string[], unlinked: string[]) {
   const check = (name: string, on: boolean, label: string, help: string) =>
     html`<div class="field"><label class="check"><input type="checkbox" name="${name}" value="true"${on ? raw(' checked') : ''}> ${label}</label><small class="help">${help}</small></div>`;
   const tx = tr(s);
@@ -229,7 +230,12 @@ function preferencesRegion(s: Session, w: { id: number; sql_workshop: boolean; r
     <form method="post" action="${BASE}/workspaces/${w.id}/mfa">${csrf(s)}
       ${check('required', !!w.mfa_required_since, tx('wsp.mfa_required'), tx('wsp.mfa_required_help'))}
       ${w.mfa_required_since ? html`<p class="small">${tx('wsp.mfa_since', { date: new Date(w.mfa_required_since).toISOString().slice(0, 10) })}${without.length ? html` ${tx('wsp.mfa_without', { list: without.join(', ') })}` : ''}</p>` : ''}
-      <div class="buttons"><button class="btn">${tx('wsp.mfa_save')}</button></div></form>`, '', 'preferences');
+      <div class="buttons"><button class="btn">${tx('wsp.mfa_save')}</button></div></form>
+    <h3 id="sso">${tx('wsp.sso')}</h3>
+    <form method="post" action="${BASE}/workspaces/${w.id}/sso">${csrf(s)}
+      ${check('sso_only', w.sso_only, tx('wsp.sso_only'), tx('wsp.sso_only_help'))}
+      ${w.sso_only && unlinked.length ? html`<p class="small">${tx('wsp.sso_unlinked', { list: unlinked.join(', ') })}</p>` : ''}
+      <div class="buttons"><button class="btn">${tx('wsp.sso_save')}</button></div></form>`, '', 'preferences');
 }
 
 /** (093) Extension links: links to other tools in the builder's Extensions menu. */
@@ -351,6 +357,11 @@ export async function workspaceRoutes(app: FastifyInstance) {
     const without = (await owner.query<{ username: string }>(
       `select m.username from meta.workspace_member m where m.workspace_id = $1
           and not exists (select 1 from meta.developer_factor f where f.username = m.username) order by 1`, [w.id])).rows.map((r) => r.username);
+    // (sprint 129) the members who could not sign in while single sign-on is required: no linked identity, not break-glass
+    const unlinked = (await owner.query<{ username: string }>(
+      `select m.username from meta.workspace_member m join meta.developer d on d.username = m.username
+        where m.workspace_id = $1 and not d.break_glass
+          and not exists (select 1 from meta.developer_identity i where i.username = m.username) order by 1`, [w.id])).rows.map((r) => r.username);
     const main = html`
       <div class="title-row"><h1>${w.name}</h1></div>
       <div class="columns wide-left">
@@ -375,7 +386,7 @@ export async function workspaceRoutes(app: FastifyInstance) {
       </div>
       ${serviceRegion(s, w)}
       ${region(tx('wsp.mail_net'), html`<p class="u-mt0">${tx.rich('wsp.mail_net_text', { mail: html`<a href="${BASE}/workspaces/${w.id}/mail">${tx('wsp.mail_service')}</a>`, network: html`<a href="${BASE}/network?ws=${w.id}">${tx('wsp.network')}</a>`, queue: html`<a href="${BASE}/mail-queue${full ? `?ws=${w.id}` : ''}">${tx('wsp.queue')}</a>` })}</p>`, '', 'mail-network')}
-      <div class="columns">${preferencesRegion(s, w, without)}${linksRegion(s, w, links)}</div>
+      <div class="columns">${preferencesRegion(s, w, without, unlinked)}${linksRegion(s, w, links)}</div>
       ${full ? isolationRegion(s, w, roles.rows) : region(tx('wsp.isolation'), html`<p class="u-mt0">${w.isolated ? tx('wsp.iso_short_on') : tx('wsp.iso_short_off')} ${tx('wsp.admins_change')}</p>`)}
       ${!full ? '' : region(tx('wsp.applications'), html`<div class="table-wrap"><table class="report report-reflow">
         <thead><tr><th>${tx('wsp.application')}</th><th>${tx('wsp.move_to')}</th></tr></thead>
@@ -580,6 +591,29 @@ export async function workspaceRoutes(app: FastifyInstance) {
     return back(reply, s, `${BASE}/workspaces/${req.params.id}#mfa`);
   });
 
+  // (sprint 129, SEC-1) a workspace requires single sign-on of its developers: not while no break-glass
+  // administrator could sign in with the password, and not by someone who would lock themselves out
+  app.post(`${BASE}/workspaces/:id(^\\d{1,9}$)/sso`, async (req: Req, reply) => {
+    const s = await developer(req, reply);
+    if (!s || !(await workspaceAdminOnly(s, reply, req.params.id))) return;
+    const tx = tr(s);
+    const on = req.body?.sso_only === 'true';
+    if (on && !(await breakGlassAdmins()).length) {
+      flash(s, tx('wsp.sso_no_break_glass'), 'error');
+      return back(reply, s, `${BASE}/workspaces/${req.params.id}#sso`);
+    }
+    if (on && !(await owner.one(`select 1 as ok from meta.developer d where d.username = $1
+        and (d.break_glass or exists (select 1 from meta.developer_identity i where i.username = d.username))`, [s.username]))) {
+      flash(s, tx('wsp.sso_link_first'), 'error');
+      return back(reply, s, `${BASE}/workspaces/${req.params.id}#sso`);
+    }
+    const r = await owner.query('update meta.workspace set sso_only = $2 where id = $1', [req.params.id, on]);
+    if (!r.rowCount) return reply.code(404).send('Not found');
+    await logActivity({ appId: null, username: s.username, event: 'sso_policy', ip: clientIp(req), detail: `workspace ${req.params.id}: single sign-on ${on ? 'required' : 'not required'}` });
+    flash(s, tx(on ? 'wsp.sso_on' : 'wsp.sso_off'));
+    return back(reply, s, `${BASE}/workspaces/${req.params.id}#sso`);
+  });
+
   // (093) extension links
   app.post(`${BASE}/workspaces/:id(^\\d{1,9}$)/links`, async (req: Req, reply) => {
     const s = await developer(req, reply);

package/src/cli/main.ts

@@ -471,15 +471,18 @@ const COMMANDS: Record<string, Command> = {
   },
   // (sprint 126, SEC-6) lockout recovery on the server, when nobody can sign in to the builder
   admin: {
-    usage: 'pgkiln admin reset-2fa <developer> | set-2fa-policy off|admins|all [options]',
-    summary: 'lockout recovery: reset a developer\'s two-factor sign-in, set the two-factor policy',
+    usage: 'pgkiln admin reset-2fa <developer> | set-2fa-policy off|admins|all | builder-sign-in password [options]',
+    summary: 'lockout recovery: reset a developer\'s two-factor sign-in, set the two-factor policy, allow the password again',
     details:
       'pgkiln admin reset-2fa <developer> [--reason <text>]\n' +
-      'pgkiln admin set-2fa-policy off|admins|all [--grace <days>]\n\n' +
+      'pgkiln admin set-2fa-policy off|admins|all [--grace <days>]\n' +
+      'pgkiln admin builder-sign-in password\n\n' +
       "reset-2fa removes the developer's authenticator apps and recovery codes and ends their builder\n" +
       'sessions; they sign in with the password and set up an app again. set-2fa-policy off always works\n' +
       "(and clears the workspaces' own two-factor rules); admins and all need at least two administrators\n" +
-      'with two-factor sign-in (or every one, when there are fewer). Both are written to the activity log and mailed to the administrators.',
+      'with two-factor sign-in (or every one, when there are fewer). builder-sign-in password turns off the\n' +
+      "workspaces' single sign-on rule, for when the identity provider fails and no break-glass administrator\n" +
+      'can sign in. All are written to the activity log and mailed to the administrators.',
     options: { reason: { type: 'string' }, grace: { type: 'string' } },
     optionHelp: [
       ['--reason <text>', 'reset-2fa: why (in the activity log and the mail)'],
@@ -516,7 +519,18 @@ const COMMANDS: Record<string, Command> = {
           out(`Two-factor policy: ${policy}${policy === 'off' ? '' : `, grace ${grace} days`}.${cleared ? ` ${cleared} workspace(s) no longer require it.` : ''}${sent ? ` ${sent} administrator(s) told by mail.` : ''}\n`);
           return EXIT.ok;
         }
-        throw new UsageError(`unknown action ${action}: use reset-2fa or set-2fa-policy`);
+        // (sprint 129, SEC-1) every workspace allows the pgkiln password again
+        if (action === 'builder-sign-in') {
+          if (arg !== 'password') throw new UsageError('builder-sign-in takes password');
+          const { clearSsoOnly } = await import('../devsso.ts');
+          const cleared = await clearSsoOnly();
+          await logActivity({ event: 'sso_policy', ip: 'cli', detail: `password sign-in allowed again, ${cleared} workspace rule(s) cleared (${by})` });
+          const sent = await mfa.notifyMfa(await mfa.adminEmails(), 'pgkiln: the builder password works again',
+            `${by} turned off the single sign-on rule of ${cleared} workspace(s) on the server: developers may sign in with the pgkiln password.`);
+          out(`Developers may sign in with the pgkiln password again; ${cleared} workspace(s) no longer require single sign-on.${sent ? ` ${sent} administrator(s) told by mail.` : ''}\n`);
+          return EXIT.ok;
+        }
+        throw new UsageError(`unknown action ${action}: use reset-2fa, set-2fa-policy or builder-sign-in`);
       } finally {
         await closePools();
       }