Skip to content

Modern Docker Management, Designed for Everyone

fix: allow assigning roles to OIDC users and handle username collisions on OIDC login (#3692)

Kyle Mendellc38c2580fb14
diff --git a/backend/internal/auth/service.go b/backend/internal/auth/service.go
index 730e4ddd2..43bbc2698 100644
--- a/backend/internal/auth/service.go
+++ b/backend/internal/auth/service.go
@@ -9,6 +9,7 @@ import (
"fmt"
"log/slog"
"maps"
+ "strconv"
"strings"
"time"
"uuid"
@@ -416,6 +417,12 @@ func (s *AuthService) findOrCreateOidcUser(ctx context.Context, userInfo auth.Oi
created, err := s.createOidcUser(ctx, userInfo, tokenResp)
if err != nil {
+ // A concurrent login for the same subject may have created the
+ // account between our lookup and the insert; resolve to it
+ // instead of failing the login.
+ if existing, lookupErr := s.userService.GetUserByOidcSubjectId(ctx, userInfo.Subject); lookupErr == nil {
+ return s.updateExistingOidcUser(ctx, existing, userInfo, tokenResp)
+ }
return nil, false, err
}
return created, true, nil
@@ -477,11 +484,9 @@ func (s *AuthService) validateMergeEmailVerification(userInfo auth.OidcUserInfo)
}
func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) (*common.User, error) {
- var username string
- if userInfo.PreferredUsername == "" {
- username = generateUsernameFromEmail(userInfo.Email, userInfo.Subject)
- } else {
- username = userInfo.PreferredUsername
+ username, err := s.resolveOidcUsernameInternal(ctx, userInfo)
+ if err != nil {
+ return nil, err
}
var displayName *string
@@ -505,8 +510,22 @@ func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUser
s.persistOidcTokens(user, tokenResp)
- if _, err := s.userService.CreateUser(ctx, user); err != nil {
- return nil, err
+ // The username probe is not atomic with the insert: a concurrent
+ // first-time login can claim the candidate in between, failing the
+ // unique constraint. Probe again for a fresh candidate and retry.
+ var createErr error
+ for attempt := range 3 {
+ if attempt > 0 {
+ if user.Username, err = s.resolveOidcUsernameInternal(ctx, userInfo); err != nil {
+ return nil, err
+ }
+ }
+ if _, createErr = s.userService.CreateUser(ctx, user); createErr == nil {
+ break
+ }
+ }
+ if createErr != nil {
+ return nil, createErr
}
if err := s.syncOidcRoleAssignments(ctx, user, userInfo, tokenResp); err != nil {
slog.WarnContext(ctx, "failed to sync OIDC role assignments on user create", "error", err, "user_id", user.ID)
@@ -514,6 +533,39 @@ func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUser
return user, nil
}
+// resolveOidcUsernameInternal returns the preferred username for a new OIDC
+// user, or a currently unclaimed collision-free candidate when an existing
+// account already owns it.
+func (s *AuthService) resolveOidcUsernameInternal(ctx context.Context, userInfo auth.OidcUserInfo) (string, error) {
+ var username string
+ if userInfo.PreferredUsername == "" {
+ username = generateUsernameFromEmail(userInfo.Email, userInfo.Subject)
+ } else {
+ username = userInfo.PreferredUsername
+ }
+
+ if _, lookupErr := s.userService.GetUserByUsername(ctx, username); errors.Is(lookupErr, common.ErrUserNotFound) {
+ return username, nil
+ } else if lookupErr != nil {
+ return "", lookupErr
+ }
+
+ base := uniqueOidcUsernameInternal(username, userInfo.Subject)
+ unique := base
+ for i := 2; ; i++ {
+ _, candidateErr := s.userService.GetUserByUsername(ctx, unique)
+ if errors.Is(candidateErr, common.ErrUserNotFound) {
+ slog.InfoContext(ctx, "OIDC username already taken by an existing account; assigning a unique username instead",
+ "username", username, "unique_username", unique, "subject", userInfo.Subject)
+ return unique, nil
+ }
+ if candidateErr != nil {
+ return "", candidateErr
+ }
+ unique = base + "_" + strconv.Itoa(i)
+ }
+}
+
func (s *AuthService) updateOidcUser(ctx context.Context, user *common.User, userInfo auth.OidcUserInfo, tokenResp *auth.OidcTokenResponse) error {
if userInfo.Name != "" && user.DisplayName == nil {
user.DisplayName = new(userInfo.Name)
@@ -1056,6 +1108,17 @@ func generateUsernameFromEmail(email, subject string) string {
return "user_" + subject
}
+// uniqueOidcUsernameInternal derives a collision-free username candidate by
+// suffixing the tail of the OIDC subject, mirroring generateUsernameFromEmail's
+// fallback format.
+func uniqueOidcUsernameInternal(base, subject string) string {
+ suffix := subject
+ if len(suffix) > 8 {
+ suffix = suffix[len(suffix)-8:]
+ }
+ return base + "_" + suffix
+}
+
func (s *AuthService) runInBackground(ctx context.Context, name string, fn func(ctx context.Context) error) {
// Detach context to prevent cancellation when the parent request finishes
bgCtx := context.WithoutCancel(ctx)
diff --git a/backend/internal/auth/service_test.go b/backend/internal/auth/service_test.go
index 839ed5731..bbcf2064e 100644
--- a/backend/internal/auth/service_test.go
+++ b/backend/internal/auth/service_test.go
@@ -316,6 +316,18 @@ func TestGenerateUsernameFromEmail(t *testing.T) {
}
+func TestUniqueOidcUsernameInternal(t *testing.T) {
+ u := uniqueOidcUsernameInternal("alice", "1234567890abcdef")
+
+ assert.Equal(t, "alice_90abcdef", u,
+ "suffixed username %q", u)
+
+ u2 := uniqueOidcUsernameInternal("alice", "short")
+
+ assert.Equal(t, "alice_short", u2,
+ "short subject username %q", u2)
+}
+
func TestPersistOidcTokens_SetsFields(t *testing.T) {
s := newTestAuthService("")
user := &common.User{}
diff --git a/backend/internal/oidc/handler.go b/backend/internal/oidc/handler.go
index e155a991f..5393cf96e 100644
--- a/backend/internal/oidc/handler.go
+++ b/backend/internal/oidc/handler.go
@@ -372,6 +372,7 @@ func (h *OidcHandler) HandleOidcCallback(ctx context.Context, input *HandleOidcC
meta := handlerutil.SessionMetaFromContext(ctx, input.UserAgent)
userModel, isNewUser, err := h.authService.PrepareOidcLogin(ctx, *userInfo, tokenResp)
if err != nil {
+ slog.ErrorContext(ctx, "OIDC login preparation failed", "error", err, "subject", userInfo.Subject)
return nil, huma.Error500InternalServerError("Authentication failed")
}
@@ -474,6 +475,7 @@ func (h *OidcHandler) ExchangeDeviceToken(ctx context.Context, input *ExchangeDe
meta := handlerutil.SessionMetaFromContext(ctx, input.UserAgent)
userModel, isNewUser, err := h.authService.PrepareOidcLogin(ctx, *userInfo, tokenResp)
if err != nil {
+ slog.ErrorContext(ctx, "OIDC login preparation failed", "error", err, "subject", userInfo.Subject)
return nil, huma.Error500InternalServerError("Authentication failed")
}
// The device flow has no way to satisfy a WebAuthn assertion: the CLI has no
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 1f2cb89cb..c10b55c47 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -2187,6 +2187,7 @@
"oidc_provider_logo_url_label": "Provider Logo URL",
"oidc_provider_logo_url_placeholder": "https://example.com/logo.png",
"oidc_provider_logo_url_description": "Custom logo image URL to replace the default OIDC icon on the login button",
+ "oidc_synced_role_assignments": "Synced from OIDC mappings and refreshed on every login.",
"prune_confirm_system_title": "Confirm System Prune",
"prune_confirm_description": "Select the resources you want to prune. This action permanently removes unused data and cannot be undone.",
"prune_stopped_containers": "Stopped Containers",
@@ -2940,7 +2941,6 @@
"users_role_assignments_description": "Pick the role this user holds on each environment. Add a Global assignment for org-wide permissions.",
"users_role_assignments_required": "Pick at least one role assignment",
"users_role_assignments_add": "Add assignment",
- "users_role_assignments_oidc_managed": "Role assignments for this user are managed by OIDC group mappings. Manual changes will be overwritten on next login.",
"users_role_assignments_oidc_link": "Manage OIDC mappings",
"users_role_summary_none": "No access",
"users_role_summary_env_count": "Assigned on {count} environments",
diff --git a/frontend/src/lib/components/sheets/user-form-sheet.svelte b/frontend/src/lib/components/sheets/user-form-sheet.svelte
index b372d3275..009af9fca 100644
--- a/frontend/src/lib/components/sheets/user-form-sheet.svelte
+++ b/frontend/src/lib/components/sheets/user-form-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '#lib/components/ui/responsive-dialog/index.js';
- import * as Alert from '#lib/components/ui/alert/index.js';
+ import { Badge } from '#lib/components/ui/badge';
import SheetFooterActions from '#lib/components/sheets/sheet-footer-actions.svelte';
import FormInput from '#lib/components/form/form-input.svelte';
import RoleAssignmentsEditor from '#lib/components/forms/role-assignments-editor.svelte';
@@ -46,8 +46,7 @@
let canEditUsername = $derived(!isEditMode || allowUsernameEdit);
let isOidcUser = $derived(!!userToEdit?.oidcSubjectId);
- let hasOidcAssignments = $derived(!!userToEdit?.roleAssignments?.some((a) => a.source === 'oidc'));
- let assignmentsDisabled = $derived(isOidcUser && hasOidcAssignments);
+ let oidcAssignments = $derived(userToEdit?.roleAssignments?.filter((a) => a.source === 'oidc') ?? []);
const formSchema = z.object({
username: z
@@ -68,7 +67,9 @@
environmentId: z.string().optional()
})
)
- .min(1, m.users_role_assignments_required())
+ // OIDC users may get all their roles from OIDC mappings, so zero
+ // manual assignments is valid for them.
+ .refine((assignments) => isOidcUser || assignments.length >= 1, m.users_role_assignments_required())
});
let formData = $derived({
@@ -182,20 +183,24 @@
<div>
<label for="roleAssignments" class="text-sm font-medium">{m.users_role_assignments_label()}</label>
<p class="mb-2 text-xs text-muted-foreground">{m.users_role_assignments_description()}</p>
- {#if assignmentsDisabled}
- <Alert.Root variant="default" class="mb-3">
- <Alert.Description>
- {m.users_role_assignments_oidc_managed()}
- <a href="/settings/authentication" class="ml-2 text-primary underline">{m.users_role_assignments_oidc_link()}</a>
- </Alert.Description>
- </Alert.Root>
+ {#if oidcAssignments.length > 0}
+ <div class="mb-3">
+ <p class="text-xs text-muted-foreground">
+ {m.oidc_synced_role_assignments()}
+ <a href="/settings/authentication" class="ml-1 text-primary underline">{m.users_role_assignments_oidc_link()}</a>
+ </p>
+ <div class="mt-2 flex flex-wrap gap-2">
+ {#each oidcAssignments as assignment (`${assignment.roleId}-${assignment.environmentId ?? 'global'}`)}
+ <Badge variant="outline">
+ {roles.find((r) => r.id === assignment.roleId)?.name ?? assignment.roleId}
+ ·
+ {environments.find((e) => e.id === assignment.environmentId)?.name ?? m.global_org_wide()}
+ </Badge>
+ {/each}
+ </div>
+ </div>
{/if}
- <RoleAssignmentsEditor
- bind:assignments={$inputs.roleAssignments.value}
- {roles}
- {environments}
- disabled={assignmentsDisabled}
- />
+ <RoleAssignmentsEditor bind:assignments={$inputs.roleAssignments.value} {roles} {environments} />
{#if $inputs.roleAssignments.error}
<p class="mt-1 text-xs text-destructive">{$inputs.roleAssignments.error}</p>
{/if}
diff --git a/frontend/src/routes/(app)/settings/users/+page.svelte b/frontend/src/routes/(app)/settings/users/+page.svelte
index 7d77a534f..02e01647b 100644
--- a/frontend/src/routes/(app)/settings/users/+page.svelte
+++ b/frontend/src/routes/(app)/settings/users/+page.svelte
@@ -38,10 +38,14 @@
// still update profile fields but must not call the assignments endpoint.
const isAdmin = $derived(userStore.isGlobalAdmin());
- // availableRoleAssignments for the edit form — strip the source field, the
- // editor only needs (roleId, environmentId) tuples.
+ // availableRoleAssignments for the edit form — manual assignments only,
+ // stripped to (roleId, environmentId) tuples. OIDC-sourced assignments must
+ // not round-trip: PUT /users/{id}/role-assignments replaces source='manual'
+ // rows, so resubmitting oidc rows would duplicate them as manual.
const editingAssignments = $derived(
- userToEdit?.roleAssignments?.map((a) => ({ roleId: a.roleId, environmentId: a.environmentId })) ?? []
+ userToEdit?.roleAssignments
+ ?.filter((a) => a.source !== 'oidc')
+ .map((a) => ({ roleId: a.roleId, environmentId: a.environmentId })) ?? []
);
let isLoading = $state({
@@ -81,6 +85,24 @@
// Split: profile fields go to PUT /users/{id}; role assignments
// go to PUT /users/{id}/role-assignments (separate endpoint).
const { roleAssignments, ...profile } = user;
+
+ // OIDC users submit role assignments only — skip the empty profile PUT.
+ if (Object.keys(profile).length === 0 && isAdmin && roleAssignments) {
+ const assignmentsResult = await tryCatch(roleService.setUserAssignments(userId, { assignments: roleAssignments }));
+ handleApiResultWithCallbacks({
+ result: assignmentsResult,
+ message: m.common_update_failed({ resource: `${m.resource_user()} "${safeUsername}"` }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async () => {
+ toast.success(m.common_update_success({ resource: `${m.resource_user()} "${safeUsername}"` }));
+ users = await userService.getUsers(requestOptions);
+ isDialogOpen.edit = false;
+ userToEdit = null;
+ }
+ });
+ return;
+ }
+
const result = await tryCatch(userService.update(userId, profile));
handleApiResultWithCallbacks({
result,
diff --git a/frontend/src/routes/(app)/settings/users/user-table.svelte b/frontend/src/routes/(app)/settings/users/user-table.svelte
index 10026c53a..970b96cb0 100644
--- a/frontend/src/routes/(app)/settings/users/user-table.svelte
+++ b/frontend/src/routes/(app)/settings/users/user-table.svelte
@@ -275,16 +275,14 @@
{#snippet RowActions({ item }: { item: User })}
<RowActionsMenu>
- {#if !item.oidcSubjectId}
- <IfPermitted perm="users:update">
- <DropdownMenu.Item onclick={() => onEditUser(item)}>
- <EditIcon class="size-4" />
- {m.common_edit()}
- </DropdownMenu.Item>
-
- <DropdownMenu.Separator />
- </IfPermitted>
- {/if}
+ <IfPermitted perm="users:update">
+ <DropdownMenu.Item onclick={() => onEditUser(item)}>
+ <EditIcon class="size-4" />
+ {m.common_edit()}
+ </DropdownMenu.Item>
+
+ <DropdownMenu.Separator />
+ </IfPermitted>
<IfPermitted perm="users:delete">
<DropdownMenu.Item