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

1、TaskCommandIndo删去了depart，使用taskCreateDepart，修改mapper也同步使用taskCreateDepart

Browse Source 
2、新增静态规则批量审核功能，post请求body为id和auditStatus的Map，入库使用sqlSessionWrapper，test已通过
3、动态任务接收alertmessage，查询DynamicTaskInfos生成command时，新增关联t_strategy_template表，select查询新增查询局点dynamic_rule_range、事件类型strategy_template_name字段
This commit is contained in:
PushM
2024-04-17 22:04:29 +08:00
parent de6437b8b0
commit c6334cee56
12 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public class TaskCommandInfo {
@Schema(description = "局点", example = "123456")
@JsonProperty("distribute_point")
private Integer distributePoint;
private String distributePoint;
@Schema(description = "事件类型（策略模板名称）", example = "DDOS")
@JsonProperty("event_type")
@@ -123,6 +123,7 @@ public class TaskCommandInfo {
this.taskType = original.taskType;
this.taskAct = original.taskAct;
this.distributePoint = original.distributePoint;
this.eventType = original.eventType;
this.frequency = original.frequency;
this.startTime = original.startTime;
this.endTime = original.endTime;

2
src/main/java/com/realtime/protection/server/alertmessage/AlertMessageService.java
View File

@@ -32,7 +32,7 @@ public class AlertMessageService {
public void processAlertMessage(AlertMessage alertMessage) {
//根据告警信息——>生成指令
List<TaskCommandInfo> dynamicTaskCommandInfoList = generateDynamicCommand(alertMessage);
//获取任务状态，设置指令的isValid字段，且是否生成指令入库（除了RUNING\PAUSED状态，其他都不入库）。
//获取任务状态，设置指令的isValid字段，且是否生成指令入库（除了RUNING\PAUSED状态，其他都不入command库）。
Integer taskStatus = dynamicTaskCommandInfoList.get(0).getTaskStatus();
//获取任务类型，设置指令的isJudged字段。
Integer taskType = dynamicTaskCommandInfoList.get(0).getTaskType();

29
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java
View File

@@ -14,7 +14,9 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@RestController
@@ -163,7 +165,7 @@ public class StaticRuleController implements StaticRuleControllerApi {
public ResponseResult updateStaticRuleAuditStatus(@PathVariable Integer id, @PathVariable Integer auditStatus) {
if (id <= 0 || auditStatus < 0 || auditStatus > 2) {
return new ResponseResult(400, "id or status is invalid")
.setData("whiteobj_id", id)
.setData("staticRule_id", id)
.setData("success", false);
}
return ResponseResult.ok()
@@ -173,4 +175,29 @@ public class StaticRuleController implements StaticRuleControllerApi {
}
/**
* 批量修改审核状态
*/
@PostMapping("/auditbatch")
public ResponseResult updateStaticRuleAuditStatusBatch(@RequestBody Map<Integer, Integer> idsWithAuditStatusMap) {
List<Integer> errorIds = new ArrayList<Integer>();
for (Map.Entry<Integer, Integer> entry: idsWithAuditStatusMap.entrySet()) {
Integer id = entry.getKey();
Integer auditStatus = entry.getValue();
if (id <= 0 || auditStatus < 0 || auditStatus > 2) {
errorIds.add(id);
}
}
if (!errorIds.isEmpty()){
return new ResponseResult(400, "id or status is invalid")
.setData("staticRule_id", errorIds)
.setData("success", false);
}
return ResponseResult.ok()
.setData("success", staticRuleService.updateAuditStatusBatch(idsWithAuditStatusMap));
}
}

3
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java
View File

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@Mapper
public interface StaticRuleMapper {
@@ -43,4 +44,6 @@ public interface StaticRuleMapper {
String static_rule_create_username, String ip);
List<StaticRuleObject> queryStaticRuleByIds(List<Integer> ids);
void updateAuditStatusByIdBatch(@Param("idWithAuditStatusBatch")Map<Integer, Integer> idWithAuditStatusBatch);
}

29
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java
View File

@@ -131,7 +131,7 @@ public class StaticRuleService {
}
List<StaticRuleObject> StaticRuleBatch = ListUtils.newArrayListWithExpectedSize(100);
for (StaticRuleObject staticRule : staticRuleList) {
for (StaticRuleObject staticRule : list) {
staticRule.setStaticRuleCreateTime(LocalDateTime.now());
StaticRuleBatch.add(staticRule);
if (StaticRuleBatch.size() < 100) {
@@ -182,4 +182,31 @@ public class StaticRuleService {
public List<StaticRuleObject> queryStaticRuleByIds(List<Integer> ids) {
return staticRuleMapper.queryStaticRuleByIds(ids);
}
public Object updateAuditStatusBatch(Map<Integer, Integer> idsWithAuditStatusMap) {
Function<StaticRuleMapper, Function<Map<Integer, Integer>, Boolean>> updateStaticRuleAuditStatusFunction =
mapper -> map -> {
if (map == null || map.isEmpty()) {
return false;
}
Map<Integer, Integer> idWithAuditStatusBatch = new HashMap<>();
for (Map.Entry<Integer, Integer> item : map.entrySet()) {
idWithAuditStatusBatch.put(item.getKey(), item.getValue());
if (idWithAuditStatusBatch.size() < 100) {
continue;
}
//mapper指的就是外层函数输入的参数，也就是WhiteListMapper
mapper.updateAuditStatusByIdBatch(idWithAuditStatusBatch);
idWithAuditStatusBatch.clear();
}
if (!idWithAuditStatusBatch.isEmpty()) {
mapper.updateAuditStatusByIdBatch(idWithAuditStatusBatch);
}
return true;
};
//实现事务操作
return sqlSessionWrapper.startBatchSession(StaticRuleMapper.class, updateStaticRuleAuditStatusFunction, idsWithAuditStatusMap);
}
}

11
src/main/resources/mappers/AlertMessageMapper.xml
View File

@@ -20,6 +20,10 @@
<result column="task_end_time" property="endTime"/>
<result column="template_id" property="templateId"/>
<result column="dynamic_rule_range" property="distributePoint"/>
<result column="strategy_template_name" property="eventType"/>
<result column="dynamic_rule_protect_level" property="protectLevel"/>
<result column="task_status" property="taskStatus"/>
</resultMap>
@@ -149,12 +153,17 @@
t_task.task_end_time,
t_dr.template_id,
t_dr.dynamic_rule_range,
t_dr.dynamic_rule_protect_level,
t_task.task_status
t_task.task_status,
t_tmplate.strategy_template_name
from t_task
left join realtime_protection.t_dynamic_rule t_dr on
(t_task.task_id = t_dr.dynamic_rule_used_task_id and t_dr.dynamic_rule_id = #{dynamicRuleId})
left join realtime_protection.t_strategy_template t_tmplate on
( t_dr.template_id = t_tmplate.strategy_template_id )
where
t_task.task_id = #{taskId}
</select>

2
src/main/resources/mappers/CommandMapper.xml
View File

@@ -9,7 +9,7 @@
MASK_SRC_IP, MASK_SRC_PORT, MASK_DST_IP, MASK_DST_PORT, MASK_PROTOCOL, VALID_TIME,
INVALID_TIME, IS_VALID, IS_JUDGED,
SEND_TIMES, SUCCESS_TIMES, CREATE_TIME, LAST_UPDATE, IS_DELETED)
values (#{info.UUID}, #{info.taskId}, #{info.taskAct}, #{info.taskName}, #{info.eventType}, #{info.department}, #{info.distributePoint},
values (#{info.UUID}, #{info.taskId}, #{info.taskAct}, #{info.taskName}, #{info.eventType}, #{info.taskCreateDepart}, #{info.distributePoint},
#{info.frequency},
DEFAULT,
#{info.fiveTupleWithMask.sourceIP}, #{info.fiveTupleWithMask.sourcePort},

14
src/main/resources/mappers/StaticRuleMapper.xml
View File

@@ -84,6 +84,20 @@
set static_rule_audit_status = #{auditStatus}
where static_rule_id = #{id}
</update>
<update id="updateAuditStatusByIdBatch">
update t_static_rule
set static_rule_audit_status = CASE static_rule_id
<foreach collection="idWithAuditStatusBatch" index="id" item="auditStatus" separator=" ">
WHEN #{id} THEN #{auditStatus}
</foreach>
ELSE static_rule_audit_status
END
WHERE static_rule_id IN
<foreach collection="idWithAuditStatusBatch" index="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<delete id="deleteStaticRules">
delete from t_static_rule
where static_rule_id in

2
src/main/resources/mappers/TaskMapper.xml
View File

@@ -161,7 +161,7 @@
<result column="static_rule_id" property="ruleId"/>
<result column="task_act" property="taskAct"/>
<result column="task_create_depart" property="department"/>
<result column="task_create_depart" property="taskCreateDepart"/>
<result column="static_rule_range" property="distributePoint"/>
<result column="task_type" property="taskType"/>
<result column="static_rule_frequency" property="frequency"/>