1、指令新增白名单判断,命中白名单后加入到t_whitelist_hit表中,不加到t_command

2、指令新增时,记录到t_command_log表中
3、配置增加创建人、审核人
4、任务停止、结束时,规则的used_task_id也变为空
5、规则update后更新审核状态bug修复
This commit is contained in:
PushM
2024-06-06 03:28:50 +08:00
parent 62772955d2
commit 366e89ae47
28 changed files with 1033 additions and 107 deletions

View File

@@ -1,5 +1,6 @@
package com.realtime.protection.server.alertmessage;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.github.xiaoymin.knife4j.annotations.Ignore;
import com.realtime.protection.configuration.entity.alert.AlertMessage;
import com.realtime.protection.configuration.entity.defense.object.ProtectObject;
@@ -45,6 +46,7 @@ public class AlertMessageTest {
@Ignore
@Test
@DSTransactional
void testReceiveAlertMessage() throws DorisStartException {
for(int n = 10;n < 20;n++) {

View File

@@ -104,36 +104,29 @@ class WhiteListServiceTest extends ProtectionApplicationTests {
@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.setAuditStatus(0);
//
// staticRuleTest.setStaticRuleSip("1.1.2.3");
StaticRuleObject staticRuleTest = new StaticRuleObject();
staticRuleTest.setStaticRuleName("test__白名单");
staticRuleTest.setStaticRuleCreateUsername("mh");
staticRuleTest.setStaticRuleCreateDepart("mmeess");
staticRuleTest.setAuditStatus(2);
staticRuleTest.setStaticRuleSip("1.13.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));
Integer id = staticRuleService.newStaticRuleObject(staticRuleTest);
List<Integer> ruleIds = new ArrayList<>(List.of(id));
// List<StaticRuleObject> staticRules= staticRuleService.queryStaticRule(null,null,null,null,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));
whiteListObject = new WhiteListObject();
whiteListObject.setWhiteListName("test");
whiteListObject.setWhiteListSystemName("china");
whiteListObject.setWhiteListIP("1.13.2.3");
whiteListObject.setWhiteListPort(80);
whiteListObject.setWhiteListUrl("www.baidu.com");
whiteListObject.setWhiteListProtocol("6");
whiteListService.newWhiteListObject(whiteListObject);
System.out.println(whiteListService.whiteListStaticRulesCheck(ruleIds));
}
@Test