Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2

Revert "BAEL-3275: Using blocking queue for pub-sub"

spring-ldap/src/main/java/com/baeldung/ldap/client/LdapClient.java

@@ -0,0 +1,83 @@
+package com.baeldung.ldap.client;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.ldap.core.*;
+import org.springframework.ldap.support.LdapNameBuilder;
+
+import javax.naming.Name;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.List;
+
+public class LdapClient {
+
+    @Autowired
+    private Environment env;
+
+    @Autowired
+    private ContextSource contextSource;
+
+    @Autowired
+    private LdapTemplate ldapTemplate;
+
+    public void authenticate(final String username, final String password) {
+        contextSource.getContext("cn=" + username + ",ou=users," + env.getRequiredProperty("ldap.partitionSuffix"), password);
+    }
+
+    public List<String> search(final String username) {
+        return ldapTemplate.search(
+          "ou=users",
+          "cn=" + username,
+          (AttributesMapper<String>) attrs -> (String) attrs
+          .get("cn")
+          .get());
+    }
+
+    public void create(final String username, final String password) {
+        Name dn = LdapNameBuilder
+          .newInstance()
+          .add("ou", "users")
+          .add("cn", username)
+          .build();
+        DirContextAdapter context = new DirContextAdapter(dn);
+
+        context.setAttributeValues("objectclass", new String[] { "top", "person", "organizationalPerson", "inetOrgPerson" });
+        context.setAttributeValue("cn", username);
+        context.setAttributeValue("sn", username);
+        context.setAttributeValue("userPassword", digestSHA(password));
+
+        ldapTemplate.bind(context);
+    }
+
+    public void modify(final String username, final String password) {
+        Name dn = LdapNameBuilder
+          .newInstance()
+          .add("ou", "users")
+          .add("cn", username)
+          .build();
+        DirContextOperations context = ldapTemplate.lookupContext(dn);
+
+        context.setAttributeValues("objectclass", new String[] { "top", "person", "organizationalPerson", "inetOrgPerson" });
+        context.setAttributeValue("cn", username);
+        context.setAttributeValue("sn", username);
+        context.setAttributeValue("userPassword", digestSHA(password));
+
+        ldapTemplate.modifyAttributes(context);
+    }
+
+    private String digestSHA(final String password) {
+        String base64;
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA");
+            digest.update(password.getBytes());
+            base64 = Base64
+              .getEncoder()
+              .encodeToString(digest.digest());
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+        return "{SHA}" + base64;
+    }
+}

spring-ldap/src/main/java/com/baeldung/ldap/data/repository/User.java

@@ -0,0 +1,55 @@
+package com.baeldung.ldap.data.repository;
+
+import javax.naming.Name;
+
+import org.springframework.ldap.odm.annotations.Attribute;
+import org.springframework.ldap.odm.annotations.Entry;
+import org.springframework.ldap.odm.annotations.Id;
+
+@Entry(base = "ou=users", objectClasses = { "person", "inetOrgPerson", "top" })
+public class User  {
+        
+    @Id
+    private Name id;
+    
+    private @Attribute(name = "cn") String username;
+    private @Attribute(name = "sn") String password;
+
+    public User() {
+    }
+
+    public User(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public Name getId() {
+        return id;
+    }
+
+    public void setId(Name id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String toString() {
+        return username;
+    }
+
+}

spring-ldap/src/main/java/com/baeldung/ldap/data/repository/UserRepository.java

@@ -0,0 +1,17 @@
+package com.baeldung.ldap.data.repository;
+
+import java.util.List;
+
+import org.springframework.data.ldap.repository.LdapRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends LdapRepository<User> {
+
+    User findByUsername(String username);
+
+    User findByUsernameAndPassword(String username, String password);
+
+    List<User> findByUsernameLikeIgnoreCase(String username);
+
+}

spring-ldap/src/main/java/com/baeldung/ldap/data/service/LdapClient.java

@@ -0,0 +1,87 @@
+package com.baeldung.ldap.data.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.ldap.core.AttributesMapper;
+import org.springframework.ldap.core.ContextSource;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.support.LdapNameBuilder;
+
+import javax.naming.Name;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.List;
+
+public class LdapClient {
+
+    @Autowired
+    private Environment env;
+
+    @Autowired
+    private ContextSource contextSource;
+
+    @Autowired
+    private LdapTemplate ldapTemplate;
+
+    public void authenticate(final String username, final String password) {
+        contextSource.getContext("cn=" + username + ",ou=users," + env.getRequiredProperty("ldap.partitionSuffix"), password);
+    }
+
+    public List<String> search(final String username) {
+        return ldapTemplate.search(
+          "ou=users",
+          "cn=" + username,
+          (AttributesMapper<String>) attrs -> (String) attrs
+            .get("cn")
+            .get());
+    }
+
+    public void create(final String username, final String password) {
+        Name dn = LdapNameBuilder
+          .newInstance()
+          .add("ou", "users")
+          .add("cn", username)
+          .build();
+        DirContextAdapter context = new DirContextAdapter(dn);
+
+        context.setAttributeValues("objectclass", new String[]{"top", "person", "organizationalPerson", "inetOrgPerson"});
+        context.setAttributeValue("cn", username);
+        context.setAttributeValue("sn", username);
+        context.setAttributeValue("userPassword", digestSHA(password));
+
+        ldapTemplate.bind(context);
+    }
+
+    public void modify(final String username, final String password) {
+        Name dn = LdapNameBuilder
+          .newInstance()
+          .add("ou", "users")
+          .add("cn", username)
+          .build();
+        DirContextOperations context = ldapTemplate.lookupContext(dn);
+
+        context.setAttributeValues("objectclass", new String[]{"top", "person", "organizationalPerson", "inetOrgPerson"});
+        context.setAttributeValue("cn", username);
+        context.setAttributeValue("sn", username);
+        context.setAttributeValue("userPassword", digestSHA(password));
+
+        ldapTemplate.modifyAttributes(context);
+    }
+
+    private String digestSHA(final String password) {
+        String base64;
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA");
+            digest.update(password.getBytes());
+            base64 = Base64
+              .getEncoder()
+              .encodeToString(digest.digest());
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+        return "{SHA}" + base64;
+    }
+}

spring-ldap/src/main/java/com/baeldung/ldap/data/service/UserService.java

@@ -0,0 +1,63 @@
+package com.baeldung.ldap.data.service;
+
+import com.baeldung.ldap.data.repository.User;
+import com.baeldung.ldap.data.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.stereotype.Service;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class UserService {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    public Boolean authenticate(final String username, final String password) {
+        User user = userRepository.findByUsernameAndPassword(username, password);
+        return user != null;
+    }
+
+    public List<String> search(final String username) {
+        List<User> userList = userRepository.findByUsernameLikeIgnoreCase(username);
+        if (userList == null) {
+            return Collections.emptyList();
+        }
+
+        return userList.stream()
+          .map(User::getUsername)
+          .collect(Collectors.toList());
+    }
+
+    public void create(final String username, final String password) {
+        User newUser = new User(username,digestSHA(password));
+        newUser.setId(LdapUtils.emptyLdapName());
+        userRepository.save(newUser);
+
+    }
+
+    public void modify(final String username, final String password) {
+        User user = userRepository.findByUsername(username);
+        user.setPassword(password);
+        userRepository.save(user);
+    }
+
+    private String digestSHA(final String password) {
+        String base64;
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA");
+            digest.update(password.getBytes());
+            base64 = Base64.getEncoder()
+                .encodeToString(digest.digest());
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+        return "{SHA}" + base64;
+    }
+}

spring-ldap/src/main/java/com/baeldung/ldap/javaconfig/AppConfig.java

@@ -0,0 +1,45 @@
+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.data.ldap.repository.config.EnableLdapRepositories;
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.core.support.LdapContextSource;
+
+@Configuration
+@PropertySource("classpath:application.properties")
+@ComponentScan(basePackages = {"com.baeldung.ldap.*"})
+@Profile("default")
+@EnableLdapRepositories(basePackages = "com.baeldung.ldap.**")
+public class AppConfig {
+
+    @Autowired
+    private Environment env;
+
+    @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-ldap/src/main/resources/application.properties

@@ -0,0 +1,6 @@
+ldap.partitionSuffix=dc=example,dc=com
+ldap.partition=example
+ldap.principal=uid=admin,ou=system
+ldap.password=secret
+ldap.port=18889
+ldap.url=ldap://localhost:18889

spring-ldap/src/main/resources/logback.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN"/>
+    <logger name="org.springframework.transaction" level="WARN"/>
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN"/>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>