Skip to content

[INLONG-12156][Manager] Add verification of operator permissions during the creation and modification of tenant roles #12157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fuweng11 wants to merge 2 commits into
base: master
Choose a base branch
from
+51 −6
Open

[INLONG-12156][Manager] Add verification of operator permissions during the creation and modification of tenant roles #12157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ac37d
[INLONG-12156][Manager] Add verification of operator permissions duri…
Jul 10, 2026
8b4d7bb
[INLONG-12156][Manager] Add verification of operator permissions duri…
Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 51 additions & 6 deletions ...r-service/src/main/java/org/apache/inlong/manager/service/user/TenantRoleServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ public int save(TenantRoleRequest request, String operator) {
Preconditions.expectNotBlank(request.getRoleCode(),
"Failed to save tenant user role, role code should not be blank");

checkTenantAdminPermission(operator, tenantName);

InlongTenantEntity tenant = tenantMapper.selectByName(tenantName);
Preconditions.expectNotNull(tenant, TENANT_NOT_EXIST, String.format(TENANT_NOT_EXIST.getMessage(), tenantName));

Expand All @@ -100,6 +102,12 @@ public boolean update(TenantRoleRequest request, String operator) {
Preconditions.expectNotNull(exist, ErrorCodeEnum.RECORD_NOT_FOUND,
String.format("tenant user role record not found by id=%s", request.getId()));

checkTenantAdminPermission(operator, exist.getTenant());
if (request.getTenant() != null && !request.getTenant().equals(exist.getTenant())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
"tenant of a tenant-role binding cannot be changed during update");
}

TenantUserRoleEntity entity = CommonBeanUtils.copyProperties(request, TenantUserRoleEntity::new);
entity.setModifier(operator);
int rowCount = tenantUserRoleEntityMapper.updateById(entity);
Expand All @@ -112,6 +120,31 @@ public boolean update(TenantRoleRequest request, String operator) {
return true;
}

private void checkTenantAdminPermission(String operator, String tenant) {
if (operator == null || tenant == null) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
"operator or tenant cannot be null when checking tenant admin permission");
}
// Inlong-level admins/services bypass per-tenant checks by design.
InlongRoleInfo inlongRole = inlongRoleService.getByUsername(operator);
if (inlongRole != null && inlongRole.getRoleCode() != null) {
String code = inlongRole.getRoleCode();
if (UserRoleCode.INLONG_ADMIN.equals(code) || UserRoleCode.INLONG_SERVICE.equals(code)) {
return;
}
}
TenantUserRoleEntity roleEntity =
tenantUserRoleEntityMapper.selectByUsernameAndTenant(operator, tenant);
if (roleEntity == null
|| Integer.valueOf(1).equals(roleEntity.getDisabled())
|| !UserRoleCode.TENANT_ADMIN.equals(roleEntity.getRoleCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
String.format(
"current user [%s] is not a TENANT_ADMIN of tenant [%s]",
operator, tenant));
}
}

@Override
public TenantRoleInfo get(int id) {
TenantUserRoleEntity entity = tenantUserRoleEntityMapper.selectById(id);
Expand Down Expand Up @@ -141,6 +174,10 @@ public List<String> listTenantByUsername(String username) {
public Boolean delete(Integer id) {
String operator = LoginUserUtils.getLoginUser().getName();
log.info("begin to delete inlong tenant role id={} by user={}", id, operator);
TenantUserRoleEntity exist = tenantUserRoleEntityMapper.selectById(id);
Preconditions.expectNotNull(exist, ErrorCodeEnum.RECORD_NOT_FOUND,
String.format("tenant user role record not found by id=%s", id));
checkTenantAdminPermission(operator, exist.getTenant());
int success = tenantUserRoleEntityMapper.deleteById(id);
Preconditions.expectTrue(success == 1, "delete tenant role failed");
log.info("success delete inlong tenant role id={} by user={}", id, operator);
Expand All @@ -149,12 +186,20 @@ public Boolean delete(Integer id) {

@Override
public Integer saveDefault(String username, String operator) {
// make default public tenant permission
TenantRoleRequest tenantRoleRequest = new TenantRoleRequest();
tenantRoleRequest.setTenant(DEFAULT_TENANT);
tenantRoleRequest.setRoleCode(UserRoleCode.TENANT_OPERATOR);
tenantRoleRequest.setUsername(username);
return this.save(tenantRoleRequest, operator);
Preconditions.expectNotBlank(username, "username should not be blank");
InlongTenantEntity tenant = tenantMapper.selectByName(DEFAULT_TENANT);
Preconditions.expectNotNull(tenant, TENANT_NOT_EXIST,
String.format(TENANT_NOT_EXIST.getMessage(), DEFAULT_TENANT));

TenantUserRoleEntity entity = new TenantUserRoleEntity();
entity.setUsername(username);
entity.setTenant(DEFAULT_TENANT);
entity.setRoleCode(UserRoleCode.TENANT_OPERATOR);
entity.setDisabled(0);
entity.setCreator(operator);
entity.setModifier(operator);
tenantUserRoleEntityMapper.insert(entity);
return entity.getId();
}

}
Loading