JAVA-12732: move spring-ldap into spring-security-ldap

spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/client/LdapClientLiveTest.java

@@ -0,0 +1,62 @@
+package com.baeldung.ldap.client;
+
+import com.baeldung.ldap.javaconfig.TestConfig;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ldap.AuthenticationException;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ActiveProfiles("testlive")
+@ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class)
+public class LdapClientLiveTest {
+
+    private static final String USER2 = "TEST02";
+    private static final String USER3 = "TEST03";
+    private static final String USER4 = "TEST04";
+
+    private static final String USER2_PWD = "TEST02";
+    private static final String USER3_PWD = "TEST03";
+    private static final String USER4_PWD = "TEST04";
+
+    private static final String SEARCH_STRING = "TEST*";
+
+    @Autowired
+    private LdapClient ldapClient;
+
+    @Test
+    public void givenLdapClient_whenCorrectCredentials_thenSuccessfulLogin() {
+        ldapClient.authenticate(USER3, USER3_PWD);
+    }
+
+    @Test(expected = AuthenticationException.class)
+    public void givenLdapClient_whenIncorrectCredentials_thenFailedLogin() {
+        ldapClient.authenticate(USER3, USER2_PWD);
+    }
+
+    @Test
+    public void givenLdapClient_whenCorrectSearchFilter_thenEntriesReturned() {
+        List<String> users = ldapClient.search(SEARCH_STRING);
+        Assert.assertThat(users, Matchers.containsInAnyOrder(USER2, USER3));
+    }
+
+    @Test
+    public void givenLdapClientNotExists_whenDataProvided_thenNewUserCreated() {
+        ldapClient.create(USER4, USER4_PWD);
+        ldapClient.authenticate(USER4, USER4_PWD);
+    }
+
+    @Test
+    public void givenLdapClientExists_whenDataProvided_thenExistingUserModified() {
+        ldapClient.modify(USER2, USER3_PWD);
+        ldapClient.authenticate(USER2, USER3_PWD);
+    }
+}

spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/client/LdapDataRepositoryIntegrationTest.java

@@ -0,0 +1,67 @@
+package com.baeldung.ldap.client;
+
+import com.baeldung.ldap.data.service.UserService;
+import com.baeldung.ldap.javaconfig.TestConfig;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ActiveProfiles("testlive")
+@ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class)
+public class LdapDataRepositoryIntegrationTest {
+
+    private static final String USER2 = "TEST02";
+    private static final String USER3 = "TEST03";
+    private static final String USER4 = "TEST04";
+
+    private static final String USER2_PWD = "TEST02";
+    private static final String USER3_PWD = "TEST03";
+    private static final String USER4_PWD = "TEST04";
+
+    private static final String SEARCH_STRING = "TEST*";
+
+    @Autowired
+    private UserService userService;
+
+    @Test
+    public void givenLdapClient_whenCorrectCredentials_thenSuccessfulLogin() {
+        Boolean isValid = userService.authenticate(USER3, USER3_PWD);
+        assertEquals(true, isValid);
+    }
+
+    @Test
+    public void givenLdapClient_whenIncorrectCredentials_thenFailedLogin() {
+        Boolean isValid = userService.authenticate(USER3, USER2_PWD);
+        assertEquals(false, isValid);
+    }
+
+    @Test
+    public void givenLdapClient_whenCorrectSearchFilter_thenEntriesReturned() {
+        List<String> userList = userService.search(SEARCH_STRING);
+        assertThat(userList, Matchers.containsInAnyOrder(USER2, USER3));
+    }
+
+    @Test
+    public void givenLdapClientNotExists_whenDataProvided_thenNewUserCreated() {
+        userService.create(USER4, USER4_PWD);
+        userService.authenticate(USER4, USER4_PWD);
+    }
+
+    @Test
+    public void givenLdapClientExists_whenDataProvided_thenExistingUserModified() {
+        userService.modify(USER2, USER3_PWD);
+        userService.authenticate(USER2, USER3_PWD);
+    }
+
+}

spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/javaconfig/TestConfig.java

@@ -0,0 +1,60 @@
+package com.baeldung.ldap.javaconfig;
+
+import com.baeldung.ldap.client.LdapClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.data.ldap.repository.config.EnableLdapRepositories;
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.core.support.LdapContextSource;
+import org.springframework.ldap.test.TestContextSourceFactoryBean;
+
+@Configuration
+@PropertySource("classpath:test_application.properties")
+@ComponentScan(basePackages = {"com.baeldung.ldap.*"})
+@EnableLdapRepositories(basePackages = "com.baeldung.ldap.**")
+@Profile("testlive")
+public class TestConfig {
+    @Autowired
+    private Environment env;
+
+    @Autowired
+    private ResourceLoader resourceLoader;
+
+    @Bean
+    public TestContextSourceFactoryBean testContextSource() {
+        TestContextSourceFactoryBean contextSource = new TestContextSourceFactoryBean();
+        contextSource.setDefaultPartitionName(env.getRequiredProperty("ldap.partition"));
+        contextSource.setDefaultPartitionSuffix(env.getRequiredProperty("ldap.partitionSuffix"));
+        contextSource.setPrincipal(env.getRequiredProperty("ldap.principal"));
+        contextSource.setPassword(env.getRequiredProperty("ldap.password"));
+        contextSource.setLdifFile(resourceLoader.getResource(env.getRequiredProperty("ldap.ldiffile")));
+        contextSource.setPort(Integer.valueOf(env.getRequiredProperty("ldap.port")));
+        return contextSource;
+    }
+
+    @Bean
+    public LdapContextSource contextSource() {
+        LdapContextSource contextSource = new LdapContextSource();
+        contextSource.setUrl(env.getRequiredProperty("ldap.url"));
+        contextSource.setBase(env.getRequiredProperty("ldap.partitionSuffix"));
+        contextSource.setUserDn(env.getRequiredProperty("ldap.principal"));
+        contextSource.setPassword(env.getRequiredProperty("ldap.password"));
+        return contextSource;
+    }
+
+    @Bean
+    public LdapTemplate ldapTemplate() {
+        return new LdapTemplate(contextSource());
+    }
+
+    @Bean
+    public LdapClient ldapClient() {
+        return new LdapClient();
+    }
+}

spring-security-modules/spring-security-ldap/src/test/resources/test.ldif

@@ -0,0 +1,24 @@
+version: 1
+dn: ou=users,dc=example,dc=com
+objectClass: organizationalUnit
+objectClass: top
+ou: users
+
+dn: cn=TEST03,ou=users,dc=example,dc=com
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: TEST03
+sn: TEST03
+userPassword:: e1NIQX1JbktFOFY2enBpWWdMY0RYQTYzdXZVNjRGZXc9
+
+dn: cn=TEST02,ou=users,dc=example,dc=com
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: TEST02
+sn: TEST02
+userPassword:: e1NIQX1uZERKdWNNYnl5a3hWdEkyQzgyRUFlalN1WTQ9
+

spring-security-modules/spring-security-ldap/src/test/resources/test_application.properties

@@ -0,0 +1,7 @@
+ldap.partitionSuffix=dc=example,dc=com
+ldap.partition=example
+ldap.principal=uid=admin,ou=system
+ldap.password=secret
+ldap.ldiffile=classpath:/test.ldif
+ldap.port=18888
+ldap.url=ldap://localhost:18888