Skip to content

fix(ldap): load full user fields on login so teams are not wiped #28121

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

Open
joaopamaral wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ldap): load full user fields on login so teams are not wiped #28121

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
12 changes: 10 additions & 2 deletions ...adata-service/src/main/java/org/openmetadata/service/security/auth/LdapAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,16 @@ private User checkAndCreateUser(String userDn, String email, String userName) th

// Check if the user exists in OM Database
try {
User omUser =
userRepository.getByEmail(null, email, userRepository.getFields("id,name,email,roles"));
// Load the same field set the PUT path uses (USER_UPDATE_FIELDS): roles, teams,
// profile, authenticationMechanism, isEmailVerified, personas, defaultPersona,
// domains, personaPreferences. UserUpdater.entitySpecificUpdate runs updateTeams /
// updatePersonas / etc. unconditionally; with a sparse fetch those fields arrive
// null and the updater wipes the corresponding relationships, which destroys the
// user's manually-assigned teams on every LDAP login and makes login slow (deleteTo
// does work proportional to the user's existing team count). Use getPutFields()
// (narrow) rather than getFieldsWithUserAuth("*") (wide) so we don't eagerly load
// the heavy owns/follows relationship sets on every login.
User omUser = userRepository.getByEmail(null, email, userRepository.getPutFields());
getRoleForLdap(userDn, omUser, Boolean.TRUE);
finalUser = omUser;
} catch (EntityNotFoundException ex) {
Expand Down
Loading