1、动态规则、静态规则、白名单修改完善接口设计,添加API文档

2、动态规则数据库删除event_type、source_system字段,新增template_id,HTTP接口接收template_id。
3、静态规则添加修改审核状态功能、按id删除功能
This commit is contained in:
Hao Miao
2024-01-12 23:46:11 +08:00
parent bf99b41af3
commit 135a1ae04c
21 changed files with 905 additions and 168 deletions

View File

@@ -22,13 +22,12 @@ public class DynamicRuleServiceTest {
void testNewDynamicRule() {
DynamicRuleObject object = new DynamicRuleObject();
object.setDynamicRuleName("UpdateDynamicRule2");
object.setDynamicRuleEventType(1);
object.setDynamicRuleFrequency(1);
object.setDynamicRulePriority(1);
object.setDynamicRuleRange("北京");
object.setDynamicRuleProtectLevel(2);
object.setDynamicRuleSourceSystem(1);
object.setProtectObjectIds(List.of(new Integer[]{5521, 5520}));
object.setTemplateId(1);
//object.setProtectObjectIds(List.of(new Integer[]{5521, 5520}));
Integer objectId = dynamicRuleService.newDynamicRuleObject(object);
@@ -37,7 +36,7 @@ public class DynamicRuleServiceTest {
@Test
void testDeleteDynamicRule() {
dynamicRuleService.deleteDynamicRuleObject(8);
// dynamicRuleService.deleteDynamicRuleObject(8);
}
@Test
@@ -50,15 +49,14 @@ public class DynamicRuleServiceTest {
void testUpdateDynamicRule() {
DynamicRuleObject object = new DynamicRuleObject();
object.setDynamicRuleName("UpdateDynamicRule2");
object.setDynamicRuleEventType(1);
object.setDynamicRuleFrequency(1);
object.setDynamicRulePriority(1);
object.setDynamicRuleRange("北京");
object.setDynamicRuleProtectLevel(2);
object.setDynamicRuleSourceSystem(1);
object.setProtectObjectIds(List.of(new Integer[]{5521, 5520}));
object.setTemplateId(1);
//object.setProtectObjectIds(List.of(new Integer[]{5521, 5520}));
dynamicRuleService.updateDynamicRuleObject(9, object);
dynamicRuleService.updateDynamicRuleObject(2, object);
}
@Test

View File

@@ -58,7 +58,6 @@ public class StaticRuleServiceTest {
object.setStaticRulePriority(2);
object.setStaticRuleFrequency(1);
object.setStaticRuleRange("北京");
// object.setStaticRuleProtectLevel(2);
Integer id = staticRuleService.newStaticRuleObject(object);
}
@@ -103,7 +102,7 @@ public class StaticRuleServiceTest {
object.setStaticRuleRange("北京");
// object.setStaticRuleProtectLevel(2);
staticRuleService.updateStaticRule(object);
staticRuleService.updateStaticRule(5, object);
}
@Test
void testQueryStaticRule(){

View File

@@ -1,5 +1,7 @@
package com.realtime.protection.server.whitelist;
import com.realtime.protection.configuration.entity.task.Command;
import com.realtime.protection.configuration.entity.task.FiveTupleWithMask;
import com.realtime.protection.configuration.entity.whitelist.WhiteListObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -9,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import java.util.ArrayList;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
@SpringBootTest
class WhiteListServiceTest {
@@ -54,10 +56,10 @@ class WhiteListServiceTest {
@Test
void testUpdateWhiteList() {
WhiteListObject object = new WhiteListObject();
object.setWhiteListId(7);
//object.setWhiteListId(7);
object.setWhiteListName("test_update");
whiteListService.updateWhiteListObject(object);
whiteListService.updateWhiteListObject(7,object);
}
@Test
@@ -72,4 +74,17 @@ class WhiteListServiceTest {
whiteListService.updateWhiteListObjectAuditStatus(7, 1);
}
@Test
void testWhiteListCommandJudge() {
FiveTupleWithMask fiveTupleWithMask = new FiveTupleWithMask();
Command command = new Command();
fiveTupleWithMask.setDestinationIP("128.1.1.123");
fiveTupleWithMask.setMaskDestinationIP("255.255.255.0");
fiveTupleWithMask.setDestinationPort("80");
command.setFiveTupleWithMask(fiveTupleWithMask);
List<WhiteListObject> whitelists = whiteListService.whiteListCommandJudge(command);
System.out.println(whitelists);
}
}