dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tenant admins filter for enforced 2FA

Browse Source
This commit is contained in:
VIacheslavKlimov 2025-10-03 11:18:56 +03:00
parent b71baed1d1
commit 19ef1e3577
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
View File

@ -556,6 +556,9 @@ public class UserServiceImpl extends AbstractCachedEntityService<UserCacheKey, U
public boolean matchesFilter(TenantId tenantId, SystemLevelUsersFilter filter, User user) { public boolean matchesFilter(TenantId tenantId, SystemLevelUsersFilter filter, User user) {
switch (filter.getType()) { switch (filter.getType()) {
case TENANT_ADMINISTRATORS -> { case TENANT_ADMINISTRATORS -> {
if (user.isSystemAdmin() || user.isCustomerUser()) {
return false;
}
TenantAdministratorsFilter tenantAdministratorsFilter = (TenantAdministratorsFilter) filter; TenantAdministratorsFilter tenantAdministratorsFilter = (TenantAdministratorsFilter) filter;
if (isNotEmpty(tenantAdministratorsFilter.getTenantsIds())) { if (isNotEmpty(tenantAdministratorsFilter.getTenantsIds())) {
return tenantAdministratorsFilter.getTenantsIds().contains(user.getTenantId().getId()); return tenantAdministratorsFilter.getTenantsIds().contains(user.getTenantId().getId());