xbase-util 0.5.2__tar.gz → 0.5.3__tar.gz

{xbase_util-0.5.2 → xbase_util-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase_util
-Version: 0.5.2
+Version: 0.5.3
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt

{xbase_util-0.5.2 → xbase_util-0.5.3}/setup.py

@@ -3,7 +3,7 @@ from distutils.core import setup
 from setuptools import find_packages
 
 setup(name="xbase_util",
-      version="0.5.2",
+      version="0.5.3",
       description="网络安全基础工具",
       long_description="包含提取，预测，训练的基础工具",
       author="xyt",

{xbase_util-0.5.2 → xbase_util-0.5.3}/xbase_util/packet_util.py

@@ -66,57 +66,84 @@ req_body_pattern = re.compile(
 
 
 def get_all_packets_by_reg(packets):
-    packets = [packet for packet in packets if packet.haslayer(TCP) and packet.haslayer(IP) and packet.haslayer(Raw)]
-    packet_list = []
-    my_map = {
-        'req_data': b'',
-        'res_data': b'',
-        'req_text': '',
-        'res_text': '',
-        'req_time': [],
-        'res_time': []
-    }
-    last_is_req = None
-    for item in packets:
-        data = item[Raw].load
-        time = float(item.time)
-        req_match = req_pattern.search(filter_visible_chars(data))
-        res_match = res_pattern.search(filter_visible_chars(data))
-        if req_match is not None or res_match is not None:
-            if req_match:
-                # 新的请求：请求时间不为空或者响应时间不为空，说明不为空，添加到列表并清空数据
-                if len(my_map['req_time']) != 0 or len(my_map['res_time']) != 0:
-                    packet_list.append(my_map.copy())
-                my_map = {
-                    'req_data': data,
-                    'res_data': b'',
-                    'req_text': filter_visible_chars(data),
-                    'res_text': '',
-                    'req_time': [time],
-                    'res_time': []
-                }
-                last_is_req = True
-            if res_match:
-                my_map['res_data'] += data
-                my_map['res_text'] = filter_visible_chars(my_map['res_data'])
-                my_map['res_time'].append(time)
-                last_is_req = False
-        else:
-            # 不是请求不是相应，就是中间的包
-            if last_is_req is None:
-                # 一开始就没匹配到请求或者响应头，那就不管即使是中间的包
-                continue
-            if last_is_req is True:
-                my_map['req_time'].append(time)
-                my_map['req_data'] += data
-                my_map['req_text'] = filter_visible_chars(my_map['req_data'])
-            elif last_is_req is False:
-                my_map['res_time'].append(time)
-                my_map['res_data'] += data
-                my_map['res_text'] = filter_visible_chars(my_map['res_data'])
-    if len(my_map['req_time']) != 0 or len(my_map['res_time']) != 0:
-        packet_list.append(my_map.copy())
+    http_Req_Raw = {}
+    http_methods = ("POST /", "PUT /", "OPTIONS /", "DELETE /", "GET /")
+    for packet in packets:
+        if TCP in packet and Raw in packet:
+            data = packet[Raw].load
+            ack = packet[TCP].ack
+            next_ack = packet[TCP].seq + len(data)
+            if ack not in http_Req_Raw:
+                http_Req_Raw[ack] = {"time": [packet.time], "data": data, "next_ack": next_ack}
+            else:
+                http_Req_Raw[ack]["time"].append(packet.time)
+                http_Req_Raw[ack]["data"] += data
+                http_Req_Raw[ack]["next_ack"] = next_ack
+    packet_list = [
+        {
+            'req_data': item['data'],
+            'res_data': http_Req_Raw[item['next_ack']]['data'],
+            'req_text': filter_visible_chars(item['data']),
+            'res_text': filter_visible_chars(http_Req_Raw[item['next_ack']]['data']),
+            'req_time': item['time'],
+            'res_time': http_Req_Raw[item['next_ack']]['time']
+        }
+        for ack, item in http_Req_Raw.items()
+        if any(method in filter_visible_chars(item['data']) for method in http_methods)
+    ]
     return packet_list
+# def get_all_packets_by_reg(packets):
+#     packets = [packet for packet in packets if packet.haslayer(TCP) and packet.haslayer(IP) and packet.haslayer(Raw)]
+#     packet_list = []
+#     my_map = {
+#         'req_data': b'',
+#         'res_data': b'',
+#         'req_text': '',
+#         'res_text': '',
+#         'req_time': [],
+#         'res_time': []
+#     }
+#     last_is_req = None
+#     for item in packets:
+#         data = item[Raw].load
+#         time = float(item.time)
+#         req_match = req_pattern.search(filter_visible_chars(data))
+#         res_match = res_pattern.search(filter_visible_chars(data))
+#         if req_match is not None or res_match is not None:
+#             if req_match:
+#                 # 新的请求：请求时间不为空或者响应时间不为空，说明不为空，添加到列表并清空数据
+#                 if len(my_map['req_time']) != 0 or len(my_map['res_time']) != 0:
+#                     packet_list.append(my_map.copy())
+#                 my_map = {
+#                     'req_data': data,
+#                     'res_data': b'',
+#                     'req_text': filter_visible_chars(data),
+#                     'res_text': '',
+#                     'req_time': [time],
+#                     'res_time': []
+#                 }
+#                 last_is_req = True
+#             if res_match:
+#                 my_map['res_data'] += data
+#                 my_map['res_text'] = filter_visible_chars(my_map['res_data'])
+#                 my_map['res_time'].append(time)
+#                 last_is_req = False
+#         else:
+#             # 不是请求不是相应，就是中间的包
+#             if last_is_req is None:
+#                 # 一开始就没匹配到请求或者响应头，那就不管即使是中间的包
+#                 continue
+#             if last_is_req is True:
+#                 my_map['req_time'].append(time)
+#                 my_map['req_data'] += data
+#                 my_map['req_text'] = filter_visible_chars(my_map['req_data'])
+#             elif last_is_req is False:
+#                 my_map['res_time'].append(time)
+#                 my_map['res_data'] += data
+#                 my_map['res_text'] = filter_visible_chars(my_map['res_data'])
+#     if len(my_map['req_time']) != 0 or len(my_map['res_time']) != 0:
+#         packet_list.append(my_map.copy())
+#     return packet_list
 
 
 def get_body(param):

{xbase_util-0.5.2 → xbase_util-0.5.3}/xbase_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase-util
-Version: 0.5.2
+Version: 0.5.3
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt