From b8e4b342e4b12b2f808e4e8f8fa0d9c8cfe9d5dd Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Wed, 6 Aug 2014 21:07:42 +0200
Subject: [PATCH] Use DefaultSpringSecurityContextSource instead of
DirContextSource
---
src/main/java/de/thm/arsnova/config/SecurityConfig.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/config/SecurityConfig.java b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
index bcfc9430e..4f35843b4 100644
--- a/src/main/java/de/thm/arsnova/config/SecurityConfig.java
+++ b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
@@ -12,7 +12,7 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
-import org.springframework.ldap.core.support.DirContextSource;
+import org.springframework.ldap.core.support.LdapContextSource;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.cas.ServiceProperties;
@@ -28,6 +28,7 @@ import org.springframework.security.core.session.SessionRegistry;
import org.springframework.security.core.session.SessionRegistryImpl;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
import org.springframework.security.ldap.authentication.BindAuthenticator;
import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
import org.springframework.security.ldap.authentication.LdapAuthenticator;
@@ -194,8 +195,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Bean
public LdapAuthenticationProvider ldapAuthenticationProvider() {
- DirContextSource contextSource = new DirContextSource();
- contextSource.setUrl(ldapUrl);
+ LdapContextSource contextSource = new DefaultSpringSecurityContextSource(ldapUrl);
contextSource.setUserDn(ldapUserDn);
LdapAuthenticator authenticator = new BindAuthenticator(contextSource);
LdapAuthenticationProvider authProvider = new LdapAuthenticationProvider(authenticator, new NullLdapAuthoritiesPopulator());
--
GitLab