diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java index 47217d743..3d0cd9489 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java @@ -2,6 +2,7 @@ package org.jeecg.common.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.CommonAPI; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; @@ -10,6 +11,7 @@ import org.jeecg.common.desensitization.util.SensitiveInfoUtil; import org.jeecg.common.exception.JeecgBoot401Exception; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import jakarta.servlet.http.HttpServletRequest; @@ -69,9 +71,40 @@ public class TokenUtils { if (oConvertUtils.isNotEmpty(tenantId) && "undefined".equals(tenantId)) { return null; } + //update-begin---author:scott ---date:20261015 for:URL参数tenantId未经登录校验,多租户模式下须属于当前登录用户,否则忽略参数改用请求头(请求头已由ShiroRealm校验),防止传参冒充其他租户----------- + if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && oConvertUtils.isNotEmpty(tenantId)) { + String headerTenantId = oConvertUtils.getString(request.getHeader(CommonConstant.TENANT_ID)); + if (!tenantId.equals(headerTenantId) && !"0".equals(tenantId) && !isLoginUserTenant(tenantId)) { + log.warn("请求参数租户ID不属于当前登录用户,已忽略参数,使用请求头租户ID。参数租户:{},请求头租户:{},请求:{}", tenantId, headerTenantId, request.getRequestURI()); + return oConvertUtils.isNotEmpty(headerTenantId) && !"undefined".equals(headerTenantId) ? headerTenantId : null; + } + } + //update-end---author:scott ---date:20261015 for:URL参数tenantId未经登录校验,多租户模式下须属于当前登录用户,否则忽略参数改用请求头(请求头已由ShiroRealm校验),防止传参冒充其他租户----------- return tenantId; } + //update-begin---author:scott ---date:20261015 for:校验租户是否属于当前登录用户----------- + /** + * 租户是否属于当前登录用户(未登录时返回true,保持原逻辑,由各接口自身鉴权) + * + * @param tenantId 租户ID + * @return + */ + private static boolean isLoginUserTenant(String tenantId) { + LoginUser loginUser; + try { + loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + } catch (Exception e) { + return true; + } + if (loginUser == null) { + return true; + } + String relTenantIds = loginUser.getRelTenantIds(); + return oConvertUtils.isNotEmpty(relTenantIds) && oConvertUtils.isIn(tenantId, relTenantIds.split(",")); + } + //update-end---author:scott ---date:20261015 for:校验租户是否属于当前登录用户----------- + /** * 获取 request 里传递的 lowAppId (低代码应用ID) * diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index bf103370b..fd1e240e3 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -17,6 +17,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.RedisUtil; +import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.system.entity.SysDepart; @@ -27,6 +28,7 @@ import org.jeecg.modules.system.model.SysDepartTreeModel; import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysUserDepartService; import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.service.ISysUserTenantService; import org.jeecg.modules.system.vo.SysChangeDepartVo; import org.jeecg.modules.system.vo.SysDepartExportVo; import org.jeecg.modules.system.vo.SysPositionSelectTreeVo; @@ -72,6 +74,8 @@ public class SysDepartController { private ISysUserDepartService sysUserDepartService; @Autowired private RedisUtil redisUtil; + @Autowired + private ISysUserTenantService userTenantService; /** * 查询数据 查出我的部门,并以树结构数据格式响应给前端 * @@ -542,7 +546,7 @@ public class SysDepartController { * @return */ @RequestMapping(value = "/queryTreeByKeyWord", method = RequestMethod.GET) - public Result> queryTreeByKeyWord(@RequestParam(name = "keyWord", required = false) String keyWord) { + public Result> queryTreeByKeyWord(@RequestParam(name = "keyWord", required = false) String keyWord, HttpServletRequest request) { Result> result = new Result<>(); try { Map map=new HashMap(5); @@ -551,6 +555,17 @@ public class SysDepartController { LambdaQueryWrapper queryUser = new LambdaQueryWrapper(); queryUser.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0); queryUser.and(i -> i.like(SysUser::getUsername, keyWord).or().like(SysUser::getRealname, keyWord)); + //update-begin---author:scott ---date:20261014 for:多租户模式下只查当前租户的用户,防止按关键字跨租户搜索用户信息----------- + if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { + Integer tenantId = oConvertUtils.getInt(TokenUtils.getTenantIdByRequest(request), 0); + List userIds = userTenantService.getUserIdsByTenantId(tenantId); + if (oConvertUtils.listIsNotEmpty(userIds)) { + queryUser.in(SysUser::getId, userIds); + } else { + queryUser.eq(SysUser::getId, "通过租户查询不到任何用户"); + } + } + //update-end---author:scott ---date:20261014 for:多租户模式下只查当前租户的用户,防止按关键字跨租户搜索用户信息----------- List sysUsers = this.sysUserService.list(queryUser); map.put("userList",sysUsers); map.put("departList",list); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUgroupController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUgroupController.java index c06e62048..e29bd2dc1 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUgroupController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUgroupController.java @@ -13,6 +13,9 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.TokenUtils; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.system.entity.SysUgroup; import org.jeecg.modules.system.service.ISysUgroupService; import org.springframework.beans.factory.annotation.Autowired; @@ -55,6 +58,11 @@ public class SysUgroupController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(sysUgroup, req.getParameterMap()); + //update-begin---author:scott ---date:20261014 for:多租户模式下只查当前租户的用户组,防止跨租户读取----------- + if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { + queryWrapper.eq("tenant_id", oConvertUtils.getInt(TokenUtils.getTenantIdByRequest(req), 0)); + } + //update-end---author:scott ---date:20261014 for:多租户模式下只查当前租户的用户组,防止跨租户读取----------- Page page = new Page(pageNo, pageSize); IPage pageList = sysUgroupService.page(page, queryWrapper); return Result.OK(pageList); @@ -137,11 +145,16 @@ public class SysUgroupController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { + public Result queryById(@RequestParam(name="id",required=true) String id, HttpServletRequest req) { SysUgroup sysUgroup = sysUgroupService.getById(id); if(sysUgroup==null) { return Result.error("未找到对应数据"); } + //update-begin---author:scott ---date:20261014 for:多租户模式下只能查看当前租户的用户组,防止按id跨租户读取----------- + if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && !java.util.Objects.equals(oConvertUtils.getInt(TokenUtils.getTenantIdByRequest(req), 0), sysUgroup.getTenantId())) { + return Result.error("未找到对应数据"); + } + //update-end---author:scott ---date:20261014 for:多租户模式下只能查看当前租户的用户组,防止按id跨租户读取----------- return Result.OK(sysUgroup); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 48c076d6a..75974e18a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1036,8 +1036,17 @@ public class SysUserController { * @return */ @GetMapping("/getUserDetailByUserId") - public Result getUserDetailByUserId(@RequestParam(name = "userId") String userId) { + public Result getUserDetailByUserId(@RequestParam(name = "userId") String userId, HttpServletRequest request) { Result result = new Result(); + //update-begin---author:scott ---date:20261014 for:多租户模式下只能查看当前租户的用户详情,防止按userId跨租户读取用户信息----------- + if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { + Integer tenantId = oConvertUtils.getInt(TokenUtils.getTenantIdByRequest(request), 0); + Integer count = userTenantService.userTenantIzExist(userId, tenantId); + if (count == null || count == 0) { + return Result.error("未找到对应用户"); + } + } + //update-end---author:scott ---date:20261014 for:多租户模式下只能查看当前租户的用户详情,防止按userId跨租户读取用户信息----------- try { SysUserSysDepPostModel sysDepPostModel = sysUserService.getUserDetailByUserId(userId); result.setSuccess(true); @@ -1682,6 +1691,12 @@ public class SysUserController { @GetMapping("/appQueryByDepartId") public Result> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) { Result> result = new Result>(); + //update-begin---author:scott ---date:20261014 for:多租户模式下部门须属于当前租户(sys_depart已做租户隔离,查不到即非本租户),防止跨租户读取用户信息----------- + if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && (oConvertUtils.isEmpty(departId) || sysDepartService.getById(departId) == null)) { + result.setResult(new ArrayList<>()); + return result; + } + //update-end---author:scott ---date:20261014 for:多租户模式下部门须属于当前租户(sys_depart已做租户隔离,查不到即非本租户),防止跨租户读取用户信息----------- List list=new ArrayList (); list.add(departId); List childrenUser = sysUserService.queryByDepIds(list,null); @@ -1721,6 +1736,11 @@ public class SysUserController { if (oConvertUtils.listIsNotEmpty(userIds)) { queryWrapper.in(SysUser::getId, userIds); } + //update-begin---author:scott ---date:20261014 for:租户下查不到用户时不再放开过滤,防止跨租户读取用户信息----------- + else { + queryWrapper.eq(SysUser::getId, "通过租户查询不到任何用户"); + } + //update-end---author:scott ---date:20261014 for:租户下查不到用户时不再放开过滤,防止跨租户读取用户信息----------- } //------------------------------------------------------------------------------------------------ Page page = new Page<>(pageNo, pageSize); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java index 2cae84652..6bd85a0aa 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java @@ -213,6 +213,11 @@ public class SysUserDepartServiceImpl extends ServiceImpl0){ query.in(SysUser::getId,userIdList); } + //update-begin---author:scott ---date:20261014 for:租户下查不到用户时不再放开过滤,防止跨租户读取用户信息----------- + else { + query.eq(SysUser::getId, "通过租户ID查不到用户"); + } + //update-end---author:scott ---date:20261014 for:租户下查不到用户时不再放开过滤,防止跨租户读取用户信息----------- } //------------------------------------------------------------------------------------------------ pageList = sysUserMapper.selectPage(page, query); @@ -432,9 +437,17 @@ public class SysUserDepartServiceImpl extends ServiceImpl userIdsList = userTenantMapper.getUserIdsByTenantId(Integer.valueOf(tenantId)); - if (null != userIdsList && !userIdsList.isEmpty()) { - userIdList.addAll(userIdsList); + //update-begin---author:scott ---date:20261014 for:传入的用户id与本租户用户取交集(原为并集,可查到其他租户用户);租户下查不到用户时返回空----------- + List tenantUserIds = null != userIdsList ? userIdsList : new ArrayList<>(); + if (userIdList.isEmpty()) { + userIdList.addAll(tenantUserIds); + } else { + userIdList.retainAll(tenantUserIds); } + if (userIdList.isEmpty()) { + userIdList.add("通过租户ID查不到用户"); + } + //update-end---author:scott ---date:20261014 for:传入的用户id与本租户用户取交集(原为并集,可查到其他租户用户);租户下查不到用户时返回空----------- } //------------------------------------------------------------------------------------------------ return sysUserMapper.getDepPostListByIdUserName(page,userIdList,userId,userName,userNameList);