feat: group parameter check (#716)

traas-stack · Oct 30, 2023 · b91bd39 · b91bd39
1 parent 70800fe
commit b91bd39
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...io/holoinsight/server/home/alert/service/calculate/AbstractUniformInspectRunningRule.java b/...io/holoinsight/server/home/alert/service/calculate/AbstractUniformInspectRunningRule.java
@@ -74,8 +74,8 @@ public EventInfo eval(ComputeContext context,
     } catch (Throwable ex) {
       RecordSucOrFailNotify.alertNotifyProcess("AlertTaskCompute Exception: " + ex,
           ALERT_TASK_COMPUTE, "alert task compute", inspectConfig.getAlertNotifyRecord());
-      logger.error("fail to eval inspectConfig {}, traceId: {} ", G.get().toJson(inspectConfig),
-          traceId, ex);
+      logger.error("ALERT_EXCEPTION_MONITOR inspectConfig {}, traceId: {} ",
+          inspectConfig.getUniqueId(), traceId, ex);
     }
     return events;
   }

diff --git a/...ome-web/src/main/java/io/holoinsight/server/home/web/controller/AlarmGroupFacadeImpl.java b/...ome-web/src/main/java/io/holoinsight/server/home/web/controller/AlarmGroupFacadeImpl.java
@@ -101,10 +101,10 @@ public JsonResult<Long> create(@RequestBody AlarmGroupDTO alarmGroup) {
       return jsonResult;
     }
 
-    return save(alarmGroup);
+    return save(alarmGroup, true);
   }
 
-  public JsonResult<Long> save(AlarmGroupDTO alarmGroup) {
+  public JsonResult<Long> save(AlarmGroupDTO alarmGroup, boolean needCheckUser) {
     final JsonResult<Long> result = new JsonResult<>();
     facadeTemplate.manage(result, new ManageCallback() {
       @Override
@@ -114,7 +114,7 @@ public void checkParameter() {
             "invalid groupName, please use a-z A-Z 0-9 Chinese - _ , . spaces");
         List<String> persons = alarmGroup.getUserList();
         MonitorUser mu = RequestContext.getContext().mu;
-        if (!CollectionUtils.isEmpty(persons)) {
+        if (!CollectionUtils.isEmpty(persons) && needCheckUser) {
           for (String person : persons) {
             ParaCheckUtil.checkParaBoolean(
                 parameterSecurityService.checkUserTenantAndWorkspace(person, mu),

diff --git a/...web/src/main/java/io/holoinsight/server/home/web/controller/AlarmSubscribeFacadeImpl.java b/...web/src/main/java/io/holoinsight/server/home/web/controller/AlarmSubscribeFacadeImpl.java
@@ -110,6 +110,12 @@ public void checkParameter() {
         }
         if (!CollectionUtils.isEmpty(alarmSubscribeDTO.getAlarmSubscribe())) {
           for (AlarmSubscribeInfo alarmSubscribeInfo : alarmSubscribeDTO.getAlarmSubscribe()) {
+            if (StringUtils.isNotEmpty(alarmSubscribeInfo.getUniqueId())) {
+              ParaCheckUtil.checkParaBoolean(
+                  parameterSecurityService.checkRuleTenantAndWorkspace(
+                      alarmSubscribeInfo.getUniqueId(), ms.getTenant(), ms.getWorkspace()),
+                  "uniqueId do not belong to this tenant or workspace");
+            }
             if (CollectionUtils.isEmpty(alarmSubscribeInfo.getNoticeType())) {
               continue;
             }