feat(system-admin): implement revocation of system admin privileges with safeguards
- Added RevokeSystemAdmin functionality to the user service and repository, ensuring atomic checks for self-revoke and last admin scenarios. - Updated the system handler to utilize the new revocation method, improving error handling for various edge cases. - Enhanced the bootstrap process to prevent unintended promotions when system admins already exist. - Refactored related comments and documentation for clarity on the new behavior and safeguards in place.
This commit is contained in:
+22
-7
@@ -18,17 +18,18 @@ import (
|
||||
)
|
||||
|
||||
// bootstrapEnvVar is the env var that names the email of the user who
|
||||
// should be promoted to system administrator on every startup.
|
||||
// may be promoted to system administrator when the deployment has no
|
||||
// existing system administrators.
|
||||
//
|
||||
// Why an env var (vs a CLI subcommand)?
|
||||
// - Zero-friction in docker-compose / k8s deploys: set it once in the
|
||||
// manifest and the very first user account that signs up with that
|
||||
// email is auto-promoted, with no extra ops step.
|
||||
// - Idempotent: if the user is already a system admin, bootstrapping is
|
||||
// a no-op (no DB write, no log noise beyond a debug line).
|
||||
// - Safe to leave set: the operation only ever PROMOTES; it never
|
||||
// demotes. So leaving the var in place across restarts won't undo
|
||||
// manual revokes from the UI.
|
||||
// a no-op.
|
||||
// - Safe to leave set: once at least one system admin exists, the env
|
||||
// var stops granting privileges. That prevents a UI revoke from being
|
||||
// silently undone on the next restart.
|
||||
const bootstrapEnvVar = "WEKNORA_BOOTSTRAP_SYSTEM_ADMIN_EMAIL"
|
||||
|
||||
// runStartupBootstrap consults the env and applies any one-shot
|
||||
@@ -52,8 +53,9 @@ func runStartupBootstrap(c *dig.Container) {
|
||||
}
|
||||
|
||||
// bootstrapSystemAdmin promotes the user identified by `email` to system
|
||||
// administrator if they exist and are not already one. The function is
|
||||
// idempotent and non-fatal — it warns and returns on every error path.
|
||||
// administrator only when the deployment currently has no system admins.
|
||||
// The function is idempotent and non-fatal — it warns and returns on
|
||||
// every error path.
|
||||
//
|
||||
// The bootstrap intentionally does NOT create a user when the email is
|
||||
// not yet registered: account creation is a workflow with side effects
|
||||
@@ -83,6 +85,19 @@ func bootstrapSystemAdmin(ctx context.Context, userSvc interfaces.UserService, e
|
||||
bootstrapEnvVar, email, user.ID)
|
||||
return
|
||||
}
|
||||
_, total, err := userSvc.ListSystemAdmins(ctx, 0, 1)
|
||||
if err != nil {
|
||||
logger.Warnf(ctx,
|
||||
"[bootstrap] %s=%s: cannot verify existing system admins, skipping promotion: %v",
|
||||
bootstrapEnvVar, email, err)
|
||||
return
|
||||
}
|
||||
if total > 0 {
|
||||
logger.Infof(ctx,
|
||||
"[bootstrap] %s=%s: %d system admin(s) already exist; not promoting user %s",
|
||||
bootstrapEnvVar, email, total, user.ID)
|
||||
return
|
||||
}
|
||||
user.IsSystemAdmin = true
|
||||
if err := userSvc.UpdateUser(ctx, user); err != nil {
|
||||
logger.Warnf(ctx,
|
||||
|
||||
Reference in New Issue
Block a user