gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136 Commits 2 Branches 0 Tags
fbde83ea5784cb4dc572a830f5a89be916d929e4
Commit Graph

127 Commits

Author SHA1 Message Date
PushM
fbde83ea57 Merge remote-tracking branch 'origin/master' into haskafka 2024-04-23 21:10:33 +08:00
PushM
e059afb216 1、commandmapper中TASK_NAME有误，改为TASKNAME 2024-04-23 21:09:13 +08:00
PushM
b03eb6e993 1、新增任务批量审核接口 2024-04-23 21:05:04 +08:00
EnderByEndera
161bc45994 nginx配置中，将upstream的least_conn修改为ip_hash以保持会话（暂时方案） 2024-04-23 15:55:02 +08:00
EnderByEndera
f8d707df00 1. 动态规则发送筛选条件时新增“日志规则ID”字段 
2. 解决防护对象未返回IP字段错误
3. 将queryTasks中的auditStatus从Boolean改为Integer
 2024-04-23 12:15:07 +08:00
EnderByEndera
5e67c8a68a 1. 动态规则发送筛选条件时新增“日志规则ID”字段 
2. 解决防护对象未返回IP字段错误
3. 将queryTasks中的auditStatus从Boolean改为Integer
 2024-04-23 12:14:59 +08:00
EnderByEndera
05c2fa068c Merge remote-tracking branch 'origin/master' 2024-04-22 15:08:01 +08:00
EnderByEndera
e5e2e4d72f 1. 当任务/规则等发生修改时，审核状态将从已审核变为未审核 
2. 查询任务多出一个“审核状态”查询条件，允许查询审核状态为”已审核“和非”已审核“状态的所有任务
 2024-04-22 15:07:49 +08:00
root
d8264f11e0 Merge remote-tracking branch 'origin/master' into haskafka 2024-04-22 14:48:13 +08:00
PushM
234564f628 Merge remote-tracking branch 'origin/master' 2024-04-17 22:16:39 +08:00
PushM
da56058469 1、TaskCommandIndo删去了depart，使用taskCreateDepart，修改mapper也同步使用taskCreateDepart 
2、新增静态规则批量审核功能，post请求body为id和auditStatus的Map，入库使用sqlSessionWrapper，test已通过
3、动态任务接收alertmessage，查询DynamicTaskInfos生成command时，新增关联t_strategy_template表，select查询新增查询局点dynamic_rule_range、事件类型strategy_template_name字段
 2024-04-17 22:05:32 +08:00
PushM
c6334cee56 1、TaskCommandIndo删去了depart，使用taskCreateDepart，修改mapper也同步使用taskCreateDepart 
2、新增静态规则批量审核功能，post请求body为id和auditStatus的Map，入库使用sqlSessionWrapper，test已通过
3、动态任务接收alertmessage，查询DynamicTaskInfos生成command时，新增关联t_strategy_template表，select查询新增查询局点dynamic_rule_range、事件类型strategy_template_name字段
 2024-04-17 22:04:29 +08:00
EnderByEndera
7e990754b9 1. 重构审核状态，将其转换为状态模式，添加Using状态（使用中） 
2. 策略模板添加方法，通过反射判断防护等级中是否有字段为true
 2024-04-17 14:01:46 +08:00
EnderByEndera
de6437b8b0 1. 审核状态添加“草稿” 
2. 添加指令中“任务名称，事件类型，局点，部门四个字段
 2024-04-15 11:25:54 +08:00
EnderByEndera
9ceb2e583e 1. 解除动态规则发送请求成功/失败返回状态 
2. 在指令中添加局点/部门信息
 2024-04-11 08:56:35 +08:00
Hao Miao
6a4558a2af Merge remote-tracking branch 'origin/master' into haskafka 
# Conflicts:
#	src/main/resources/nginx/defense/css/app.ee6094cd.css
#	src/main/resources/nginx/defense/css/chunk-015a3ee5.6a3c9ed3.css
#	src/main/resources/nginx/defense/css/chunk-17b3460d.c80b66ce.css
#	src/main/resources/nginx/defense/js/chunk-855887e8.c53330cd.js
#	src/main/resources/nginx/defense/js/fail.e190e5d9.js
#	src/main/resources/nginx/defense/js/user.17caa144.js
 2024-04-10 15:49:30 +08:00
EnderByEndera
5e17aa5e60 Merge remote-tracking branch 'origin/master' 2024-04-10 15:45:18 +08:00
EnderByEndera
b98813791c 1. 修复指令协议字段为Null的bug 
2. 添加fake动态规则生成代码（python）
 2024-04-10 15:45:09 +08:00
Hao Miao
b36df434bf 1、前端20240408更新至gitlab 2024-04-08 22:53:53 +08:00
Hao Miao
9a2dfb0c9e 1、前端20240408更新至gitlab 2024-04-08 20:53:51 +08:00
Hao Miao
f14b7597ef 1、前端20240408更新至gitlab 2024-04-08 18:32:44 +08:00
Hao Miao
75ef623f49 Merge remote-tracking branch 'origin/master' into haskafka 2024-04-08 18:13:53 +08:00
EnderByEndera
18a3e1529e Merge remote-tracking branch 'origin/master' 2024-04-08 16:27:33 +08:00
EnderByEndera
4a4f5f8c00 修改logRuleId字段类型为Long 2024-04-08 16:27:21 +08:00
Hao Miao
13f7c5642e 1、前端20240406更新至gitlab 2024-04-06 21:38:42 +08:00
Hao Miao
96d7ac7780 Merge remote-tracking branch 'origin/master' into haskafka 2024-04-06 21:32:00 +08:00
Hao Miao
bc2d1f0458 1、com.realtime.protection.configuration.auth中Application类注释掉路径过滤，因为会出现bug 2024-04-06 21:30:41 +08:00
Hao Miao
556eff88ea 1、Template对象description删去@NotNull注解 2024-04-03 17:21:33 +08:00
Hao Miao
8b8c5815cc 1、新增用户登录接口 2024-04-02 15:41:44 +08:00
Hao Miao
0ea3fe40c7 1、修改一些告警信息模板匹配的bug 2024-04-01 15:48:11 +08:00
Hao Miao
6b2b4c1e2e Merge branch 'master' into haskafka 2024-04-01 12:46:06 +08:00
Hao Miao
22ada4590e Merge remote-tracking branch 'origin/master' 2024-04-01 11:28:35 +08:00
Hao Miao
1aa587f52c 1、更新策略模板增删改查和alertmessage的模板处理，增加is_full_flow和description字段 2024-04-01 11:17:32 +08:00
EnderByEndera
97742fa87b 在application.yml中添加MySQL连接时区设置，解决时间错误问题 2024-03-18 17:45:49 +08:00
Hao Miao
3d717a8f92 1、前端版本0229，更新至gitlab 2024-03-11 16:29:41 +08:00
Hao Miao
bdafcf48b5 1、前端版本0229，更新至gitlab 2024-03-11 16:25:16 +08:00
Hao Miao
98c1c5b527 Merge remote-tracking branch 'origin/master' into haskafka 2024-03-11 16:09:32 +08:00
Hao Miao
8c64d0492f 1、alertmssage入库增加alertmssage的uuid 
2、数据库新建语法增加新列
3、StateHandler.java 的handleJudgedTaskStart和handleDynamicTaskStart不执行sendFilters，因为那边还没实现接收。我们这边sendFilters会报错 无法解析url
4、前端转圈问题，更新nginx配置
 2024-03-11 16:05:59 +08:00
Hao Miao
e7c797e95b 1、bug修复 2024-03-10 00:21:32 +08:00
Hao Miao
282e598305 Merge remote-tracking branch 'origin/master' into haskafka 2024-02-28 15:29:28 +08:00
Hao Miao
b0ba80a398 1、前端更新，有些文件缺失 2024-02-28 15:17:03 +08:00
Hao Miao
621c7d116c 1、生产者测试 2024-02-02 00:24:54 +08:00
Hao Miao
ef302a2bab Merge remote-tracking branch 'origin/master' into haskafka 2024-02-01 23:57:12 +08:00
Hao Miao
28d671ac16 1、前端更新 2024-02-01 22:05:10 +08:00
Hao Miao
248119d73f Merge remote-tracking branch 'origin/master' into haskafka 
# Conflicts:
#	docker-nginx/Dockerfile
#	docker-springboot/Dockerfile
 2024-02-01 17:28:57 +08:00
Hao Miao
5a44af9624 Merge remote-tracking branch 'origin/master' 2024-02-01 16:48:27 +08:00
Hao Miao
802f434e14 1、修改queryDynamicRuleTotalNum缺少left join的bug 2024-02-01 16:45:11 +08:00
Hao Miao
5af92950ee 1、修改@KafkaListener id topic为固定值 2024-02-01 16:02:24 +08:00
Hao Miao
6cab8d2fa5 1、修改dockerfile网络配置 
2、prod.xml增加kafka配置
 2024-02-01 12:53:32 +08:00
Hao Miao
ef637d15b3 Merge branch 'master' into haskafka 2024-02-01 09:44:25 +08:00