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

Add validation for DefaultEdgeRuleChain in DeviceProfile

Browse Source 
- reverted changes
This commit is contained in:
Yevhenii 2025-05-23 18:10:33 +03:00
parent ae4bdb52da
commit ed1639663f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
View File

@ -189,11 +189,11 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
} }
if (deviceProfile.getDefaultRuleChainId() != null) { if (deviceProfile.getDefaultRuleChainId() != null) {
validateRuleChain(tenantId, deviceProfile.getDefaultRuleChainId()); validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultRuleChainId());
} }
if (deviceProfile.getDefaultEdgeRuleChainId() != null) { if (deviceProfile.getDefaultEdgeRuleChainId() != null) {
validateRuleChain(tenantId, deviceProfile.getDefaultEdgeRuleChainId()); validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultEdgeRuleChainId());
} }
if (deviceProfile.getDefaultDashboardId() != null) { if (deviceProfile.getDefaultDashboardId() != null) {
@ -209,12 +209,12 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
validateOtaPackage(tenantId, deviceProfile, deviceProfile.getId()); validateOtaPackage(tenantId, deviceProfile, deviceProfile.getId());
} }
private void validateRuleChain(TenantId tenantId, RuleChainId ruleChainId) { private void validateRuleChain(TenantId tenantId, TenantId deviceProfileTenantId, RuleChainId ruleChainId) {
RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId); RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId);
if (ruleChain == null) { if (ruleChain == null) {
throw new DataValidationException("Can't assign non-existent rule chain!"); throw new DataValidationException("Can't assign non-existent rule chain!");
} }
if (!ruleChain.getTenantId().equals(tenantId)) { if (!ruleChain.getTenantId().equals(deviceProfileTenantId)) {
throw new DataValidationException("Can't assign rule chain from different tenant!"); throw new DataValidationException("Can't assign rule chain from different tenant!");
} }
} }