1、whitelist增加whiteListCommandsCheck、whiteListStaticRulesCheck。支持前端发送staticRuleIds列表,查询静态规则是否存在白名单。记录白名单check指令的问题
This commit is contained in:
@@ -16,9 +16,9 @@ public class AlertMessageTest {
|
||||
this.alertMessageService = alertMessageService;
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
void testReceiveAlertMessage() {
|
||||
/*
|
||||
for (int i = 1; i < 4; i++) {
|
||||
AlertMessage alertMessage = new AlertMessage();
|
||||
FiveTupleWithMask fiveTupleWithMask = new FiveTupleWithMask();
|
||||
@@ -35,6 +35,8 @@ public class AlertMessageTest {
|
||||
alertMessage.setDynamicRuleId(31);
|
||||
alertMessageService.processAlertMessage(alertMessage);
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -45,9 +45,9 @@ public class DynamicRuleServiceTest extends ProtectionApplicationTests {
|
||||
// System.out.println(object);
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
void testUpdateDynamicRule() {
|
||||
/*
|
||||
DynamicRuleObject object = new DynamicRuleObject();
|
||||
object.setDynamicRuleName("UpdateDynamicRule2");
|
||||
object.setDynamicRuleFrequency(1);
|
||||
@@ -58,6 +58,7 @@ public class DynamicRuleServiceTest extends ProtectionApplicationTests {
|
||||
object.setProtectObjectIds(List.of(new Integer[]{6061}));
|
||||
|
||||
dynamicRuleService.updateDynamicRuleObject(5, object);
|
||||
*/
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -1,14 +1,17 @@
|
||||
package com.realtime.protection.server.whitelist;
|
||||
|
||||
import com.realtime.protection.ProtectionApplicationTests;
|
||||
import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleObject;
|
||||
import com.realtime.protection.configuration.entity.task.FiveTupleWithMask;
|
||||
import com.realtime.protection.configuration.entity.task.TaskCommandInfo;
|
||||
import com.realtime.protection.configuration.entity.whitelist.WhiteListObject;
|
||||
import com.realtime.protection.server.rule.staticrule.StaticRuleService;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
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.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -20,9 +23,12 @@ class WhiteListServiceTest extends ProtectionApplicationTests {
|
||||
private final WhiteListService whiteListService;
|
||||
private WhiteListObject whiteListObject;
|
||||
|
||||
private final StaticRuleService staticRuleService;
|
||||
|
||||
@Autowired
|
||||
WhiteListServiceTest(WhiteListService whiteListService) {
|
||||
WhiteListServiceTest(WhiteListService whiteListService, StaticRuleService staticRuleService) {
|
||||
this.whiteListService = whiteListService;
|
||||
this.staticRuleService = staticRuleService;
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
@@ -77,7 +83,7 @@ class WhiteListServiceTest extends ProtectionApplicationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
void testWhiteListCommandJudge() {
|
||||
void testWhiteListCommandCheck() {
|
||||
FiveTupleWithMask fiveTupleWithMask = new FiveTupleWithMask();
|
||||
TaskCommandInfo taskCommandInfo = new TaskCommandInfo();
|
||||
fiveTupleWithMask.setDestinationIP("128.1.1.123");
|
||||
@@ -85,8 +91,41 @@ class WhiteListServiceTest extends ProtectionApplicationTests {
|
||||
fiveTupleWithMask.setDestinationPort("80");
|
||||
taskCommandInfo.setFiveTupleWithMask(fiveTupleWithMask);
|
||||
|
||||
List<WhiteListObject> whitelists = whiteListService.whiteListCommandJudge(taskCommandInfo);
|
||||
List<WhiteListObject> whitelists = whiteListService.whiteListCommandCheck(taskCommandInfo);
|
||||
System.out.println(whitelists);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testWhiteListStaticRulesCheck() {
|
||||
StaticRuleObject staticRuleTest = new StaticRuleObject();
|
||||
staticRuleTest.setStaticRuleName("test_staticrule");
|
||||
staticRuleTest.setStaticRuleCreateTime(LocalDateTime.now());
|
||||
staticRuleTest.setStaticRuleCreateUsername("mh");
|
||||
staticRuleTest.setStaticRuleCreateDepart("mmeess");
|
||||
staticRuleTest.setStaticRuleCreateUserId(2);
|
||||
staticRuleTest.setStaticRuleAuditStatus(0);
|
||||
|
||||
staticRuleTest.setStaticRuleSip("1.1.2.3");
|
||||
staticRuleTest.setStaticRuleSport(80);
|
||||
|
||||
staticRuleTest.setStaticRulePriority(1);
|
||||
staticRuleTest.setStaticRuleFrequency(1);
|
||||
staticRuleTest.setStaticRuleRange("北京");
|
||||
|
||||
Integer id = staticRuleService.newStaticRuleObject(staticRuleTest);
|
||||
List<Integer> ruleIds = new ArrayList<>(List.of(id));
|
||||
List<StaticRuleObject> staticRules= staticRuleService.queryStaticRule(null,null,null,null,1,2);
|
||||
for (StaticRuleObject staticRule : staticRules) {
|
||||
ruleIds.add(staticRule.getStaticRuleId());
|
||||
}
|
||||
whiteListObject = new WhiteListObject();
|
||||
whiteListObject.setWhiteListName("test");
|
||||
whiteListObject.setWhiteListSystemName("china");
|
||||
whiteListObject.setWhiteListIP("1.1.2.3");
|
||||
whiteListObject.setWhiteListPort(80);
|
||||
whiteListObject.setWhiteListUrl("www.baidu.com");
|
||||
whiteListObject.setWhiteListProtocol("TCP");
|
||||
whiteListService.newWhiteListObject(whiteListObject);
|
||||
System.out.println(whiteListService.whiteListStaticRulesCheck(ruleIds));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user