xbase-util 0.9.2__tar.gz → 0.9.4__tar.gz

{xbase_util-0.9.2 → xbase_util-0.9.4}/PKG-INFO

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

{xbase_util-0.9.2 → xbase_util-0.9.4}/setup.py

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

{xbase_util-0.9.2 → xbase_util-0.9.4}/xbase_util/pcap_util.py

@@ -2,6 +2,7 @@ import copy
 import gzip
 import math
 import os
+import re
 import struct
 import time
 import traceback
@@ -247,9 +248,7 @@ def get_file_and_read_pos(session_id, file, pos_list):
         packets[i] = packet_bytes
         while next_packet in packets:
             buffer = packets[next_packet]
-
-            next_packet += 1
-            # del packets[next_packet]
+            del packets[next_packet]
             next_packet = next_packet + 1
             if b_offset + len(buffer) > len(byte_array):
                 res.extend(byte_array[:b_offset])
@@ -274,7 +273,11 @@ def process_session_id_disk_simple(id, node, packet_pos, esdb, pcap_path_prefix)
     pos_list.pop(0)
     return get_file_and_read_pos(id, file, pos_list)
 
-
+def normalize_spaces_and_newlines(text):
+    text = re.sub(r' +', ' ', text)
+    # 将连续多个 \n 替换为一个 \n
+    text = re.sub(r'\n{2,}', '\n', text)
+    return text
 def parse_body(data, skey='', session_id='none'):
     if data.find(b"\r\n\r\n") != -1:
         res = data.split(b"\r\n\r\n", 1)
@@ -295,7 +298,7 @@ def parse_body(data, skey='', session_id='none'):
             traceback.print_exc()
             print(f"解压失败:{skey} {session_id}")
             body = b''
-    return filter_visible_chars(header), filter_visible_chars(body)
+    return filter_visible_chars(header), normalize_spaces_and_newlines(filter_visible_chars(body))
 
 
 def reassemble_session_pcap(reassemble_tcp_res, skey, session_id='none'):

{xbase_util-0.9.2 → xbase_util-0.9.4}/xbase_util.egg-info/PKG-INFO

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

{xbase_util-0.9.2 → xbase_util-0.9.4}/xbase_util.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ xbase_util/geo_util.py
 xbase_util/handle_features_util.py
 xbase_util/packet_util.py
 xbase_util/pcap_util.py
-xbase_util/test.py
 xbase_util/xbase_constant.py
 xbase_util.egg-info/PKG-INFO
 xbase_util.egg-info/SOURCES.txt

xbase_util-0.9.2/xbase_util/test.py

@@ -1,9 +0,0 @@
-from scapy.utils import rdpcap
-
-from xbase_util.pcap_util import reassemble_tcp_pcap, reassemble_session_pcap
-
-if __name__ == '__main__':
-    packets_scapy = reassemble_tcp_pcap(rdpcap("test.pcap"))
-    skey = '10.28.7.6:53867'
-    all_packets = reassemble_session_pcap(packets_scapy, skey=skey,session_id='emmmmm')
-    print(all_packets)