From 5417d5eeedeeaf2634d3926b4a49497cd356a0d2 Mon Sep 17 00:00:00 2001 From: marvin Date: Wed, 16 Sep 2026 17:42:26 -0400 Subject: [PATCH] Add administrator override for a locked-out user's 2FA; update README/ROADMAP (v0.11.118) --- README.md | 4 ++-- ROADMAP.md | 9 +++++---- package.json | 2 +- src/public/app.js | 9 ++++++++- src/public/index.html | 4 ++-- src/server.js | 13 +++++++++++++ 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 22e6ce9..b766d88 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Docker Architectures Caddy - Version + Version

Why Site Gateway · @@ -42,7 +42,7 @@ It's intentionally narrower than a general-purpose proxy manager. You describe * - **Automatic HTTPS** — Caddy issues and renews public certificates; internal, HTTP-only, and uploaded custom-certificate modes are also supported. - **Live dashboard** — gateway/HTTP/HTTPS/storage health, hosted and proxy counts, certificate status, throughput, uptime, memory, disk, and version info at a glance. - **Access Lists** — reusable login/network policies combining accounts, groups, and IP/CIDR rules across any host. -- **Two-factor authentication** — TOTP-based MFA for administrator and user accounts, with recovery codes. +- **Two-factor authentication** — TOTP-based MFA for administrator and user accounts, with recovery codes, plus an administrator-side override to disable a locked-out user's 2FA when they've lost their authenticator and used up their recovery codes. - **Users, groups, and roles** — Administrator and Standard User roles, with account lifecycle controls. - **Backups** — configuration or complete `.sgbackup` archives, downloadable, importable, schedulable, and optionally AES-256-GCM encrypted. - **Certificates page** — issuer, expiration, days remaining, and renewal health for every managed and uploaded certificate. diff --git a/ROADMAP.md b/ROADMAP.md index b758ed5..3ab84ad 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -2,7 +2,7 @@ ## Current release status -`v0.11.112` is a stable, day-to-day release. The product has moved well past the original alpha creation flow described in earlier versions of this document — Hosted Sites, Proxy Hosts, Redirect Hosts, and Streaming Hosts are all implemented, along with authentication, access control, certificates, backups, and full dashboard reporting. This document reflects what's actually shipped and what's genuinely still ahead. +`v0.11.118` is a stable, day-to-day release. The product has moved well past the original alpha creation flow described in earlier versions of this document — Hosted Sites, Proxy Hosts, Redirect Hosts, and Streaming Hosts are all implemented, along with authentication, access control, certificates, backups, and full dashboard reporting. This document reflects what's actually shipped and what's genuinely still ahead. ## Product direction @@ -23,7 +23,7 @@ Site Gateway stays simpler than a general-purpose proxy manager: one dashboard, - Local users with Administrator and Standard User roles, account lifecycle controls (disable/archive/restore). - Groups, used to grant Access List membership without managing users one by one. - Access Lists combining accounts, groups, and IP/CIDR network rules behind a themed sign-in page. -- Optional two-factor authentication (TOTP) with a self-service My Account view for enrolling and managing it. +- Optional two-factor authentication (TOTP) with a self-service My Account view for enrolling and managing it, plus an administrator-side override (Administration → Users → “•••” → Disable 2FA) for a user who's locked out with no recovery codes left. Logged to the Audit log. - First-time setup flow that finalizes the persistent administrator account from bootstrap credentials. ### Certificates and TLS @@ -36,7 +36,7 @@ Site Gateway stays simpler than a general-purpose proxy manager: one dashboard, - Live dashboard health for the gateway, HTTP, HTTPS, and storage, plus hosted/proxy/certificate counts and throughput. - System panel: uptime, memory, persistent-data size, disk space, installed app/Caddy versions, public IP. -- Performance view with request throughput, response times, and per-route breakdowns. +- Performance view with request throughput, response times, and per-route breakdowns — the host filter applies to the throughput table as well as the trend chart, average response times display in seconds once they pass 1000ms, and per-domain error counts open a themed breakdown by status code. - Rotating access and activity logs. - Update-available banner when a newer image is deployed. - A redacted support-report export exists (version, config health, certificate readiness, upstream checks, recent events) but its UI entry point is currently hidden pending a readability rewrite of the report's output format. @@ -51,7 +51,8 @@ Site Gateway stays simpler than a general-purpose proxy manager: one dashboard, - Current icon and wordmark (v0.11.99) used consistently across the login screen, sidebar, themed default pages, and this README. - A sitewide design-token system (colors, spacing, radius, and type scale defined once and reused everywhere) underpins the interface, so new UI stays visually consistent by default. -- Integrated, searchable in-app documentation covering every configurable field, including 2FA and the update-notification banner. +- Integrated, searchable in-app documentation covering every configurable field, including 2FA (self-service and the administrator override) and the update-notification banner. +- Toast notifications are color-coded — error toasts render distinctly from success/neutral ones, using the same token-driven theming as the rest of the interface. - Companion marketing site with an installation guide covering Docker Compose, plain `docker run`, and Unraid. ## What's next diff --git a/package.json b/package.json index dffb4fd..dcffb4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "site-gateway", - "version": "0.11.117", + "version": "0.11.118", "private": true, "description": "Site Gateway: simple self-hosted website publishing, reverse proxying, and automatic HTTPS.", "type": "module", diff --git a/src/public/app.js b/src/public/app.js index 5819c73..f8f09a1 100644 --- a/src/public/app.js +++ b/src/public/app.js @@ -359,7 +359,7 @@ function renderUsers() { const roleLabel = user.role === "administrator" ? "Administrator" : user.role === "viewer" ? "Viewer" : "Standard User"; const lifecycle = user.status === "archived" ? `` : ``; const statusToggle = user.status === "archived" ? "" : ``; - const menu = `

${!isSelf ? `` : ""}
`; + const menu = `
${!isSelf && user.mfaEnabled ? `` : ""}${!isSelf ? `` : ""}
`; return `
${escapeHtml(initials(user.displayName))}
${escapeHtml(user.status)}${menu}

${escapeHtml(user.displayName)}${isSelf ? ' You' : ""}

${escapeHtml(user.username)}

${roleLabel}${user.lastLoginAt ? `Last login ${escapeHtml(formatTime(user.lastLoginAt))}` : "Never signed in"}
${statusToggle}
`; }).join("") : '

No users found.

'; document.querySelectorAll("#user-list .user-card").forEach(card => { card.style.position = "relative"; card.style.minHeight = "250px"; card.style.paddingBottom = "64px"; const head = card.querySelector(".user-card-head"), status = head?.querySelector(".status-pill"), footer = card.querySelector(".card-footer"); if (!head || !footer) return; if (status) footer.prepend(status); }); @@ -656,6 +656,13 @@ $("#user-list").addEventListener("click", async event => { closeMenus(); state.passwordTarget = user.id; $("#password-form").reset(); $("#password-error").textContent = ""; $("#password-title").textContent = `Reset ${user.username} password`; $("#password-dialog").showModal(); return; } + if (button.dataset.userAction === "mfa-disable") { + closeMenus(); + if (!await themedUserConfirm(`Disable two-factor authentication for “${user.username}”? They’ll be able to sign in with just their password until they set it up again.`, "Disable 2FA")) return; + button.disabled = true; + try { await api(`/api/users/${user.id}/mfa/disable`, { method: "POST" }); await loadFeatureView(); toast("Two-factor authentication disabled."); } catch (error) { toast(error.message, "error"); } finally { button.disabled = false; } + return; + } if (button.dataset.userAction === "delete") { closeMenus(); if (!await themedUserConfirm(`Permanently delete user “${user.username}”? This cannot be undone.`, "Delete user")) return; diff --git a/src/public/index.html b/src/public/index.html index 005b14c..fe2325b 100644 --- a/src/public/index.html +++ b/src/public/index.html @@ -306,7 +306,7 @@ - +