Merge pull request #205 from Open-MBEE/release/4.0.11

Release/4.0.11
Open-MBEE · Oct 6, 2022 · 74245ae · 74245ae
2 parents a42ef79 + 3b4c6c5
commit 74245ae
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.0.10
+version=4.0.11
 group=org.openmbee.mms
 
 springBootVersion=2.6.7

diff --git a/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java b/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java
@@ -21,21 +21,33 @@
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
 import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.ldap.filter.*;
+import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.authentication.configurers.ldap.LdapAuthenticationProviderConfigurer;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.ldap.SpringSecurityLdapTemplate;
+import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
+import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;
 import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import javax.naming.Context;
+
 @Configuration
 @Conditional(LdapCondition.class)
 @EnableTransactionManagement
 public class LdapSecurityConfig {
 
     private static Logger logger = LoggerFactory.getLogger(LdapSecurityConfig.class);
 
+    @Value("${ldap.ad.enabled:false}")
+    private Boolean adEnabled;
+
+    @Value("${ldap.ad.domain:#{null}}")
+    private String adDomain;
+
     @Value("${ldap.provider.url:#{null}}")
     private String providerUrl;
 
@@ -75,6 +87,12 @@ public class LdapSecurityConfig {
     @Value("${ldap.group.search.filter:(uniqueMember={0})}")
     private String groupSearchFilter;
 
+    @Value("${ldap.user.search.base:#{''}}")
+    private String userSearchBase;
+
+    @Value("${ldap.user.search.filter:(uid={0})}")
+    private String userSearchFilter;
+
     private UserRepository userRepository;
     private GroupRepository groupRepository;
 
@@ -99,12 +117,21 @@ public void configureLdapAuth(AuthenticationManagerBuilder auth,
             We  redefine our own LdapAuthoritiesPopulator which need ContextSource().
             We need to delegate the creation of the contextSource out of the builder-configuration.
         */
-            String[] a = userDnPattern.toArray(new String[0]);
-            auth.ldapAuthentication().userDnPatterns(a).groupSearchBase(groupSearchBase)
-                .groupRoleAttribute(groupRoleAttribute).groupSearchFilter(groupSearchFilter)
-                .rolePrefix("")
-                .ldapAuthoritiesPopulator(ldapAuthoritiesPopulator)
-                .contextSource(contextSource);
+            if (adEnabled) {
+                auth.authenticationProvider(activeDirectoryLdapAuthenticationProvider());
+            } else {
+                String[] userPatterns = userDnPattern.toArray(new String[0]);
+                LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> authProviderConfigurer = auth.ldapAuthentication();
+                authProviderConfigurer.userDnPatterns(userPatterns);
+                authProviderConfigurer.userSearchBase(userSearchBase);
+                authProviderConfigurer.userSearchFilter(userSearchFilter);
+                authProviderConfigurer.groupSearchBase(groupSearchBase);
+                authProviderConfigurer.groupRoleAttribute(groupRoleAttribute);
+                authProviderConfigurer.groupSearchFilter(groupSearchFilter);
+                authProviderConfigurer.rolePrefix("");
+                authProviderConfigurer.ldapAuthoritiesPopulator(ldapAuthoritiesPopulator);
+                authProviderConfigurer.contextSource(contextSource);
+            }
         }
     }
 
@@ -202,6 +229,25 @@ public Collection<? extends GrantedAuthority> getGrantedAuthorities(
 
     }
 
+    @Bean
+    public AuthenticationProvider activeDirectoryLdapAuthenticationProvider() {
+        ActiveDirectoryLdapAuthenticationProvider provider = new ActiveDirectoryLdapAuthenticationProvider(adDomain, providerUrl, providerBase);
+
+        Hashtable<String, Object> env = new Hashtable<>();
+        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+        env.put(Context.PROVIDER_URL, providerUrl);
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, providerUserDn);
+        env.put(Context.SECURITY_CREDENTIALS, providerPassword);
+
+        provider.setContextEnvironmentProperties(env);
+
+        provider.setSearchFilter(userSearchFilter);
+        provider.setConvertSubErrorCodesToExceptions(true);
+        provider.setUseAuthenticationRequestCredentials(true);
+        return provider;
+    }
+
     @Bean
     public LdapContextSource contextSource() {
         LdapContextSource contextSource = new LdapContextSource();