diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysRoleEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysRoleEnum.java new file mode 100644 index 000000000..45919e5b0 --- /dev/null +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysRoleEnum.java @@ -0,0 +1,65 @@ +package org.jeecg.common.constant.enums; + +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.subject.Subject; + +/** + * 系统内置固定角色编码枚举(角色 role_code 固定不可改,代码里涉及这些角色的判断统一引用本枚举,禁止散落硬编码字符串) + * + * @author scott + * @since 2026-10-13 【安全】系统固定角色常量化:组织管理类接口放行 admin / 租户管理员 + */ +public enum SysRoleEnum { + + /** + * 系统超级管理员 + */ + ADMIN("admin", "超管角色"), + + /** + * 系统租户管理员(后台授予;SaaS多租户模式下注册用户默认不含此角色) + */ + TENANT_ADMIN("zuhuadmin", "租户管理员"); + + /** + * 角色编码(sys_role.role_code,固定不可改) + */ + private final String roleCode; + + /** + * 角色名称(仅说明用) + */ + private final String roleName; + + SysRoleEnum(String roleCode, String roleName) { + this.roleCode = roleCode; + this.roleName = roleName; + } + + public String getRoleCode() { + return roleCode; + } + + public String getRoleName() { + return roleName; + } + + /** + * 当前登录用户是否拥有任意一个指定的系统固定角色 + * + * @param roles 待判断的系统固定角色 + * @return 拥有其中任意一个返回true + */ + public static boolean hasAnyRole(SysRoleEnum... roles) { + if (roles == null || roles.length == 0) { + return false; + } + Subject subject = SecurityUtils.getSubject(); + for (SysRoleEnum role : roles) { + if (subject.hasRole(role.roleCode)) { + return true; + } + } + return false; + } +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java index 38e4fc72c..82b5819b4 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java @@ -14,6 +14,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.PermissionData; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.constant.enums.SysRoleEnum; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; @@ -785,6 +786,9 @@ public class SysTenantController { */ @PostMapping("/addTenantPackUser") public Result addTenantPackUser(@RequestBody SysTenantPackUser sysTenantPackUser){ + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】产品包成员管理须为admin或本租户管理员,防止越权把自己加入超管产品包----------- + assertTenantPackManager(String.valueOf(sysTenantPackUser.getTenantId())); + //update-end---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】产品包成员管理须为admin或本租户管理员,防止越权把自己加入超管产品包----------- sysTenantService.addBatchTenantPackUser(sysTenantPackUser); return Result.ok("操作成功!"); } @@ -796,6 +800,9 @@ public class SysTenantController { */ @PutMapping("/deleteTenantPackUser") public Result deleteTenantPackUser(@RequestBody SysTenantPackUser sysTenantPackUser){ + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】产品包成员管理须为admin或本租户管理员----------- + assertTenantPackManager(String.valueOf(sysTenantPackUser.getTenantId())); + //update-end---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】产品包成员管理须为admin或本租户管理员----------- sysTenantService.deleteTenantPackUser(sysTenantPackUser); return Result.ok("操作成功!"); } @@ -808,6 +815,9 @@ public class SysTenantController { */ @PutMapping("/updateApplyStatus") public Result updateApplyStatus(@RequestBody SysTenant sysTenant){ + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】修改产品包申请开关须为admin或本租户管理员----------- + assertTenantPackManager(String.valueOf(sysTenant.getId())); + //update-end---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】修改产品包申请开关须为admin或本租户管理员----------- SysTenant entity = this.sysTenantService.getById(sysTenant.getId()); if(entity==null){ return Result.error("租户不存在!"); @@ -847,6 +857,9 @@ public class SysTenantController { */ @PutMapping("/passApply") public Result passApply(@RequestBody SysTenantPackUser sysTenantPackUser){ + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】审批产品包申请须为admin或本租户管理员----------- + assertTenantPackManager(String.valueOf(sysTenantPackUser.getTenantId())); + //update-end---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】审批产品包申请须为admin或本租户管理员----------- sysTenantService.passApply(sysTenantPackUser); return Result.ok("操作成功!"); } @@ -858,10 +871,29 @@ public class SysTenantController { */ @PutMapping("/deleteApply") public Result deleteApply(@RequestBody SysTenantPackUser sysTenantPackUser){ + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】拒绝产品包申请须为admin或本租户管理员----------- + assertTenantPackManager(String.valueOf(sysTenantPackUser.getTenantId())); + //update-end---author:scott ---date:20261013 for:【安全 GHSA-g5c8-qx87-hqcf】拒绝产品包申请须为admin或本租户管理员----------- sysTenantService.deleteApply(sysTenantPackUser); return Result.ok(""); } + /** + * 校验当前用户能否管理指定租户的产品包成员(添加/删除/审批):admin放行,否则须为该租户的组织账户管理员或超级管理员。 + * + * @param tenantId 租户ID + * @author scott + * @since 2026-10-13 【安全 GHSA-g5c8-qx87-hqcf】防止低权限用户越权把自己加入租户超管产品包 + */ + private void assertTenantPackManager(String tenantId) { + // admin或系统租户管理员(zuhuadmin,后台授予)直接放行;SaaS注册用户默认不含这两个系统角色 + if (SysRoleEnum.hasAnyRole(SysRoleEnum.ADMIN, SysRoleEnum.TENANT_ADMIN)) { + return; + } + // 非该租户的组织账户管理员或超级管理员时抛出异常 + sysTenantPackService.izHaveManageUserAuth(tenantId); + } + /** * 查看是否已经申请过了超级管理员 * @return 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 e96906b3a..48c076d6a 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 @@ -20,6 +20,7 @@ import org.jeecg.common.base.BaseMap; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.constant.enums.SysRoleEnum; import org.jeecg.common.constant.PasswordConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.modules.redis.client.JeecgRedisClient; @@ -1971,7 +1972,7 @@ public class SysUserController { public Result batchEditUsers(@RequestBody JSONObject jsonObject) { //update-begin---author:scott ---date:20261013 for:【安全 GHSA-pjwf-2w2c-xc23/GHSA-4w9p-7gw3-q7v4】批量修改用户部门职位须为admin或当前租户管理员,且租户管理员只能修改本租户用户----------- // 敲敲云SaaS模式下所有用户默认拥有test角色权限,不能用权限码放行,只放行admin - if (!SecurityUtils.getSubject().hasRole("admin")) { + if (!SysRoleEnum.hasAnyRole(SysRoleEnum.ADMIN, SysRoleEnum.TENANT_ADMIN)) { String tenantId = TenantContext.getTenant(); if (oConvertUtils.isEmpty(tenantId)) { return Result.error("无权限执行此操作"); @@ -2039,7 +2040,7 @@ public class SysUserController { public Result changeDepartChargePerson(@RequestBody JSONObject json) { //update-begin---author:scott ---date:20261013 for:【安全 GHSA-9xxr-rh33-qr3f】设置部门负责人须为admin或当前租户管理员,且租户管理员只能设置本租户的部门和用户----------- // 敲敲云SaaS模式下所有用户默认拥有test角色权限(含system:depart:edit),不能用权限码放行,只放行admin - if (!SecurityUtils.getSubject().hasRole("admin")) { + if (!SysRoleEnum.hasAnyRole(SysRoleEnum.ADMIN, SysRoleEnum.TENANT_ADMIN)) { String tenantId = TenantContext.getTenant(); if (oConvertUtils.isEmpty(tenantId)) { return Result.error("无权限执行此操作");