Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: allow logging in with email address (#3555)
Kyle Mendell905f8517441b
diff --git a/backend/internal/auth/service.go b/backend/internal/auth/service.goindex 3283ce8af..f108d4b98 100644--- a/backend/internal/auth/service.go+++ b/backend/internal/auth/service.go@@ -252,11 +252,30 @@ func (s *AuthService) AuthenticateLocalPrimary(ctx context.Context, username, pa}user, err := s.userService.GetUserByUsername(ctx, username)- if err != nil {- if strings.Contains(err.Error(), "user not found") {+ if err != nil && !errors.Is(err, common.ErrUserNotFound) {+ return nil, err+ }+ // When the identifier looks like an email, resolve the email identity too:+ // a collision between one account's username and a different account's+ // email is rejected instead of silently validating against whichever+ // account the username lookup happened to return.+ if strings.Contains(username, "@") {+ emailUser, emailErr := s.userService.GetUserByEmail(ctx, username)+ switch {+ case errors.Is(emailErr, common.ErrAmbiguousUserEmail):+ slog.WarnContext(ctx, "Rejecting email login: multiple accounts share this email", "email", username)+ return nil, ErrInvalidCredentials+ case emailErr != nil && !errors.Is(emailErr, common.ErrUserNotFound):+ return nil, emailErr+ case emailErr == nil && user != nil && emailUser.ID != user.ID:+ slog.WarnContext(ctx, "Rejecting login: identifier matches one account's username and a different account's email", "identifier", username)return nil, ErrInvalidCredentials+ case emailErr == nil && user == nil:+ user = emailUser}- return nil, err+ }+ if user == nil {+ return nil, ErrInvalidCredentials}if err := s.userService.ValidatePassword(user.PasswordHash, password); err != nil {return nil, ErrInvalidCredentialsdiff --git a/backend/internal/auth/service_test.go b/backend/internal/auth/service_test.goindex 04670a5d3..f40a4209c 100644--- a/backend/internal/auth/service_test.go+++ b/backend/internal/auth/service_test.go@@ -29,6 +29,11 @@ func setupAuthServiceTestDB(t *testing.T) *database.DB {t.Helper()db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})require.NoError(t, err)+ // Each pooled connection to a ":memory:" DSN gets its own empty database;+ // keep a single connection so every query sees the migrated schema.+ sqlDB, err := db.DB()+ require.NoError(t, err)+ sqlDB.SetMaxOpenConns(1)require.NoError(t, db.AutoMigrate(&models.SettingVariable{},&models.User{},@@ -847,3 +852,54 @@ func TestFindOrCreateOidcUser_MergeEnabled_EmailVerificationMissing_WithExistingrequire.NotNil(t, fetched.OidcSubjectId)require.Equal(t, userInfo.Subject, *fetched.OidcSubjectId)}++func TestAuthenticateLocalPrimary_EmailFallback(t *testing.T) {+ db := setupAuthServiceTestDB(t)+ userSvc := user.NewUserService(db)+ settingsSvc, err := newSettingsServiceForAuthTestInternal(t, context.Background(), db)+ require.NoError(t, err)+ s := newTestAuthService("")+ s.userService = userSvc+ s.settingsService = settingsSvc++ hash, err := userSvc.HashPassword("hunter22!")+ require.NoError(t, err)+ dupHash, err := userSvc.HashPassword("dup-two-pass!")+ require.NoError(t, err)+ for _, u := range []*models.User{+ {BaseModel: models.BaseModel{ID: "u-email-login"}, Username: "bob", Email: new("[email protected]"), PasswordHash: hash},+ {BaseModel: models.BaseModel{ID: "u-dup-1"}, Username: "dup1", Email: new("[email protected]"), PasswordHash: hash},+ {BaseModel: models.BaseModel{ID: "u-dup-2"}, Username: "dup2", Email: new("[email protected]"), PasswordHash: dupHash},+ {BaseModel: models.BaseModel{ID: "u-carol"}, Username: "[email protected]", Email: new("[email protected]"), PasswordHash: hash},+ {BaseModel: models.BaseModel{ID: "u-col-a"}, Username: "[email protected]", PasswordHash: hash},+ {BaseModel: models.BaseModel{ID: "u-col-b"}, Username: "colb", Email: new("[email protected]"), PasswordHash: dupHash},+ } {+ _, err = userSvc.CreateUser(context.Background(), u)+ require.NoError(t, err)+ }++ tests := []struct {+ name string+ login string+ password string+ wantID string+ wantErr error+ }{+ {name: "email resolves user", login: "[email protected]", password: "hunter22!", wantID: "u-email-login"},+ {name: "unknown email", login: "[email protected]", password: "hunter22!", wantErr: ErrInvalidCredentials},+ {name: "duplicate email rejected", login: "[email protected]", password: "dup-two-pass!", wantErr: ErrInvalidCredentials},+ {name: "username equal to own email", login: "[email protected]", password: "hunter22!", wantID: "u-carol"},+ {name: "username-email collision rejected", login: "[email protected]", password: "dup-two-pass!", wantErr: ErrInvalidCredentials},+ }+ for _, tc := range tests {+ t.Run(tc.name, func(t *testing.T) {+ got, err := s.AuthenticateLocalPrimary(context.Background(), tc.login, tc.password)+ if tc.wantErr != nil {+ require.ErrorIs(t, err, tc.wantErr)+ return+ }+ require.NoError(t, err)+ require.Equal(t, tc.wantID, got.ID)+ })+ }+}diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.goindex 2f37236c1..4da5be656 100644--- a/backend/internal/common/errors.go+++ b/backend/internal/common/errors.go@@ -59,6 +59,7 @@ var (ErrExpiredToken = errors.Sentinel("token expired")ErrTokenVersionMismatch = errors.Sentinel("token version mismatch")ErrUserNotFound = errors.Sentinel("user not found")+ ErrAmbiguousUserEmail = Classify(ErrConflict, errors.Sentinel("multiple accounts share this email"))ErrTokenValidation = Classify(ErrUnauthorized, errors.Sentinel("Invalid token claims"))ErrSessionRevoked = Classify(ErrUnauthorized, errors.Sentinel("Session has been revoked"))ErrUpgradeInProgress = Classify(ErrConflict, errors.Sentinel("an upgrade is already in progress"))diff --git a/backend/internal/user/service.go b/backend/internal/user/service.goindex c1c58101b..09a772923 100644--- a/backend/internal/user/service.go+++ b/backend/internal/user/service.go@@ -163,8 +163,22 @@ func (s *UserService) GetUserByOidcSubjectId(ctx context.Context, subjectId strireturn dbutil.FirstWhere[models.User](ctx, s.db.DB, common.ErrUserNotFound, "oidc_subject_id = ?", subjectId)}+// GetUserByEmail returns the user with the given email. The schema does not+// enforce email uniqueness, so a lookup matching more than one account returns+// common.ErrAmbiguousUserEmail instead of arbitrarily selecting one.func (s *UserService) GetUserByEmail(ctx context.Context, email string) (*models.User, error) {- return dbutil.FirstWhere[models.User](ctx, s.db.DB, common.ErrUserNotFound, "email = ?", email)+ var users []models.User+ if err := s.db.DB.WithContext(ctx).Where("email = ?", email).Limit(2).Find(&users).Error; err != nil {+ return nil, errors.WrapIf(err, "failed to query users by email")+ }+ switch len(users) {+ case 0:+ return nil, common.ErrUserNotFound+ case 1:+ return &users[0], nil+ default:+ return nil, common.ErrAmbiguousUserEmail+ }}// ResolveUserPermissions returns the effective PermissionSet for the givendiff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 976a8daff..7d328ebe7 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1380,6 +1380,7 @@"user_example_com_placeholder": "[email protected]","users_email_description": "Email address for the user","users_username_description": "Unique username for the user",+ "users_username_no_at": "Username cannot contain @","events_title": "Event Log","events_subtitle": "Monitor events that have taken place in Arcane.","events_total": "Total Events",diff --git a/frontend/src/lib/components/sheets/user-form-sheet.svelte b/frontend/src/lib/components/sheets/user-form-sheet.svelteindex 65023c229..b372d3275 100644--- a/frontend/src/lib/components/sheets/user-form-sheet.svelte+++ b/frontend/src/lib/components/sheets/user-form-sheet.svelte@@ -50,7 +50,11 @@let assignmentsDisabled = $derived(isOidcUser && hasOidcAssignments);const formSchema = z.object({- username: z.string().min(1, m.common_username_required()),+ username: z+ .string()+ .min(1, m.common_username_required())+ // Legacy usernames may contain @; only new or changed usernames are restricted+ .refine((value) => value === userToEdit?.username || !value.includes('@'), m.users_username_no_at()),password: z.string().optional(),displayName: z.string().optional(),email: z@@ -100,8 +104,9 @@userData.email = data.email;}- // Only include username if we're creating a new user or if editing is allowed- if (!isEditMode || canEditUsername) {+ // Only include username when creating, or when editing changed it — an+ // unchanged legacy username with @ would fail the backend pattern check+ if (!isEditMode || (canEditUsername && data.username !== userToEdit?.username)) {userData.username = data.username;}diff --git a/types/user/user.go b/types/user/user.goindex e841edc7a..6a1ebc06a 100644--- a/types/user/user.go+++ b/types/user/user.go@@ -31,7 +31,7 @@ type Preferences struct {// CreateUser represents the request body for creating a new user.// Role assignments are managed separately via PUT /users/{userId}/role-assignments.type CreateUser struct {- Username string `json:"username" minLength:"1" maxLength:"255" doc:"Username of the user" example:"johndoe"`+ Username string `json:"username" minLength:"1" maxLength:"255" pattern:"^[^@]+$" patternDescription:"username without an @ character" doc:"Username of the user; may not contain @" example:"johndoe"`Password string `json:"password" minLength:"8" doc:"Password of the user"`DisplayName *string `json:"displayName,omitempty" maxLength:"255" doc:"Display name of the user" example:"John Doe"`Email *string `json:"email,omitempty" doc:"Email address of the user" example:"[email protected]"`@@ -42,7 +42,7 @@ type CreateUser struct {// UpdateUser represents the request body for updating a user.// Role assignments are managed separately via PUT /users/{userId}/role-assignments.type UpdateUser struct {- Username *string `json:"username,omitempty" minLength:"1" maxLength:"255" doc:"Username of the user"`+ Username *string `json:"username,omitempty" minLength:"1" maxLength:"255" pattern:"^[^@]+$" patternDescription:"username without an @ character" doc:"Username of the user; may not contain @"`DisplayName *string `json:"displayName,omitempty" maxLength:"255" doc:"Display name of the user"`Email *string `json:"email,omitempty" doc:"Email address of the user"`Locale *string `json:"locale,omitempty" doc:"Locale preference of the user"`