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

AlertMessage：

Browse Source 
1、alertmessage添加is_distribute（待删除）、command_uuid、create_time、modify_time、alert_message_uuid属性。
2、AlertMessageController添加queryAlarmsByCommandId方法，根据commandUUID查询alertmessage
3、AlertMessageMapper添加新建、查询alertmessage
4、service重写处理alertmessage逻辑，现在alertmessage的isdistribute不需要了，需要删除
Command：
1、service添加updateCommandVaid方法，用于对研判后任务生成的指令研判下发
Task：
1、TaskCommandInfo类添加taskStatus，减少AlertMessageService的查询，并做了标注
2、Controller添加研判后任务下发指令\停止指令的方法validCommandInfoByTaskId
StaticRule、DynamicRule、WhiteList：
1、添加分页查询返回数据总数
This commit is contained in:
Hao Miao
2024-01-21 00:51:10 +08:00
parent 073dfc9ba4
commit 44abfe096c
24 changed files with 389 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/AlertMessage.java
View File

@@ -3,16 +3,33 @@ package com.realtime.protection.configuration.entity.rule.dynamicrule;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.realtime.protection.configuration.entity.task.FiveTupleWithMask;
import lombok.Data;
import lombok.NonNull;
@Data
public class AlertMessage {
@JsonProperty("task_id")
private Long taskId;
@JsonProperty("five_tuple_with_mask")
private FiveTupleWithMask fiveTupleWithMask;
@JsonProperty("dynamic_rule_id")
private Integer dynamicRuleId;
@JsonProperty("five_tuple_with_mask")
private FiveTupleWithMask fiveTupleWithMask;
@JsonProperty("is_distribute")
private Boolean isDistribute;//待删除
@JsonProperty("command_uuid")
private String commandUUID;
@JsonProperty("create_time")
private String createTime;
@JsonProperty("modify_time")
private String modifyTime;
@JsonProperty("alert_message_uuid")
private String alertMessageUUID;
}

17
src/main/java/com/realtime/protection/configuration/entity/task/FiveTupleWithMask.java
View File

@@ -55,4 +55,21 @@ public class FiveTupleWithMask {
@Schema(description = "协议掩码", example = "0")
private String maskProtocol;
// 复制构造函数
public void copyFiveTupleWithMask(FiveTupleWithMask original) {
this.addrType = original.addrType;
this.sourceIP = original.sourceIP;
this.sourcePort = original.sourcePort;
this.destinationIP = original.destinationIP;
this.destinationPort = original.destinationPort;
this.protocol = original.protocol;
this.protocolNum = original.protocolNum;
this.maskSourceIP = original.maskSourceIP;
this.maskSourcePort = original.maskSourcePort;
this.maskDestinationIP = original.maskDestinationIP;
this.maskDestinationPort = original.maskDestinationPort;
this.maskProtocol = original.maskProtocol;
}
}

7
src/main/java/com/realtime/protection/configuration/entity/task/TaskCommandInfo.java
View File

@@ -69,9 +69,14 @@ public class TaskCommandInfo {
@Schema(description = "最新下发时间", accessMode = Schema.AccessMode.READ_ONLY)
private LocalDateTime latestSendTime;
/*
以下属性用于动态规则生成，不写入doris：t_command表
*/
@Schema(description = "防御策略模板ID", accessMode = Schema.AccessMode.READ_ONLY)
private Integer templateId;
@Schema(description = "防护等级", accessMode = Schema.AccessMode.READ_ONLY)
private Integer protectLevel;
@Schema(description = "指令所属任务的运行状态", accessMode = Schema.AccessMode.READ_ONLY)
private Integer taskStatus;
}