Skip to content

Keep gating setup until an account actually exists #1224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elemdos merged 1 commit into from
Sep 7, 2026
Merged

Keep gating setup until an account actually exists #1224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions internal/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,18 @@ func RegisterAdminApp(pb *pocketbase.PocketBase) error {
setupRequired := superuserCount == 0
isSetup := requestEvent.Request.URL.Path == "/admin/setup"
isFile := path.Ext(requestEvent.Request.URL.Path) != ""
if setupRequired && !isSetup && !isFile {
return requestEvent.Redirect(302, "/admin/setup")
if setupRequired {
// Setup isn't done yet — keep gating. Redirect every
// non-setup page (incl. /admin/auth) back to /admin/setup
// so an abandoned setup can't leave the instance stuck at
// the auth dead-end. Never latch setupCompleted here: a
// visit to /admin/setup itself must not count as "done".
if !isSetup && !isFile {
return requestEvent.Redirect(302, "/admin/setup")
}
} else {
// A real superuser exists — setup is genuinely complete.
// Latch so we stop counting superusers on every request.
setupCompleted = true
}
}
Expand Down