修复两处存在SQL注入漏洞问题

RuoYi

2021-05-27 c24cd14fd700b2846623d0c3e9683adb30c7062b

 src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -66,6 +66,7 @@
    @Before("dataScopePointCut()")

    public void doBefore(JoinPoint point) throws Throwable

    {

        clearDataScope(point);

        handleDataScope(point);

    }



@@ -79,11 +80,11 @@
        }

        // 获取当前的用户

        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

        SysUser currentUser = loginUser.getUser();

        if (currentUser != null)

        if (StringUtils.isNotNull(loginUser))

        {

            SysUser currentUser = loginUser.getUser();

            // 如果是超级管理员，则不过滤数据

            if (!currentUser.isAdmin())

            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())

            {

                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),

                        controllerDataScope.userAlias());

@@ -142,8 +143,12 @@


        if (StringUtils.isNotBlank(sqlString.toString()))

        {

            BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];

            baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");

            Object params = joinPoint.getArgs()[0];

            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)

            {

                BaseEntity baseEntity = (BaseEntity) params;

                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");

            }

        }

    }



@@ -162,4 +167,17 @@
        }

        return null;

    }



    /**

     * 拼接权限sql前先清空params.dataScope参数防止注入

     */

    private void clearDataScope(final JoinPoint joinPoint)

    {

        Object params = joinPoint.getArgs()[0];

        if (StringUtils.isNotNull(params) && params instanceof BaseEntity)

        {

            BaseEntity baseEntity = (BaseEntity) params;

            baseEntity.getParams().put(DATA_SCOPE, "");

        }

    }

}