Commit b03632bc authored by samz406's avatar samz406 Committed by qiaozhanwei
Browse files

User update not check params (#1619) 

* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* User update  not check params

* user phone update when noteEmpty
parent 2a0dab14

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java

+45 −4
Original line number Diff line number Diff line
@@ -221,9 +221,13 @@ public class UsersService extends BaseService { 
            return result;

        }



        Date now = new Date();



        if (StringUtils.isNotEmpty(userName)) {



            if (!CheckUtils.checkUserName(userName)){

                putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,userName);

                return result;

            }



            User tempUser = userMapper.queryByUserNameAccurately(userName);

            if (tempUser != null && tempUser.getId() != userId) {

                putMsg(result, Status.USER_NAME_EXIST);
@@ -233,14 +237,30 @@ public class UsersService extends BaseService { 
        }



        if (StringUtils.isNotEmpty(userPassword)) {

            if (!CheckUtils.checkPassword(userPassword)){

                putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,userPassword);

                return result;

            }

            user.setUserPassword(EncryptionUtils.getMd5(userPassword));

        }



        if (StringUtils.isNotEmpty(email)) {

            if (!CheckUtils.checkEmail(email)){

                putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,email);

                return result;

            }

            user.setEmail(email);

        }

        user.setQueue(queue);



        if (StringUtils.isNotEmpty(phone)) {

            if (!CheckUtils.checkPhone(phone)){

                putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);

                return result;

            }

            user.setPhone(phone);

        }

        user.setQueue(queue);

        Date now = new Date();

        user.setUpdateTime(now);



        //if user switches the tenant, the user's resources need to be copied to the new tenant
@@ -318,10 +338,15 @@ public class UsersService extends BaseService { 
        Map<String, Object> result = new HashMap<>(5);

        //only admin can operate

        if (!isAdmin(loginUser)) {

            putMsg(result, Status.USER_NO_OPERATION_PERM, id);

            return result;

        }

        //check exist

        User tempUser = userMapper.selectById(id);

        if (tempUser == null) {

            putMsg(result, Status.USER_NOT_EXIST, id);

            return result;

        }



        // delete user

        User user = userMapper.queryTenantCodeByUserId(id);
@@ -357,6 +382,12 @@ public class UsersService extends BaseService { 
            return result;

        }



        //check exist

        User tempUser = userMapper.selectById(userId);

        if (tempUser == null) {

            putMsg(result, Status.USER_NOT_EXIST, userId);

            return result;

        }

        //if the selected projectIds are empty, delete all items associated with the user

        projectUserMapper.deleteProjectRelation(0, userId);
@@ -443,6 +474,11 @@ public class UsersService extends BaseService { 
        if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {

            return result;

        }

        User user = userMapper.selectById(userId);

        if(user == null){

            putMsg(result, Status.USER_NOT_EXIST, userId);

            return result;

        }



        udfUserMapper.deleteByUserId(userId);
@@ -485,6 +521,11 @@ public class UsersService extends BaseService { 
        if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {

            return result;

        }

        User user = userMapper.selectById(userId);

        if(user == null){

            putMsg(result, Status.USER_NOT_EXIST, userId);

            return result;

        }



        datasourceUserMapper.deleteByUserId(userId);