From 81e35e134e8377f2e24f106aba1188a235aee153 Mon Sep 17 00:00:00 2001
From: Yevhenii <uman980124@gmail.com>
Date: Wed, 7 May 2025 17:40:59 +0300
Subject: [PATCH 1/4] Validation DefaultEdgeRuleChain in DeviceProfile

- added validation for DefaultEdgeRuleChain
- refactoring
---
 .../validator/DeviceProfileDataValidator.java | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index a9e14229f8..e32195022c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -43,6 +43,7 @@ import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.Abstrac
 import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.LwM2MBootstrapServerCredential;
 import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.RPKLwM2MBootstrapServerCredential;
 import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.X509LwM2MBootstrapServerCredential;
+import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.queue.Queue;
 import org.thingsboard.server.common.data.rule.RuleChain;
@@ -188,13 +189,11 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         }
 
         if (deviceProfile.getDefaultRuleChainId() != null) {
-            RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, deviceProfile.getDefaultRuleChainId());
-            if (ruleChain == null) {
-                throw new DataValidationException("Can't assign non-existent rule chain!");
-            }
-            if (!ruleChain.getTenantId().equals(deviceProfile.getTenantId())) {
-                throw new DataValidationException("Can't assign rule chain from different tenant!");
-            }
+            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultRuleChainId());
+        }
+
+        if (deviceProfile.getDefaultEdgeRuleChainId() != null) {
+            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultEdgeRuleChainId());
         }
 
         if (deviceProfile.getDefaultDashboardId() != null) {
@@ -210,6 +209,16 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         validateOtaPackage(tenantId, deviceProfile, deviceProfile.getId());
     }
 
+    private void validateRuleChain(TenantId tenantId, TenantId deviceTenantId, RuleChainId ruleChainId) {
+        RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId);
+        if (ruleChain == null) {
+            throw new DataValidationException("Can't assign non-existent rule chain!");
+        }
+        if (!ruleChain.getTenantId().equals(deviceTenantId)) {
+            throw new DataValidationException("Can't assign rule chain from different tenant!");
+        }
+    }
+
     @Override
     protected DeviceProfile validateUpdate(TenantId tenantId, DeviceProfile deviceProfile) {
         DeviceProfile old = deviceProfileDao.findById(deviceProfile.getTenantId(), deviceProfile.getId().getId());
@@ -329,8 +338,8 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
             }
 
             if (serverConfig.getShortServerId() != null) {
-                if (serverConfig.isBootstrapServerIs()){
-                    if(serverConfig.getShortServerId() < 0 || serverConfig.getShortServerId() > 65535){
+                if (serverConfig.isBootstrapServerIs()) {
+                    if (serverConfig.getShortServerId() < 0 || serverConfig.getShortServerId() > 65535) {
                         throw new DeviceCredentialsValidationException("Bootstrap Server ShortServerId must be in range [0 - 65535]!");
                     }
                 } else {
@@ -423,4 +432,5 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
     private String getCertificateString(X509Certificate cert) throws CertificateEncodingException {
         return EncryptionUtil.certTrimNewLines(Base64.getEncoder().encodeToString(cert.getEncoded()));
     }
+
 }

From 48c1842d420650dafbc584635d0831af9e5005b2 Mon Sep 17 00:00:00 2001
From: Yevhenii <uman980124@gmail.com>
Date: Wed, 21 May 2025 12:56:23 +0300
Subject: [PATCH 2/4] Add validation for DefaultEdgeRuleChain in DeviceProfile

- Refactored parameter name for clarity
---
 .../dao/service/validator/DeviceProfileDataValidator.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index e32195022c..dfd0ee82bc 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -209,12 +209,12 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         validateOtaPackage(tenantId, deviceProfile, deviceProfile.getId());
     }
 
-    private void validateRuleChain(TenantId tenantId, TenantId deviceTenantId, RuleChainId ruleChainId) {
+    private void validateRuleChain(TenantId tenantId, TenantId deviceProfileTenantId, RuleChainId ruleChainId) {
         RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId);
         if (ruleChain == null) {
             throw new DataValidationException("Can't assign non-existent rule chain!");
         }
-        if (!ruleChain.getTenantId().equals(deviceTenantId)) {
+        if (!ruleChain.getTenantId().equals(deviceProfileTenantId)) {
             throw new DataValidationException("Can't assign rule chain from different tenant!");
         }
     }

From ae4bdb52da5b82056431e63662661b08f06fcfb5 Mon Sep 17 00:00:00 2001
From: Yevhenii <uman980124@gmail.com>
Date: Fri, 23 May 2025 18:02:19 +0300
Subject: [PATCH 3/4] Add validation for DefaultEdgeRuleChain in DeviceProfile

- refactoring
---
 .../dao/service/validator/DeviceProfileDataValidator.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index dfd0ee82bc..ca312608d7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -189,11 +189,11 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         }
 
         if (deviceProfile.getDefaultRuleChainId() != null) {
-            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultRuleChainId());
+            validateRuleChain(tenantId, deviceProfile.getDefaultRuleChainId());
         }
 
         if (deviceProfile.getDefaultEdgeRuleChainId() != null) {
-            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultEdgeRuleChainId());
+            validateRuleChain(tenantId, deviceProfile.getDefaultEdgeRuleChainId());
         }
 
         if (deviceProfile.getDefaultDashboardId() != null) {
@@ -209,12 +209,12 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         validateOtaPackage(tenantId, deviceProfile, deviceProfile.getId());
     }
 
-    private void validateRuleChain(TenantId tenantId, TenantId deviceProfileTenantId, RuleChainId ruleChainId) {
+    private void validateRuleChain(TenantId tenantId, RuleChainId ruleChainId) {
         RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId);
         if (ruleChain == null) {
             throw new DataValidationException("Can't assign non-existent rule chain!");
         }
-        if (!ruleChain.getTenantId().equals(deviceProfileTenantId)) {
+        if (!ruleChain.getTenantId().equals(tenantId)) {
             throw new DataValidationException("Can't assign rule chain from different tenant!");
         }
     }

From ed1639663f915b04287f05b59e82084958fee6f5 Mon Sep 17 00:00:00 2001
From: Yevhenii <uman980124@gmail.com>
Date: Fri, 23 May 2025 18:10:33 +0300
Subject: [PATCH 4/4] Add validation for DefaultEdgeRuleChain in DeviceProfile

- reverted changes
---
 .../dao/service/validator/DeviceProfileDataValidator.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index ca312608d7..dfd0ee82bc 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -189,11 +189,11 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         }
 
         if (deviceProfile.getDefaultRuleChainId() != null) {
-            validateRuleChain(tenantId, deviceProfile.getDefaultRuleChainId());
+            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultRuleChainId());
         }
 
         if (deviceProfile.getDefaultEdgeRuleChainId() != null) {
-            validateRuleChain(tenantId, deviceProfile.getDefaultEdgeRuleChainId());
+            validateRuleChain(tenantId, deviceProfile.getTenantId(), deviceProfile.getDefaultEdgeRuleChainId());
         }
 
         if (deviceProfile.getDefaultDashboardId() != null) {
@@ -209,12 +209,12 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
         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);
         if (ruleChain == null) {
             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!");
         }
     }