Skip to content

[FIX] Login Forbidden on servers that had LDAP enabled in the past #17579

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
May 8, 2020
Merged

[FIX] Login Forbidden on servers that had LDAP enabled in the past #17579

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
31 changes: 22 additions & 9 deletions app/ldap/server/loginHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,31 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
return result;
});

callbacks.add('beforeValidateLogin', (login) => {
if (!login.allowed) {
return login;
let LDAP_Enable;
settings.get('LDAP_Enable', (key, value) => {
if (LDAP_Enable === value) {
return;
}
LDAP_Enable = value;

if (login.type === 'ldap' || login.type === 'resume') {
return login;
if (!value) {
return callbacks.remove('beforeValidateLogin', 'validateLdapLoginFallback');
}

if (login.user.services && login.user.services.ldap && login.user.services.ldap.id) {
login.allowed = !!settings.get('LDAP_Login_Fallback');
}
callbacks.add('beforeValidateLogin', (login) => {
if (!login.allowed) {
return login;
}

return login;
// The fallback setting should only block password logins, so users that have other login services can continue using them
if (login.type !== 'password') {
return login;
}

if (login.user.services && login.user.services.ldap && login.user.services.ldap.id) {
login.allowed = !!settings.get('LDAP_Login_Fallback');
}

return login;
}, callbacks.priority.MEDIUM, 'validateLdapLoginFallback');
});