Merge branch 'master' of github.com:thingsboard/thingsboard

application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java

@@ -43,6 +43,8 @@ import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.asset.AssetProfile;
+import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EdgeId;
@@ -329,7 +331,7 @@ class DefaultTbContext implements TbContext {
 
     public TbMsg deviceCreatedMsg(Device device, RuleNodeId ruleNodeId) {
         RuleChainId ruleChainId = null;
-         String queueName = null;
+        String queueName = null;
         if (device.getDeviceProfileId() != null) {
             DeviceProfile deviceProfile = mainCtx.getDeviceProfileCache().find(device.getDeviceProfileId());
             if (deviceProfile == null) {
@@ -343,7 +345,18 @@ class DefaultTbContext implements TbContext {
     }
 
     public TbMsg assetCreatedMsg(Asset asset, RuleNodeId ruleNodeId) {
-        return entityActionMsg(asset, asset.getId(), ruleNodeId, DataConstants.ENTITY_CREATED);
+        RuleChainId ruleChainId = null;
+        String queueName = null;
+        if (asset.getAssetProfileId() != null) {
+            AssetProfile assetProfile = mainCtx.getAssetProfileCache().find(asset.getAssetProfileId());
+            if (assetProfile == null) {
+                log.warn("[{}] Asset profile is null!", asset.getAssetProfileId());
+            } else {
+                ruleChainId = assetProfile.getDefaultRuleChainId();
+                queueName = assetProfile.getDefaultQueueName();
+            }
+        }
+        return entityActionMsg(asset, asset.getId(), ruleNodeId, DataConstants.ENTITY_CREATED, queueName, ruleChainId);
     }
 
     public TbMsg alarmActionMsg(Alarm alarm, RuleNodeId ruleNodeId, String action) {
@@ -358,6 +371,15 @@ class DefaultTbContext implements TbContext {
                 ruleChainId = deviceProfile.getDefaultRuleChainId();
                 queueName = deviceProfile.getDefaultQueueName();
             }
+        } else if (EntityType.ASSET.equals(alarm.getOriginator().getEntityType())) {
+            AssetId assetId = new AssetId(alarm.getOriginator().getId());
+            AssetProfile assetProfile = mainCtx.getAssetProfileCache().get(getTenantId(), assetId);
+            if (assetProfile == null) {
+                log.warn("[{}] Asset profile is null!", assetId);
+            } else {
+                ruleChainId = assetProfile.getDefaultRuleChainId();
+                queueName = assetProfile.getDefaultQueueName();
+            }
         }
         return entityActionMsg(alarm, alarm.getId(), ruleNodeId, action, queueName, ruleChainId);
     }
@@ -659,9 +681,15 @@ class DefaultTbContext implements TbContext {
         mainCtx.getDeviceProfileCache().addListener(getTenantId(), getSelfId(), profileListener, deviceListener);
     }
 
+    @Override
+    public void addAssetProfileListeners(Consumer<AssetProfile> profileListener, BiConsumer<AssetId, AssetProfile> assetListener) {
+        mainCtx.getAssetProfileCache().addListener(getTenantId(), getSelfId(), profileListener, assetListener);
+    }
+
     @Override
     public void removeListeners() {
         mainCtx.getDeviceProfileCache().removeListener(getTenantId(), getSelfId());
+        mainCtx.getAssetProfileCache().removeListener(getTenantId(), getSelfId());
         mainCtx.getTenantProfileCache().removeListener(getTenantId(), getSelfId());
     }
 

dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java

@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
 @Slf4j
 public abstract class DataValidator<D extends BaseData<?>> {
     private static final Pattern EMAIL_PATTERN =
-            Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$", Pattern.CASE_INSENSITIVE);
+            Pattern.compile("^[A-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$", Pattern.CASE_INSENSITIVE);
 
     private static final Pattern QUEUE_PATTERN = Pattern.compile("^[a-zA-Z0-9_.\\-]+$");
 

dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import org.junit.Test;
+import org.thingsboard.server.dao.exception.DataValidationException;
+
+public class DataValidatorTest {
+
+    @Test
+    public void validateEmail() {
+        String email = "aZ1_!#$%&'*+/=?`{|}~^.-@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail1() {
+        String email = "test:1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail2() {
+        String email = "test()1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail3() {
+        String email = "test[]1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail4() {
+        String email = "test\\1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail5() {
+        String email = "test\"1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void validateInvalidEmail6() {
+        String email = "test<>1@mail.io";
+        DataValidator.validateEmail(email);
+    }
+}

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java

@@ -25,6 +25,8 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.asset.AssetProfile;
+import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EdgeId;
@@ -291,6 +293,8 @@ public interface TbContext {
 
     void addDeviceProfileListeners(Consumer<DeviceProfile> listener, BiConsumer<DeviceId, DeviceProfile> deviceListener);
 
+    void addAssetProfileListeners(Consumer<AssetProfile> listener, BiConsumer<AssetId, AssetProfile> assetListener);
+
     void removeListeners();
 
     TenantProfile getTenantProfile();