fix: ldap user login

Author: xiaohuangdou666

server/src/main/java/datart/server/service/BaseCRUDService.java

@@ -120,7 +120,7 @@ default boolean unarchive(String id) {
         E instance = getEntityInstance();
         instance.setId(id);
         try {
-            Method setStatus = entity.getClass().getDeclaredMethod("setStatus", Byte.class);
+            Method setStatus = entity.getClass().getMethod("setStatus", Byte.class);
             setStatus.invoke(instance, Const.DATA_STATUS_ACTIVE);
             getDefaultMapper().updateByPrimaryKeySelective(instance);
         } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {

server/src/main/java/datart/server/service/impl/ExternalRegisterServiceImpl.java

@@ -20,6 +20,8 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.jayway.jsonpath.JsonPath;
+import datart.core.base.exception.Exceptions;
+import datart.core.base.exception.ParamException;
 import datart.core.entity.User;
 import datart.core.mappers.ext.UserMapperExt;
 import datart.security.base.PasswordToken;
@@ -28,9 +30,12 @@
 import datart.server.service.ExternalRegisterService;
 import datart.server.service.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.query.LdapQueryBuilder;
+import org.springframework.security.crypto.bcrypt.BCrypt;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
@@ -68,6 +73,15 @@ public String ldapRegister(String filter, String password) throws MessagingExcep
         } catch (Exception e) {
             return null;
         }
+
+        User user = userMapper.selectByNameOrEmail(filter);
+        if (user != null) {
+            PasswordToken passwordToken = new PasswordToken(user.getUsername(),
+                    user.getPassword(),
+                    System.currentTimeMillis());
+            return JwtUtils.toJwtString(passwordToken);
+        }
+
         String email = null;
 
         try {
@@ -76,9 +90,13 @@ public String ldapRegister(String filter, String password) throws MessagingExcep
         } catch (Exception ignored) {
         }
 
+        if (StringUtils.isBlank(email)) {
+            Exceptions.tr(ParamException.class, "error.param.empty", "resource.user.email");
+        }
+
         UserRegisterParam registerParam = new UserRegisterParam();
         registerParam.setUsername(filter);
-        registerParam.setPassword(password);
+        registerParam.setPassword(BCrypt.hashpw(RandomStringUtils.randomAscii(32), BCrypt.gensalt()));
         registerParam.setEmail(email);
 
         if (userService.register(registerParam, false)) {
@@ -109,7 +127,7 @@ public String oauth2Register(OAuth2AuthenticationToken oauthAuthToken) throws Me
 
         UserRegisterParam userRegisterParam = new UserRegisterParam();
         userRegisterParam.setUsername(oauthUser.getName());
-        userRegisterParam.setPassword(oauthUser.getName());
+        userRegisterParam.setPassword(BCrypt.hashpw(RandomStringUtils.randomAscii(32), BCrypt.gensalt()));
         if (emailMapping != null) {
             userRegisterParam.setEmail(JsonPath.read(jsonObj, emailMapping));
         }

server/src/main/java/datart/server/service/impl/UserServiceImpl.java

@@ -276,12 +276,38 @@ public boolean updateAvatar(String path) {
 
     @Override
     public String login(PasswordToken passwordToken) {
-        securityManager.login(passwordToken);
+        try {
+            securityManager.login(passwordToken);
+        } catch (Exception e) {
+            String tokenStr = ldapLogin(passwordToken);
+            if (StringUtils.isNotBlank(tokenStr)) {
+                return tokenStr;
+            }
+            log.error("Login error ({} {})", passwordToken.getSubject(), passwordToken.getPassword());
+            Exceptions.msg("login.fail");
+            return null;
+        }
         User user = userMapper.selectByNameOrEmail(passwordToken.getSubject());
         passwordToken.setPassword(user.getPassword());
         return JwtUtils.toJwtString(passwordToken);
     }
 
+    private String ldapLogin(PasswordToken passwordToken) {
+        String token = "";
+        try {
+            log.info("try to login with ldap ({}).", passwordToken.getSubject());
+            ExternalRegisterService externalRegisterService = Application.getBean(ExternalRegisterService.class);
+            token = externalRegisterService.ldapRegister(passwordToken.getSubject(), passwordToken.getPassword());
+            if (StringUtils.isNotBlank(token)) {
+                securityManager.login(token);
+            }
+        } catch (Exception e) {
+            Exceptions.e(e);
+        }
+        return token;
+    }
+
+
     @Override
     public String forgetPassword(UserIdentityType type, String principal) {
         User user = null;

server/src/main/resources/db/migration/V2022.03.14__1.0.0.beta.3.sql

@@ -49,6 +49,16 @@ ALTER TABLE `variable`
 ALTER TABLE `variable`
     ADD INDEX `source_id`(`source_id`) USING BTREE;
 
+DELETE FROM `source_schemas`
+WHERE id IN
+      (SELECT temp.id FROM (
+                            SELECT id FROM `source_schemas`
+                            WHERE source_id IN
+                                  (SELECT source_id FROM `source_schemas` GROUP BY source_id HAVING count(*) > 1)
+                              AND id NOT IN
+                                  (SELECT max(id) FROM `source_schemas` GROUP BY source_id HAVING count(*) > 1)
+                        ) temp );
+
 ALTER TABLE `source_schemas`
     ADD UNIQUE INDEX `source_id`(`source_id`) USING BTREE;