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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
EnderByEndera
2024-01-22 15:40:13 +08:00
parent 3d50cb9493 193862ff3e
commit 32643ccf54
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@ public class AlertMessage {
@JsonProperty("five_tuple_with_mask") @JsonProperty("five_tuple_with_mask")
private FiveTupleWithMask fiveTupleWithMask; private FiveTupleWithMask fiveTupleWithMask;
@JsonProperty("is_distribute") // @JsonProperty("is_distribute")
private Boolean isDistribute;//待删除 // private Boolean isDistribute;//待删除
@JsonProperty("command_uuid") @JsonProperty("command_uuid")
private String commandUUID; private String commandUUID;

4
src/main/java/com/realtime/protection/configuration/utils/enums/StateEnum.java
View File

@@ -49,4 +49,8 @@ public enum StateEnum {
public static StateEnum getStateEnumByState(State state) { public static StateEnum getStateEnumByState(State state) {
return stateToStateEnumMap.get(state); return stateToStateEnumMap.get(state);
} }
public static StateEnum getStateEnumByNum(Integer stateNum) {
return getStateEnumByState(getStateByNum(stateNum));
}
} }

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

@@ -15,6 +15,7 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import java.util.List; import java.util.List;
@Service @Service
public class AlertMessageService { public class AlertMessageService {
private final CommandService commandService; private final CommandService commandService;
@@ -36,12 +37,12 @@ public class AlertMessageService {
Integer taskType = dynamicTaskCommandInfo.getTaskType(); Integer taskType = dynamicTaskCommandInfo.getTaskType();
if (taskType == TaskTypeEnum.DYNAMIC.getTaskType())//动态 if (taskType == TaskTypeEnum.DYNAMIC.getTaskType())//动态
switch (taskStatus) { switch (StateEnum.getStateEnumByNum(taskStatus)) {
case 2://running case RUNNING:
insertCommandAndAlertMessage(dynamicTaskCommandInfo, true, alertMessage, true); insertCommandAndAlertMessage(dynamicTaskCommandInfo, true, alertMessage);
break; break;
case 3://Paused case PAUSED:
insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage, true); insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage);
break; break;
default://主要是stop default://主要是stop
//command不入库 //command不入库
@@ -50,12 +51,12 @@ public class AlertMessageService {
break; break;
} }
else if (taskType == TaskTypeEnum.JUDGED.getTaskType())//研判后 else if (taskType == TaskTypeEnum.JUDGED.getTaskType())//研判后
switch (taskStatus) { switch (StateEnum.getStateEnumByNum(taskStatus)) {
case 2://running case RUNNING:
insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage, false); insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage);
break; break;
case 3://Paused case PAUSED:
insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage, false); insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage);
break; break;
default://主要是stop default://主要是stop
//command不入库 //command不入库
@@ -88,21 +89,17 @@ public class AlertMessageService {
@DSTransactional @DSTransactional
private void insertCommandAndAlertMessage(TaskCommandInfo dynamicTaskCommandInfo, Boolean isValid, private void insertCommandAndAlertMessage(TaskCommandInfo dynamicTaskCommandInfo, Boolean isValid,
AlertMessage alertMessage, Boolean isDistribute){ AlertMessage alertMessage){
//command入库 //command入库
dynamicTaskCommandInfo.setIsValid(isValid); dynamicTaskCommandInfo.setIsValid(isValid);
String commandUUID = commandService.createCommand(dynamicTaskCommandInfo); String commandUUID = commandService.createCommand(dynamicTaskCommandInfo);
if (true){
throw new RuntimeException("test");
}
//alertmessage入库 //alertmessage入库
alertMessage.setIsDistribute(isDistribute);
alertMessage.setCommandUUID(commandUUID); alertMessage.setCommandUUID(commandUUID);
alertMessageMapper.insertAlertMessage(alertMessage); alertMessageMapper.insertAlertMessage(alertMessage);
} }
private void insertAlertMessageOnly(AlertMessage alertMessage, Boolean isDistribute){ private void insertAlertMessageOnly(AlertMessage alertMessage, Boolean isDistribute){
//alertmessage入库 //alertmessage入库
alertMessage.setIsDistribute(isDistribute);
alertMessage.setCommandUUID(null); alertMessage.setCommandUUID(null);
alertMessageMapper.insertAlertMessage(alertMessage); alertMessageMapper.insertAlertMessage(alertMessage);
} }
@@ -141,6 +138,7 @@ public class AlertMessageService {
public List<AlertMessage> queryAlarmsByCommandId(String commandId) { public List<AlertMessage> queryAlarmsByCommandId(String commandId) {
return alertMessageMapper.queryAlermsByCommandId(commandId); return alertMessageMapper.queryAlermsByCommandId(commandId);
} }
} }

4
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java
View File

@@ -57,7 +57,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
@Override @Override
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public ResponseResult deleteDynamicRuleObjects(@PathVariable List<Integer> ids) { public ResponseResult deleteDynamicRuleObjects(@PathVariable List<Integer> ids) {
log.info("批量删除动态规则: {}", ids); //log.info("批量删除动态规则: {}", ids);
//调用service删除 //调用service删除
return ResponseResult.ok() return ResponseResult.ok()
@@ -104,7 +104,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
.setData("success", true) .setData("success", true)
.setData("dynamic_rule_list", dynamicRuleService.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId, .setData("dynamic_rule_list", dynamicRuleService.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId,
protectObjectSourceSystem, creator, page, pageSize)) protectObjectSourceSystem, creator, page, pageSize))
.setData("dynamic_rule_total_num",dynamicRuleService.queryDynamicRuleTotalNum()); .setData("total_num",dynamicRuleService.queryDynamicRuleTotalNum());
} }
//详情查看？？ 就是按id查询吧 //详情查看？？ 就是按id查询吧

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

@@ -139,7 +139,7 @@ public class StaticRuleController implements StaticRuleControllerApi {
static_rule_creator, static_rule_ip, page, pageSize); static_rule_creator, static_rule_ip, page, pageSize);
return ResponseResult.ok() return ResponseResult.ok()
.setData("static_rule_list", pageResult) .setData("static_rule_list", pageResult)
.setData("static_rule_total_num",staticRuleService.queryStaticRuleTotalNum()); .setData("total_num",staticRuleService.queryStaticRuleTotalNum());
} }
/** /**

2
src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java
View File

@@ -70,7 +70,7 @@ public class WhiteListController implements WhiteListControllerApi {
} }
return ResponseResult.ok() return ResponseResult.ok()
.setData("whiteobj_list", whiteListService.queryWhiteListObject(whiteListName, whiteListId, page, pageSize)) .setData("whiteobj_list", whiteListService.queryWhiteListObject(whiteListName, whiteListId, page, pageSize))
.setData("whiteobj_total_num", whiteListService.queryWhiteListTotalNum()); .setData("total_num", whiteListService.queryWhiteListTotalNum());
} }
@Override @Override

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

@@ -76,7 +76,6 @@
MASK_DST_IP, MASK_DST_IP,
MASK_DST_PORT, MASK_DST_PORT,
MASK_PROTOCOL, MASK_PROTOCOL,
IS_DISTRIBUTE,
COMMAND_UUID, COMMAND_UUID,
CREATE_TIME, CREATE_TIME,
LAST_UPDATE, LAST_UPDATE,
@@ -95,7 +94,6 @@
#{fiveTupleWithMask.maskDestinationIP}, #{fiveTupleWithMask.maskDestinationIP},
#{fiveTupleWithMask.maskDestinationPort}, #{fiveTupleWithMask.maskDestinationPort},
#{fiveTupleWithMask.maskProtocol}, #{fiveTupleWithMask.maskProtocol},
#{isDistribute},
#{commandUUID}, #{commandUUID},
NOW(), NOW(),
NOW(), NOW(),