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

1、静态规则、动态规则、任务批量删除新增id、auditstatus合法性校验

Browse Source 
2、Template新增auditstatus属性，修改query返回auditstatus，新增审批方法

(cherry picked from commit 03042f0aff)
This commit is contained in:
PushM
2024-04-29 11:44:15 +08:00
parent 076cb15a09
commit 335c9690ed
17 changed files with 236 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java
View File

@@ -73,6 +73,11 @@ public class Template {
@Schema(description = "防御策略模板创建人处室", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY)
private String createDepart;
@JsonProperty("audit_status")
@Schema(description = "防御策略模板审核状态（0为未审核，1为已退回，2为审核通过）", example = "1", accessMode = Schema.AccessMode.READ_ONLY)
private String auditStatus;
/**
* 设置是否含有日常/应急/紧急防护等级态字段的字段
*/

42
src/main/java/com/realtime/protection/server/defense/template/TemplateController.java
View File

@@ -129,4 +129,46 @@ public class TemplateController implements TemplateControllerApi {
AuditStatusEnum.getNumByState(AuditStatusEnum.PENDING.getState())
));
}
/**
* 审批
*/
@GetMapping("/{id}/audit/{auditStatus}")
public ResponseResult updateTemplateAuditStatus(@PathVariable Integer id, @PathVariable Integer auditStatus) {
if (id <= 0 || auditStatus < 0 || auditStatus > 2) {
return new ResponseResult(400, "id or status is invalid")
.setData("template_id", id)
.setData("success", false);
}
return ResponseResult.ok()
.addDataMap(templateService.updateAuditStatus(id, auditStatus))
.setData("template_id", id);
}
/**
* 批量审批
*/
/*
@PostMapping("/auditbatch")
public ResponseResult updateDynamicRuleAuditStatusBatch(@RequestBody Map<Integer, Integer> idsWithAuditStatusMap) {
List<Integer> errorIds = new ArrayList<>();
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",dynamicRuleService.updateAuditStatusBatch(idsWithAuditStatusMap));
}
*/
}

4
src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java
View File

@@ -42,4 +42,8 @@ public interface TemplateMapper {
Integer queryUsedTemplateTotalNum();
Integer queryAuditTemplateTotalNum(Integer auditState);
Integer queryAuditStatusById(Integer id);
Boolean updateAuditStatusById(Integer id, Integer auditStatus);
}

67
src/main/java/com/realtime/protection/server/defense/template/TemplateService.java
View File

@@ -1,11 +1,14 @@
package com.realtime.protection.server.defense.template;
import com.realtime.protection.configuration.entity.defense.template.Template;
import lombok.SneakyThrows;
import com.realtime.protection.configuration.utils.enums.audit.AuditStatusValidator;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class TemplateService {
@@ -87,4 +90,66 @@ public class TemplateService {
public Integer queryAuditTemplateTotalNum(Integer auditState) {
return templateMapper.queryAuditTemplateTotalNum(auditState);
}
public Map<String, Object> updateAuditStatus(Integer id, Integer auditStatus) {
Integer originalAuditStatus = templateMapper.queryAuditStatusById(id);
if (originalAuditStatus == null) {
throw new IllegalArgumentException("cannot find audit status of static rule " + id + ", maybe static rule doesn't exist?");
}
if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) {
throw new IllegalArgumentException("invalid audit status");
}
Boolean success = templateMapper.updateAuditStatusById(id, auditStatus);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("success", success);
resultMap.put("audit_status", auditStatus);
return resultMap;
}
/*
public Map<String, Object> updateAuditStatus(Integer id, Integer auditStatus) {
Integer originalAuditStatus = templateMapper.queryAuditStatusById(id);
if (originalAuditStatus == null) {
throw new IllegalArgumentException("cannot find audit status of static rule " + id + ", maybe static rule doesn't exist?");
}
if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) {
throw new IllegalArgumentException("invalid audit status");
}
Boolean success = templateMapper.updateAuditStatusById(id, auditStatus);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("success", success);
resultMap.put("audit_status", auditStatus);
return resultMap;
}
public Object updateAuditStatusBatch(Map<Integer, Integer> idsWithAuditStatusMap) {
Function<DynamicRuleMapper, Function<Map<Integer, Integer>, Boolean>> updateDynamicRuleAuditStatusFunction =
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(DynamicRuleMapper.class, updateDynamicRuleAuditStatusFunction, idsWithAuditStatusMap);
}
*/
}

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

@@ -130,7 +130,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
public ResponseResult updateDynamicRuleAuditStatus(@PathVariable Integer id, @PathVariable Integer auditStatus) {
if (id <= 0 || auditStatus < 0 || auditStatus > 2) {
return new ResponseResult(400, "id or status is invalid")
.setData("staticRule_id", id)
.setData("dynamicRule_id", id)
.setData("success", false);
}
return ResponseResult.ok()

2
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java
View File

@@ -58,4 +58,6 @@ public interface DynamicRuleMapper {
Boolean updateAuditStatusById(Integer dynamicRuleId, Integer auditStatus);
void updateAuditStatusByIdBatch(@Param("idWithAuditStatusBatch") Map<Integer, Integer> idWithAuditStatusBatch);
List<Integer> queryAuditStatusByIds(@Param("idWithAuditStatusBatch") Map<Integer, Integer> idsWithAuditStatusMap);
}

22
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java
View File

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -211,6 +212,27 @@ public class DynamicRuleService {
}
public Object updateAuditStatusBatch(Map<Integer, Integer> idsWithAuditStatusMap) {
//校验id和status是否合法
List<Integer> originalAuditStatusList = dynamicRuleMapper.queryAuditStatusByIds(idsWithAuditStatusMap);
int index = 0;
List<Integer> errorIds = new ArrayList<>();
for(Map.Entry<Integer, Integer> entry: idsWithAuditStatusMap.entrySet()) {
Integer id = entry.getKey();
Integer auditStatus = entry.getValue();
Integer originalAuditStatus = originalAuditStatusList.get(index);
index++;
if (originalAuditStatus == null) {
errorIds.add(id);
}
if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) {
errorIds.add(id);
}
}
if (!errorIds.isEmpty()){
return new IllegalArgumentException("动态规则id不存在或无法修改为对应审核状态, errorIds: " + errorIds);
}
Function<DynamicRuleMapper, Function<Map<Integer, Integer>, Boolean>> updateDynamicRuleAuditStatusFunction =
mapper -> map -> {
if (map == null || map.isEmpty()) {

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

@@ -50,4 +50,6 @@ public interface StaticRuleMapper {
Integer queryUsedStaticRuleTotalNum();
Integer queryAuditStaticRuleTotalNum(@Param("auditStatus")Integer auditStatus);
List<Integer> queryAuditStatusByIds(@Param("idWithAuditStatusBatch") Map<Integer, Integer> idsWithAuditStatusMap);
}

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

@@ -235,6 +235,25 @@ public class StaticRuleService {
}
public Object updateAuditStatusBatch(Map<Integer, Integer> idsWithAuditStatusMap) {
//校验id和status是否合法
List<Integer> originalAuditStatusList = staticRuleMapper.queryAuditStatusByIds(idsWithAuditStatusMap);
int index = 0;
List<Integer> errorIds = new ArrayList<>();
for(Map.Entry<Integer, Integer> entry: idsWithAuditStatusMap.entrySet()) {
Integer id = entry.getKey();
Integer auditStatus = entry.getValue();
Integer originalAuditStatus = originalAuditStatusList.get(index);
index++;
if (originalAuditStatus == null) {
errorIds.add(id);
}
if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) {
errorIds.add(id);
}
}
if (!errorIds.isEmpty()){
return new IllegalArgumentException("静态规则id不存在或无法修改为对应审核状态, errorIds: " + errorIds);
}
Function<StaticRuleMapper, Function<Map<Integer, Integer>, Boolean>> updateStaticRuleAuditStatusFunction =
mapper -> map -> {

2
src/main/java/com/realtime/protection/server/task/TaskMapper.java
View File

@@ -66,4 +66,6 @@ public interface TaskMapper {
void updateAuditStatusByIdBatch(@Param("idWithAuditStatusBatch") Map<Integer, Integer> idWithAuditStatusBatch);
Integer queryAuditTaskTotalNum(Integer auditState);
List<Integer> queryAuditStatusByIds(@Param("idWithAuditStatusBatch") Map<Integer, Integer> idsWithAuditStatusMap);
}

25
src/main/java/com/realtime/protection/server/task/TaskService.java
View File

@@ -17,10 +17,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -324,6 +321,26 @@ public class TaskService {
}
public Object updateAuditStatusBatch(Map<Integer, Integer> idsWithAuditStatusMap) {
//校验id和status是否合法
List<Integer> originalAuditStatusList = taskMapper.queryAuditStatusByIds(idsWithAuditStatusMap);
int index = 0;
List<Integer> errorIds = new ArrayList<>();
for(Map.Entry<Integer, Integer> entry: idsWithAuditStatusMap.entrySet()) {
Integer id = entry.getKey();
Integer auditStatus = entry.getValue();
Integer originalAuditStatus = originalAuditStatusList.get(index);
index++;
if (originalAuditStatus == null) {
errorIds.add(id);
}
if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) {
errorIds.add(id);
}
}
if (!errorIds.isEmpty()){
return new IllegalArgumentException("动态规则id不存在或无法修改为对应审核状态, errorIds: " + errorIds);
}
Function<TaskMapper, Function<Map<Integer, Integer>, Boolean>> updateTaskAuditStatusFunction =
mapper -> map -> {
if (map == null || map.isEmpty()) {

8
src/main/resources/mappers/DynamicRuleMapper.xml
View File

@@ -283,6 +283,14 @@
from t_dynamic_rule
where dynamic_rule_id = #{dynamicRuleId}
</select>
<select id="queryAuditStatusByIds" resultType="java.lang.Integer">
select audit_status
from t_dynamic_rule
where dynamic_rule_id in
<foreach collection="idsWithAuditStatusMap" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
</mapper>

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

@@ -217,4 +217,13 @@
WHERE static_rule_audit_status = #{auditStatus}
</select>
<select id="queryAuditStatusByIds" resultType="java.lang.Integer">
SELECT static_rule_audit_status
FROM t_static_rule
WHERE static_rule_id IN
<foreach collection="idWithAuditStatusBatch" index="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
</mapper>

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

@@ -333,4 +333,12 @@
SELECT COUNT(*) FROM t_task
WHERE task_audit_status = #{auditStatus}
</select>
<select id="queryAuditStatusByIds" resultType="java.lang.Integer">
SELECT task_audit_status
FROM t_task
WHERE task_id IN
<foreach collection="idWithAuditStatusBatch" item="taskId" open="(" separator="," close=")">
#{taskId}
</foreach>
</select>
</mapper>

13
src/main/resources/mappers/TemplateMapper.xml
View File

@@ -36,6 +36,7 @@
<result column="strategy_template_used_times" property="usedTimes"/>
<result column="strategy_template_running_tasks" property="runningTasks"/>
<result column="strategy_template_description" property="description"/>
<result column="audit_status" property="auditStatus"/>
<association property="protectLevelLow"
javaType="com.realtime.protection.configuration.entity.defense.template.ProtectLevel">
@@ -157,6 +158,12 @@
WHERE audit_state = #{auditState}
</select>
<select id="queryAuditStatusById" resultType="java.lang.Integer">
SELECT audit_state
FROM t_strategy_template
WHERE strategy_template_id = #{id}
</select>
<update id="updateTemplateInformation">
UPDATE t_strategy_template
<set>
@@ -168,4 +175,10 @@
AND strategy_template_id = #{template.templateId}
</where>
</update>
<update id="updateAuditStatusById">
UPDATE t_strategy_template
SET audit_state = #{auditState}
WHERE strategy_template_id = #{id}
</update>
</mapper>

17
src/test/java/com/realtime/protection/server/defense/template/TemplateServiceTest.java
View File

@@ -68,7 +68,7 @@ class TemplateServiceTest extends ProtectionApplicationTests {
System.out.println(e.getMessage());
}
for (int i = 0; i < 10; i++) {
for (int i = 0; i < 2; i++) {
assertThrows(DuplicateKeyException.class, () -> {
Integer templateId = templateService.newTemplate(template);
assertTrue(templateId > 0);
@@ -84,13 +84,14 @@ class TemplateServiceTest extends ProtectionApplicationTests {
@Test
void testQueryTemplate() {
List<Template> templates = templateService.queryTemplates(
"DDOS", null, null,1, 5);
assertEquals(5, templates.size());
for (Template template : templates) {
assertTrue(template.getTemplateId() > 0);
assertNotNull(template.getUsedTimes());
assertNotNull(template.getRunningTasks());
}
null, null, null,1, 5);
templates.forEach(item -> System.out.println(item)) ;
//// assertEquals(5, templates.size());
// for (Template template : templates) {i
// assertTrue(template.getTemplateId() > 0);
// assertNotNull(template.getUsedTimes());
// assertNotNull(template.getRunningTasks());
// }
}
@Test

6
src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java
View File

@@ -105,9 +105,9 @@ public class StaticRuleServiceTest extends ProtectionApplicationTests {
@Test
void testUpdateStaticRuleAuditStatusBatch(){
Map<Integer, Integer> map = new HashMap<>();
map.put(1299, 0);
map.put(1300, 1);
map.put(1301, 1);
map.put(1325, 0);
map.put(1326, 1);
map.put(1328, 1);
System.out.println(staticRuleService.updateAuditStatusBatch(map));