From e292042e96b78a92dfa7df8a02de77093c46e8a8 Mon Sep 17 00:00:00 2001 From: Hao Miao <47212914+PushM@users.noreply.github.com> Date: Sun, 28 Apr 2024 10:24:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E4=BF=AE=E6=94=B9=EF=BC=8Cauditstatus?= =?UTF-8?q?=E4=B8=BAstring=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/entity/whitelist/WhiteListObject.java | 2 +- .../realtime/protection/server/whitelist/WhiteListService.java | 2 +- .../protection/server/whitelist/WhiteListServiceTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java b/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java index 6d00af3..05dfe93 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java +++ b/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java @@ -60,5 +60,5 @@ public class WhiteListObject { @JsonProperty("audit_status") @ExcelIgnore @Schema(description = "白名单对象审核状态（0为未审核，1为已退回，2为审核通过）", example = "2") - private String whiteListAuditStatus; + private Integer whiteListAuditStatus; } diff --git a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java index 2cc4005..4057e3c 100644 --- a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java +++ b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java @@ -107,7 +107,7 @@ public class WhiteListService { throw new IllegalStateException("无法修改白名单信息，因为其并未处于" + AuditStatusEnum.AUDITED + "状态"); } - object.setWhiteListAuditStatus(AuditStatusEnum.PENDING.toString()); + object.setWhiteListAuditStatus(AuditStatusEnum.PENDING.getNum()); return whiteListMapper.updateWhiteListObject(id, object); } diff --git a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java index 0da4d07..4c56573 100644 --- a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java +++ b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java @@ -67,7 +67,7 @@ class WhiteListServiceTest extends ProtectionApplicationTests { //object.setWhiteListId(7); object.setWhiteListName("test_update"); - whiteListService.updateWhiteListObject(7, object); + whiteListService.updateWhiteListObject(7189, object); } @Test From 125ed9dd187ddf4359dedcfed6151a23363fe4db Mon Sep 17 00:00:00 2001 From: Hao Miao <47212914+PushM@users.noreply.github.com> Date: Sun, 28 Apr 2024 10:24:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E4=BF=AE=E6=94=B9=EF=BC=8Cauditstatus?= =?UTF-8?q?=E4=B8=BAstring=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/entity/whitelist/WhiteListObject.java | 2 +- .../realtime/protection/server/whitelist/WhiteListService.java | 2 +- .../protection/server/whitelist/WhiteListServiceTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java b/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java index 6d00af3..05dfe93 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java +++ b/src/main/java/com/realtime/protection/configuration/entity/whitelist/WhiteListObject.java @@ -60,5 +60,5 @@ public class WhiteListObject { @JsonProperty("audit_status") @ExcelIgnore @Schema(description = "白名单对象审核状态（0为未审核，1为已退回，2为审核通过）", example = "2") - private String whiteListAuditStatus; + private Integer whiteListAuditStatus; } diff --git a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java index 2cc4005..4057e3c 100644 --- a/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java +++ b/src/main/java/com/realtime/protection/server/whitelist/WhiteListService.java @@ -107,7 +107,7 @@ public class WhiteListService { throw new IllegalStateException("无法修改白名单信息，因为其并未处于" + AuditStatusEnum.AUDITED + "状态"); } - object.setWhiteListAuditStatus(AuditStatusEnum.PENDING.toString()); + object.setWhiteListAuditStatus(AuditStatusEnum.PENDING.getNum()); return whiteListMapper.updateWhiteListObject(id, object); } diff --git a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java index 0da4d07..4c56573 100644 --- a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java +++ b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java @@ -67,7 +67,7 @@ class WhiteListServiceTest extends ProtectionApplicationTests { //object.setWhiteListId(7); object.setWhiteListName("test_update"); - whiteListService.updateWhiteListObject(7, object); + whiteListService.updateWhiteListObject(7189, object); } @Test From aef78a55b55f51f409f8b5f8b73397d22412f10f Mon Sep 17 00:00:00 2001 From: Hao Miao <47212914+PushM@users.noreply.github.com> Date: Sun, 28 Apr 2024 10:54:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dquery=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=A7=84=E5=88=99=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=98=B2=E6=8A=A4=E7=AD=89=E7=BA=A7=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/DynamicRuleMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mappers/DynamicRuleMapper.xml b/src/main/resources/mappers/DynamicRuleMapper.xml index 5f387a0..a85038b 100644 --- a/src/main/resources/mappers/DynamicRuleMapper.xml +++ b/src/main/resources/mappers/DynamicRuleMapper.xml @@ -146,7 +146,7 @@ - + From 7429ef37a0afab5f0eb316d9597604284d4c48dc Mon Sep 17 00:00:00 2001 From: Hao Miao <47212914+PushM@users.noreply.github.com> Date: Sun, 28 Apr 2024 16:34:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=96=B0fake=5Fdynamic?= =?UTF-8?q?=5Ftest=E7=9A=84fakecc=5Ftest=5Fsend2.py=E6=96=87=E4=BB=B6=202?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9fakecc=5Ftest=5Fsend2.py=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fake_dynamic_test/fakecc_test_send2.py | 25 ++++++++++++++++++++++--- fake_dynamic_test/main.py | 2 +- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/fake_dynamic_test/fakecc_test_send2.py b/fake_dynamic_test/fakecc_test_send2.py index 14e3dc1..392640b 100644 --- a/fake_dynamic_test/fakecc_test_send2.py +++ b/fake_dynamic_test/fakecc_test_send2.py @@ -5,6 +5,17 @@ import json app = Flask(__name__) +import socket +import struct + + +def convert_ipv4_to_int(ip_str): + binary_ip = socket.inet_aton(ip_str) + # 使用 struct.unpack 解包二进制数据到一个大端整数 + ip_int = struct.unpack('!I', binary_ip)[0] + return ip_int + + def convert_ipv4_address(ip_int): return socket.inet_ntoa(struct.pack('!I', ip_int)) @@ -31,6 +42,7 @@ def format_data_to_json(test_data): src_ip_v4, dst_ip_v4, src_port_v4, dst_port_v4, protocol_v4 = parse_and_convert_ip(data_parts[1]) + formatted_data = { "task_id": 30650, "rule_id": 39, @@ -96,19 +108,26 @@ def kafka_send(): if request.method == 'POST' and request.is_json: data = request.get_json() - base_data = "1702017420-1-175833107,1921297587-310737541-53420-6379-6-127-0,140717936336976-140717936336992-0-0-0-131-4481,0,000,440000,1,7,107,1,111,Amazon Data Services UK,0,0,440100,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,,9,10060101189,tcp.banner=$5115" + base_data = "1702017420-1-175833107,2682412653-760391609-53420-6379-6-127-0,140717936336976-140717936336992-0-0-0-131-4481,0,000,440000,1,7,107,1,111,Amazon Data Services UK,0,0,440100,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,,9,10060101189,tcp.banner=$5115" + base_data2 = "1702017420-1-175833107,760391609-2682412653-53420-6379-6-127-0,140717936336976-140717936336992-0-0-0-131-4481,0,000,440000,1,7,107,1,111,Amazon Data Services UK,0,0,440100,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,,9,10060101189,tcp.banner=$5115" + for item in data: task_id = item.get('task_id', '') rule_id = item.get('rule_id', '') modified_data = f"{base_data}, {task_id}, {rule_id},{0}" + modified_data2 = f"{base_data2}, {task_id}, {rule_id},{0}" HOST = '127.0.0.1' PORT = 65432 + print(modified_data) send_test_data(HOST, PORT, modified_data) + send_test_data(HOST, PORT, modified_data2) - return jsonify({'message': 'Data processed successfully'}), 200 + return jsonify({"success": True, "code": 200}), 200 return jsonify({'error': 'Invalid request'}), 400 if __name__ == "__main__": - app.run(host='0.0.0.0', port=8081, debug=True) \ No newline at end of file + print("convert_ipv4_to_int:", convert_ipv4_to_int("159.226.94.109")) + print("convert_ipv4_to_int:", convert_ipv4_to_int("45.82.167.185")) + app.run(host='0.0.0.0', port=8088, debug=True) \ No newline at end of file diff --git a/fake_dynamic_test/main.py b/fake_dynamic_test/main.py index 1d07ecd..4339026 100644 --- a/fake_dynamic_test/main.py +++ b/fake_dynamic_test/main.py @@ -100,5 +100,5 @@ def start_server(host, port, topic): if __name__ == "__main__": HOST = '127.0.0.1' PORT = 65432 - TOPIC = 'topic-test' + TOPIC = 'topic-alert' start_server(HOST, PORT, TOPIC)