From c71becea68d67e8f26ca5e804fd9c5a2b03bd011 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 24 Mar 2026 09:28:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/MyDataPermissionHandlerTest.java | 383 ------------------ .../boot/config/TestDataPermissionMapper.java | 41 -- .../security/token/JwtTokenManagerTest.java | 7 +- 3 files changed, 4 insertions(+), 427 deletions(-) delete mode 100644 src/test/java/com/youlai/boot/config/MyDataPermissionHandlerTest.java delete mode 100644 src/test/java/com/youlai/boot/config/TestDataPermissionMapper.java diff --git a/src/test/java/com/youlai/boot/config/MyDataPermissionHandlerTest.java b/src/test/java/com/youlai/boot/config/MyDataPermissionHandlerTest.java deleted file mode 100644 index 503850f2..00000000 --- a/src/test/java/com/youlai/boot/config/MyDataPermissionHandlerTest.java +++ /dev/null @@ -1,383 +0,0 @@ -package com.youlai.boot.config; - -import com.youlai.boot.security.model.RoleDataScope; -import com.youlai.boot.security.model.SysUserDetails; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.operators.conditional.AndExpression; -import net.sf.jsqlparser.expression.operators.relational.EqualsTo; -import net.sf.jsqlparser.schema.Column; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * 数据权限处理器单元测试 - * - * @author Ray.Hao - */ -@DisplayName("数据权限处理器测试") -class MyDataPermissionHandlerTest { - - private MyDataPermissionHandler handler; - - @BeforeEach - void setUp() { - handler = new MyDataPermissionHandler(); - } - - @AfterEach - void tearDown() { - // 清理安全上下文 - SecurityContextHolder.clearContext(); - } - - // ==================== 边界条件测试 ==================== - - @Nested - @DisplayName("边界条件测试") - class BoundaryTests { - - @Test - @DisplayName("未登录用户 - 返回原始where条件") - void whenNotLoggedIn_thenReturnOriginalWhere() { - // given: 未设置安全上下文 - Expression where = new EqualsTo(new Column("status"), new net.sf.jsqlparser.expression.LongValue(1)); - - // when - Expression result = handler.getSqlSegment(where, "com.example.mapper.UserMapper.selectList"); - - // then: 返回原始where - assertThat(result).isSameAs(where); - } - - @Test - @DisplayName("超级管理员 - 跳过数据权限过滤") - void whenRootUser_thenReturnOriginalWhere() { - // given: 设置超级管理员 - setSecurityContext(1L, "admin", 1L, - Set.of(new SimpleGrantedAuthority("ROLE_ROOT")), - Collections.emptyList()); - - Expression where = new EqualsTo(new Column("status"), new net.sf.jsqlparser.expression.LongValue(1)); - - // when - Expression result = handler.getSqlSegment(where, "com.example.mapper.UserMapper.selectList"); - - // then: 返回原始where，不添加数据权限条件 - assertThat(result).isSameAs(where); - } - - @Test - @DisplayName("无数据权限列表 - 返回原始where条件") - void whenNoDataScopes_thenReturnOriginalWhere() { - // given: 普通用户但无数据权限 - setSecurityContext(100L, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_USER")), - Collections.emptyList()); - - Expression where = new EqualsTo(new Column("status"), new net.sf.jsqlparser.expression.LongValue(1)); - - // when - Expression result = handler.getSqlSegment(where, "com.example.mapper.UserMapper.selectList"); - - // then: 返回原始where - assertThat(result).isSameAs(where); - } - } - - // ==================== 单一角色数据权限测试 ==================== - - @Nested - @DisplayName("单一角色数据权限测试") - class SingleRoleTests { - - @Test - @DisplayName("全部数据权限(ALL) - 不添加过滤条件") - void whenAllDataScope_thenReturnOriginalWhere() { - // given: 角色拥有全部数据权限 - setSecurityContext(100L, "admin", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_ADMIN")), - List.of(RoleDataScope.all("ADMIN"))); - - Expression where = new EqualsTo(new Column("status"), new net.sf.jsqlparser.expression.LongValue(1)); - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 返回原始where - assertThat(result).isSameAs(where); - } - - @Test - @DisplayName("本部门数据权限(DEPT) - 添加dept_id = ?条件") - void whenDeptDataScope_thenAddDeptIdCondition() { - // given: 角色拥有本部门数据权限 - Long deptId = 10L; - setSecurityContext(100L, "manager", deptId, - Set.of(new SimpleGrantedAuthority("ROLE_MANAGER")), - List.of(RoleDataScope.dept("MANAGER"))); - - Expression where = null; - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 添加部门过滤条件 - assertThat(result).isNotNull(); - assertThat(result.toString()).contains("dept_id = " + deptId); - } - - @Test - @DisplayName("本人数据权限(SELF) - 添加create_by = ?条件") - void whenSelfDataScope_thenAddCreateByCondition() { - // given: 角色拥有本人数据权限 - Long userId = 100L; - setSecurityContext(userId, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_USER")), - List.of(RoleDataScope.self("USER"))); - - Expression where = null; - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 添加用户过滤条件 - assertThat(result).isNotNull(); - assertThat(result.toString()).contains("create_by = " + userId); - } - - @Test - @DisplayName("自定义部门数据权限(CUSTOM) - 添加dept_id IN (?)条件") - void whenCustomDataScope_thenAddDeptIdInCondition() { - // given: 角色拥有自定义部门数据权限 - List customDeptIds = Arrays.asList(10L, 20L, 30L); - setSecurityContext(100L, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_CUSTOM")), - List.of(RoleDataScope.custom("CUSTOM", customDeptIds))); - - Expression where = null; - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 添加自定义部门IN条件 - assertThat(result).isNotNull(); - String sql = result.toString(); - assertThat(sql).contains("dept_id IN"); - assertThat(sql).contains("10"); - assertThat(sql).contains("20"); - assertThat(sql).contains("30"); - } - - @Test - @DisplayName("自定义部门数据权限(空列表) - 添加1=0条件") - void whenCustomDataScopeWithEmptyList_thenAddFalseCondition() { - // given: 角色拥有自定义部门权限但列表为空 - setSecurityContext(100L, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_CUSTOM")), - List.of(RoleDataScope.custom("CUSTOM", Collections.emptyList()))); - - Expression where = null; - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 添加1=0条件（无权限） - assertThat(result).isNotNull(); - assertThat(result.toString()).contains("1 = 0"); - } - - @Test - @DisplayName("部门及子部门数据权限(DEPT_AND_SUB) - 添加子查询条件") - void whenDeptAndSubDataScope_thenAddSubQueryCondition() { - // given: 角色拥有部门及子部门数据权限 - Long deptId = 10L; - setSecurityContext(100L, "manager", deptId, - Set.of(new SimpleGrantedAuthority("ROLE_MANAGER")), - List.of(RoleDataScope.deptAndSub("MANAGER"))); - - Expression where = null; - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 添加子查询条件 - assertThat(result).isNotNull(); - String sql = result.toString(); - assertThat(sql).contains("dept_id IN"); - assertThat(sql).contains("SELECT"); - assertThat(sql).contains("sys_dept"); - assertThat(sql).contains("FIND_IN_SET"); - } - } - - // ==================== 多角色并集策略测试 ==================== - - @Nested - @DisplayName("多角色并集策略测试") - class MultiRoleTests { - - @Test - @DisplayName("多角色 - 任一角色为ALL时跳过过滤") - void whenAnyRoleIsAll_thenSkipFilter() { - // given: 用户有两个角色，其中一个是ALL - setSecurityContext(100L, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_ADMIN"), new SimpleGrantedAuthority("ROLE_USER")), - List.of( - RoleDataScope.all("ADMIN"), - RoleDataScope.self("USER") - )); - - Expression where = new EqualsTo(new Column("status"), new net.sf.jsqlparser.expression.LongValue(1)); - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 返回原始where，不添加过滤条件 - assertThat(result).isSameAs(where); - } - - @Test - @DisplayName("多角色 - DEPT和SELF权限合并为OR条件") - void whenDeptAndSelfRoles_thenMergeWithOr() { - // given: 用户有两个角色，分别拥有部门和本人权限 - Long deptId = 10L; - Long userId = 100L; - setSecurityContext(userId, "manager", deptId, - Set.of(new SimpleGrantedAuthority("ROLE_MANAGER"), new SimpleGrantedAuthority("ROLE_USER")), - List.of( - RoleDataScope.dept("MANAGER"), - RoleDataScope.self("USER") - )); - - Expression where = null; - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 生成OR连接的合并条件 - assertThat(result).isNotNull(); - String sql = result.toString(); - assertThat(sql).contains("OR"); - assertThat(sql).contains("dept_id = " + deptId); - assertThat(sql).contains("create_by = " + userId); - } - - @Test - @DisplayName("多角色 - 多个自定义部门权限合并") - void whenMultipleCustomRoles_thenMergeWithOr() { - // given: 用户有两个自定义部门权限的角色 - setSecurityContext(100L, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_A"), new SimpleGrantedAuthority("ROLE_B")), - List.of( - RoleDataScope.custom("A", Arrays.asList(10L, 20L)), - RoleDataScope.custom("B", Arrays.asList(30L, 40L)) - )); - - Expression where = null; - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 生成OR连接的IN条件 - assertThat(result).isNotNull(); - String sql = result.toString(); - assertThat(sql).contains("OR"); - assertThat(sql).contains("dept_id IN"); - } - - @Test - @DisplayName("已有where条件 - 新条件用AND连接") - void whenExistingWhere_thenAndWithNewCondition() { - // given - setSecurityContext(100L, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_USER")), - List.of(RoleDataScope.dept("USER"))); - - Expression where = new EqualsTo(new Column("status"), new net.sf.jsqlparser.expression.LongValue(1)); - - // when - Expression result = handler.getSqlSegment(where, - "com.youlai.boot.config.TestDataPermissionMapper.selectList"); - - // then: 结果应该包含原始where和数据权限条件 - assertThat(result).isInstanceOf(AndExpression.class); - String sql = result.toString(); - assertThat(sql).contains("status = 1"); - assertThat(sql).contains("dept_id = 10"); - } - } - - // ==================== 注解配置测试 ==================== - - @Nested - @DisplayName("注解配置测试") - class AnnotationTests { - - @Test - @DisplayName("无@DataPermission注解 - 返回原始where") - void whenNoAnnotation_thenReturnOriginalWhere() { - // given - setSecurityContext(100L, "user", 10L, - Set.of(new SimpleGrantedAuthority("ROLE_USER")), - List.of(RoleDataScope.dept("USER"))); - - Expression where = new EqualsTo(new Column("status"), new net.sf.jsqlparser.expression.LongValue(1)); - - // when: 调用无注解的mapper方法 - Expression result = handler.getSqlSegment(where, - "java.lang.Object.toString"); - - // then: 返回原始where - assertThat(result).isSameAs(where); - } - } - - // ==================== 辅助方法 ==================== - - /** - * 设置安全上下文 - * - * @param userId 用户ID - * @param username 用户名 - * @param deptId 部门ID - * @param authorities 权限集合 - * @param dataScopes 数据权限列表 - */ - private void setSecurityContext(Long userId, String username, Long deptId, - Set authorities, - List dataScopes) { - SysUserDetails userDetails = new SysUserDetails(); - userDetails.setUserId(userId); - userDetails.setUsername(username); - userDetails.setDeptId(deptId); - userDetails.setDataScopes(dataScopes); - userDetails.setAuthorities(authorities); - - UsernamePasswordAuthenticationToken authentication = - new UsernamePasswordAuthenticationToken(userDetails, null, authorities); - - SecurityContextHolder.getContext().setAuthentication(authentication); - } -} diff --git a/src/test/java/com/youlai/boot/config/TestDataPermissionMapper.java b/src/test/java/com/youlai/boot/config/TestDataPermissionMapper.java deleted file mode 100644 index 5bee480f..00000000 --- a/src/test/java/com/youlai/boot/config/TestDataPermissionMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.youlai.boot.config; - -import com.youlai.boot.common.annotation.DataPermission; - -import java.util.List; - -/** - * 数据权限测试 Mapper - *

- * 用于测试数据权限拦截器的SQL注入功能 - */ -public interface TestDataPermissionMapper { - - /** - * 查询列表（带数据权限过滤） - */ - @DataPermission - List selectList(); - - /** - * 查询列表（不带数据权限过滤） - */ - List selectListWithoutPermission(); - - /** - * 多表关联查询（指定别名） - */ - @DataPermission(deptAlias = "u", userAlias = "u") - List selectWithJoin(); - - /** - * 自定义列名查询（多表关联场景） - */ - @DataPermission( - deptAlias = "t", - deptIdColumnName = "dept_id", - userAlias = "t", - userIdColumnName = "create_by" - ) - List selectWithAlias(); -} diff --git a/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java b/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java index 5307f6c4..bea18781 100644 --- a/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java +++ b/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java @@ -1,9 +1,10 @@ package com.youlai.boot.security.token; import com.youlai.boot.config.property.SecurityProperties; -import com.youlai.boot.security.model.AuthenticationToken; -import com.youlai.boot.security.model.RoleDataScope; -import com.youlai.boot.security.model.SysUserDetails; +import com.youlai.boot.framework.security.model.AuthenticationToken; +import com.youlai.boot.framework.security.model.RoleDataScope; +import com.youlai.boot.framework.security.model.SysUserDetails; +import com.youlai.boot.framework.security.token.JwtTokenManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested;