Skip to content

[FIX] Errors in LDAP avatar sync preventing login #18948

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
sampaiodiego merged 1 commit into from
Sep 18, 2020
Merged

[FIX] Errors in LDAP avatar sync preventing login #18948

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
62 changes: 35 additions & 27 deletions app/ldap/server/sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,40 @@ export function mapLDAPGroupsToChannels(ldap, ldapUser, user) {
return userChannels;
}

function syncUserAvatar(user, ldapUser) {
if (!user?._id || settings.get('LDAP_Sync_User_Avatar') !== true) {
return;
}

const avatarField = (settings.get('LDAP_Avatar_Field') || 'thumbnailPhoto').trim();
const avatar = ldapUser._raw[avatarField] || ldapUser._raw.thumbnailPhoto || ldapUser._raw.jpegPhoto;
if (!avatar) {
return;
}

logger.info('Syncing user avatar');

Meteor.defer(() => {
const rs = RocketChatFile.bufferToStream(avatar);
const fileStore = FileUpload.getStore('Avatars');
fileStore.deleteByName(user.username);

const file = {
userId: user._id,
type: 'image/jpeg',
};

Meteor.runAsUser(user._id, () => {
fileStore.insert(file, rs, (err, result) => {
Meteor.setTimeout(function() {
Users.setAvatarData(user._id, 'ldap', result.etag);
Notifications.notifyLogged('updateAvatar', { username: user.username, etag: result.etag });
}, 500);
});
});
});
}

export function syncUserData(user, ldapUser, ldap) {
logger.info('Syncing user data');
logger.debug('user', { email: user.email, _id: user._id });
Expand Down Expand Up @@ -397,33 +431,7 @@ export function syncUserData(user, ldapUser, ldap) {
}
}

const avatarField = (settings.get('LDAP_Avatar_Field') || 'thumbnailPhoto').trim();

if (user && user._id && settings.get('LDAP_Sync_User_Avatar') === true) {
const avatar = ldapUser._raw[avatarField] || ldapUser._raw.thumbnailPhoto || ldapUser._raw.jpegPhoto;

if (avatar) {
logger.info('Syncing user avatar');

const rs = RocketChatFile.bufferToStream(avatar);
const fileStore = FileUpload.getStore('Avatars');
fileStore.deleteByName(user.username);

const file = {
userId: user._id,
type: 'image/jpeg',
};

Meteor.runAsUser(user._id, () => {
fileStore.insert(file, rs, (err, result) => {
Meteor.setTimeout(function() {
Users.setAvatarData(user._id, 'ldap', result.etag);
Notifications.notifyLogged('updateAvatar', { username: user.username, etag: result.etag });
}, 500);
});
});
}
}
syncUserAvatar(user, ldapUser);
}

export function addLdapUser(ldapUser, username, password, ldap) {
Expand Down