added new option to explicitly enable AD mode for LDAP auth

Erudika · Jan 28, 2021 · ea796be · ea796be
1 parent 65f51bc
commit ea796be
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/para-server/src/main/java/com/erudika/para/security/LDAPAuthenticationProvider.java b/para-server/src/main/java/com/erudika/para/security/LDAPAuthenticationProvider.java
@@ -47,12 +47,11 @@ public Authentication authenticate(Authentication authentication) {
 			Map<String, String> ldapSettings = auth.getLdapSettings();
 			if (!ldapSettings.isEmpty()) {
 				String adDomain = ldapSettings.get("security.ldap.active_directory_domain"); // set this to enable AD
+				String adEnabled = ldapSettings.get("security.ldap.ad_mode_enabled"); // set this to enable AD explicitly
 				String ldapServerURL = ldapSettings.get("security.ldap.server_url");
 				String searchFilter = ldapSettings.get("security.ldap.user_search_filter");
 				AbstractLdapAuthenticationProvider ldapProvider;
-				if (StringUtils.isBlank(adDomain)) {
-					ldapProvider = new LdapAuthenticationProvider(new LDAPAuthenticator(ldapSettings));
-				} else {
+				if ("true".equals(adEnabled) || !StringUtils.isBlank(adDomain)) {
 					// Fix for https://github.com/Erudika/scoold/issues/67
 					authentication = new LDAPAuthentication(StringUtils.substringBefore(auth.getName(), "@"), auth.getCredentials());
 					String rootDn = ldapSettings.get("security.ldap.base_dn");
@@ -63,6 +62,8 @@ public Authentication authenticate(Authentication authentication) {
 					if (!StringUtils.isBlank(searchFilter)) {
 						((ActiveDirectoryLdapAuthenticationProvider) ldapProvider).setSearchFilter(searchFilter);
 					}
+				} else {
+					ldapProvider = new LdapAuthenticationProvider(new LDAPAuthenticator(ldapSettings));
 				}
 				ldapProvider.setUserDetailsContextMapper(new InetOrgPersonContextMapper());
 				return ldapProvider.authenticate(authentication);