gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、AlertMessage类移动位置

Browse Source 
2、动态规则增加删除判断，如果使用任务处于运行、暂停，不允许删除动态规则。(静态规则不需要删除判断，因为指令已经下发。但动态规则配置不能删除，告警信息过来会找不到动态规则)
This commit is contained in:
Hao Miao
2024-01-25 17:29:54 +08:00
parent 0864644918
commit e9313f2420
11 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/com/realtime/protection/server/alertmessage/AlertMessageTest.java
View File

@@ -1,8 +1,5 @@
package com.realtime.protection.server.alertmessage;
import com.github.xiaoymin.knife4j.annotations.Ignore;
import com.realtime.protection.configuration.entity.rule.dynamicrule.AlertMessage;
import com.realtime.protection.configuration.entity.task.FiveTupleWithMask;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

52
src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java
View File

@@ -1,21 +1,36 @@
package com.realtime.protection.server.rule.dynamic;
import com.github.xiaoymin.knife4j.annotations.Ignore;
import com.realtime.protection.ProtectionApplicationTests;
import com.realtime.protection.configuration.entity.defense.object.ProtectObject;
import com.realtime.protection.configuration.entity.defense.template.Template;
import com.realtime.protection.configuration.entity.rule.dynamicrule.DynamicRuleObject;
import com.realtime.protection.configuration.entity.task.Task;
import com.realtime.protection.server.defense.object.ProtectObjectService;
import com.realtime.protection.server.defense.template.TemplateService;
import com.realtime.protection.server.rule.dynamicrule.DynamicRuleService;
import com.realtime.protection.server.task.TaskService;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.time.LocalDateTime;
import java.util.List;
@SpringBootTest
public class DynamicRuleServiceTest extends ProtectionApplicationTests {
private final DynamicRuleService dynamicRuleService;
private final TaskService taskService;
private final ProtectObjectService protectObjectService;
private final TemplateService templateService;
@Autowired
public DynamicRuleServiceTest(DynamicRuleService dynamicRuleService) {
public DynamicRuleServiceTest(DynamicRuleService dynamicRuleService,TaskService taskService,
ProtectObjectService protectObjectService,TemplateService templateService) {
this.dynamicRuleService = dynamicRuleService;
this.taskService = taskService;
this.protectObjectService = protectObjectService;
this.templateService = templateService;
}
@Test
@@ -36,7 +51,38 @@ public class DynamicRuleServiceTest extends ProtectionApplicationTests {
@Test
void testDeleteDynamicRule() {
// dynamicRuleService.deleteDynamicRuleObject(8);
List<ProtectObject> protectObject = protectObjectService.queryProtectObjects(null, null, 1, 1);
List<Template> templates = templateService.queryTemplates(null, 1, 1);
DynamicRuleObject object = new DynamicRuleObject();
object.setDynamicRuleName("UpdateDynamicRule2");
object.setDynamicRuleFrequency(1);
object.setDynamicRulePriority(1);
object.setDynamicRuleRange("北京");
object.setDynamicRuleProtectLevel(2);
object.setTemplateId(templates.get(0).getTemplateId());
object.setProtectObjectIds(List.of(new Integer[]{protectObject.get(0).getProtectObjectId()}));
Integer dynamicRuleId = dynamicRuleService.newDynamicRuleObject(object);
Task task = new Task();
task.setTaskName("dong态测试");
LocalDateTime taskStartTime = LocalDateTime.now().plusMinutes(1);
LocalDateTime taskEndTime = LocalDateTime.now().plusYears(5);
task.setTaskStartTime(taskStartTime);
task.setTaskEndTime(taskEndTime);
task.setTaskAct("阻断");
task.setTaskType(1);
task.setTaskCreateUserId(1);
task.setTaskCreateUsername("xxx");
task.setTaskCreateDepart("xxx");
task.setDynamicRuleIds(List.of(new Integer[]{dynamicRuleId}));
Long taskId = taskService.newTask(task);
taskService.changeTaskStatus(taskId, 2);
// dynamicRuleService.deleteDynamicRuleObject(dynamicRuleId);
}
@Test