mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2026-11-18 16:50:30 +00:00
fix(system): 多租户模式下用户、部门、用户组相关接口租户隔离,URL 参数 tenantId 须属于当前用户
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
9c64365c3f
commit
e195fb2061
@ -2,6 +2,7 @@ package org.jeecg.common.util;
|
|||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.api.CommonAPI;
|
import org.jeecg.common.api.CommonAPI;
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
import org.jeecg.common.constant.CacheConstant;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
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.exception.JeecgBoot401Exception;
|
||||||
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
|
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
@ -69,9 +71,40 @@ public class TokenUtils {
|
|||||||
if (oConvertUtils.isNotEmpty(tenantId) && "undefined".equals(tenantId)) {
|
if (oConvertUtils.isNotEmpty(tenantId) && "undefined".equals(tenantId)) {
|
||||||
return null;
|
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;
|
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)
|
* 获取 request 里传递的 lowAppId (低代码应用ID)
|
||||||
*
|
*
|
||||||
|
|||||||
@ -17,6 +17,7 @@ import org.jeecg.common.system.util.JwtUtil;
|
|||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.util.ImportExcelUtil;
|
import org.jeecg.common.util.ImportExcelUtil;
|
||||||
import org.jeecg.common.util.RedisUtil;
|
import org.jeecg.common.util.RedisUtil;
|
||||||
|
import org.jeecg.common.util.TokenUtils;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.system.entity.SysDepart;
|
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.ISysDepartService;
|
||||||
import org.jeecg.modules.system.service.ISysUserDepartService;
|
import org.jeecg.modules.system.service.ISysUserDepartService;
|
||||||
import org.jeecg.modules.system.service.ISysUserService;
|
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.SysChangeDepartVo;
|
||||||
import org.jeecg.modules.system.vo.SysDepartExportVo;
|
import org.jeecg.modules.system.vo.SysDepartExportVo;
|
||||||
import org.jeecg.modules.system.vo.SysPositionSelectTreeVo;
|
import org.jeecg.modules.system.vo.SysPositionSelectTreeVo;
|
||||||
@ -72,6 +74,8 @@ public class SysDepartController {
|
|||||||
private ISysUserDepartService sysUserDepartService;
|
private ISysUserDepartService sysUserDepartService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private RedisUtil redisUtil;
|
private RedisUtil redisUtil;
|
||||||
|
@Autowired
|
||||||
|
private ISysUserTenantService userTenantService;
|
||||||
/**
|
/**
|
||||||
* 查询数据 查出我的部门,并以树结构数据格式响应给前端
|
* 查询数据 查出我的部门,并以树结构数据格式响应给前端
|
||||||
*
|
*
|
||||||
@ -542,7 +546,7 @@ public class SysDepartController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/queryTreeByKeyWord", method = RequestMethod.GET)
|
@RequestMapping(value = "/queryTreeByKeyWord", method = RequestMethod.GET)
|
||||||
public Result<Map<String,Object>> queryTreeByKeyWord(@RequestParam(name = "keyWord", required = false) String keyWord) {
|
public Result<Map<String,Object>> queryTreeByKeyWord(@RequestParam(name = "keyWord", required = false) String keyWord, HttpServletRequest request) {
|
||||||
Result<Map<String,Object>> result = new Result<>();
|
Result<Map<String,Object>> result = new Result<>();
|
||||||
try {
|
try {
|
||||||
Map<String,Object> map=new HashMap(5);
|
Map<String,Object> map=new HashMap(5);
|
||||||
@ -551,6 +555,17 @@ public class SysDepartController {
|
|||||||
LambdaQueryWrapper<SysUser> queryUser = new LambdaQueryWrapper<SysUser>();
|
LambdaQueryWrapper<SysUser> queryUser = new LambdaQueryWrapper<SysUser>();
|
||||||
queryUser.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0);
|
queryUser.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0);
|
||||||
queryUser.and(i -> i.like(SysUser::getUsername, keyWord).or().like(SysUser::getRealname, keyWord));
|
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<String> 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<SysUser> sysUsers = this.sysUserService.list(queryUser);
|
List<SysUser> sysUsers = this.sysUserService.list(queryUser);
|
||||||
map.put("userList",sysUsers);
|
map.put("userList",sysUsers);
|
||||||
map.put("departList",list);
|
map.put("departList",list);
|
||||||
|
|||||||
@ -13,6 +13,9 @@ import org.jeecg.common.api.vo.Result;
|
|||||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
import org.jeecg.common.system.base.controller.JeecgController;
|
import org.jeecg.common.system.base.controller.JeecgController;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
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.entity.SysUgroup;
|
||||||
import org.jeecg.modules.system.service.ISysUgroupService;
|
import org.jeecg.modules.system.service.ISysUgroupService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -55,6 +58,11 @@ public class SysUgroupController extends JeecgController<SysUgroup, ISysUgroupSe
|
|||||||
|
|
||||||
|
|
||||||
QueryWrapper<SysUgroup> queryWrapper = QueryGenerator.initQueryWrapper(sysUgroup, req.getParameterMap());
|
QueryWrapper<SysUgroup> 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<SysUgroup> page = new Page<SysUgroup>(pageNo, pageSize);
|
Page<SysUgroup> page = new Page<SysUgroup>(pageNo, pageSize);
|
||||||
IPage<SysUgroup> pageList = sysUgroupService.page(page, queryWrapper);
|
IPage<SysUgroup> pageList = sysUgroupService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
@ -137,11 +145,16 @@ public class SysUgroupController extends JeecgController<SysUgroup, ISysUgroupSe
|
|||||||
//@AutoLog(value = "用户组表-通过id查询")
|
//@AutoLog(value = "用户组表-通过id查询")
|
||||||
@Operation(summary="用户组表-通过id查询")
|
@Operation(summary="用户组表-通过id查询")
|
||||||
@GetMapping(value = "/queryById")
|
@GetMapping(value = "/queryById")
|
||||||
public Result<SysUgroup> queryById(@RequestParam(name="id",required=true) String id) {
|
public Result<SysUgroup> queryById(@RequestParam(name="id",required=true) String id, HttpServletRequest req) {
|
||||||
SysUgroup sysUgroup = sysUgroupService.getById(id);
|
SysUgroup sysUgroup = sysUgroupService.getById(id);
|
||||||
if(sysUgroup==null) {
|
if(sysUgroup==null) {
|
||||||
return Result.error("未找到对应数据");
|
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);
|
return Result.OK(sysUgroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1036,8 +1036,17 @@ public class SysUserController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/getUserDetailByUserId")
|
@GetMapping("/getUserDetailByUserId")
|
||||||
public Result<SysUserSysDepPostModel> getUserDetailByUserId(@RequestParam(name = "userId") String userId) {
|
public Result<SysUserSysDepPostModel> getUserDetailByUserId(@RequestParam(name = "userId") String userId, HttpServletRequest request) {
|
||||||
Result<SysUserSysDepPostModel> result = new Result<SysUserSysDepPostModel>();
|
Result<SysUserSysDepPostModel> result = new Result<SysUserSysDepPostModel>();
|
||||||
|
//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 {
|
try {
|
||||||
SysUserSysDepPostModel sysDepPostModel = sysUserService.getUserDetailByUserId(userId);
|
SysUserSysDepPostModel sysDepPostModel = sysUserService.getUserDetailByUserId(userId);
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
@ -1682,6 +1691,12 @@ public class SysUserController {
|
|||||||
@GetMapping("/appQueryByDepartId")
|
@GetMapping("/appQueryByDepartId")
|
||||||
public Result<List<SysUser>> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) {
|
public Result<List<SysUser>> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) {
|
||||||
Result<List<SysUser>> result = new Result<List<SysUser>>();
|
Result<List<SysUser>> result = new Result<List<SysUser>>();
|
||||||
|
//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<String> list=new ArrayList<String> ();
|
List<String> list=new ArrayList<String> ();
|
||||||
list.add(departId);
|
list.add(departId);
|
||||||
List<SysUser> childrenUser = sysUserService.queryByDepIds(list,null);
|
List<SysUser> childrenUser = sysUserService.queryByDepIds(list,null);
|
||||||
@ -1721,6 +1736,11 @@ public class SysUserController {
|
|||||||
if (oConvertUtils.listIsNotEmpty(userIds)) {
|
if (oConvertUtils.listIsNotEmpty(userIds)) {
|
||||||
queryWrapper.in(SysUser::getId, 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<SysUser> page = new Page<>(pageNo, pageSize);
|
Page<SysUser> page = new Page<>(pageNo, pageSize);
|
||||||
|
|||||||
@ -213,6 +213,11 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
|
|||||||
if(null!=userIdList && userIdList.size()>0){
|
if(null!=userIdList && userIdList.size()>0){
|
||||||
query.in(SysUser::getId,userIdList);
|
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);
|
pageList = sysUserMapper.selectPage(page, query);
|
||||||
@ -432,9 +437,17 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
|
|||||||
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
|
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
|
||||||
String tenantId = oConvertUtils.getString(TenantContext.getTenant(), "0");
|
String tenantId = oConvertUtils.getString(TenantContext.getTenant(), "0");
|
||||||
List<String> userIdsList = userTenantMapper.getUserIdsByTenantId(Integer.valueOf(tenantId));
|
List<String> userIdsList = userTenantMapper.getUserIdsByTenantId(Integer.valueOf(tenantId));
|
||||||
if (null != userIdsList && !userIdsList.isEmpty()) {
|
//update-begin---author:scott ---date:20261014 for:传入的用户id与本租户用户取交集(原为并集,可查到其他租户用户);租户下查不到用户时返回空-----------
|
||||||
userIdList.addAll(userIdsList);
|
List<String> 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);
|
return sysUserMapper.getDepPostListByIdUserName(page,userIdList,userId,userName,userNameList);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user