xbase-util 0.7.9__tar.gz → 0.8.1__tar.gz

{xbase_util-0.7.9 → xbase_util-0.8.1}/PKG-INFO

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

{xbase_util-0.7.9 → xbase_util-0.8.1}/setup.py

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

{xbase_util-0.7.9 → xbase_util-0.8.1}/test/test.py

@@ -4,6 +4,8 @@ import pickle
 import re
 import traceback
 
+from requests import session
+
 from xbase_util.packet_util import filter_visible_chars
 from xbase_util.pcap_util import reassemble_tcp, reassemble_session
 
@@ -30,7 +32,7 @@ if __name__ == '__main__':
         packet_objs = pickle.load(f)
     skey = f"10.28.7.16:54398"
     reassemble_tcp_res = reassemble_tcp(packet_objs, skey)
-    all_packets = reassemble_session(reassemble_tcp_res, skey)
+    all_packets = reassemble_session(reassemble_tcp_res, skey,session_id="emm")
     time_period = [( abs(item['res_time']-item['req_time'])) for item in
                    all_packets if item['res_time'] != 0 and item['req_time'] != 0]
     print(all_packets)

{xbase_util-0.7.9 → xbase_util-0.8.1}/xbase_util/pcap_util.py

@@ -56,7 +56,7 @@ def decompress_streaming(compressed_data, session_id):
         return bytearray()
 
 
-def reassemble_tcp(packets, skey, num_packets=1000):
+def reassemble_tcp(packets, num_packets=1000):
     packets2 = []
     info = {}
     keys = []
@@ -121,7 +121,7 @@ def reassemble_tcp(packets, skey, num_packets=1000):
         return a['tcp']['ack'] - (b['tcp']['seq'] + len(b['tcp']['data']) - 1)
 
     packets.sort(key=cmp_to_key(compare_packets))
-    del packets[num_packets:]
+    # del packets[num_packets:]
     # Now divide up conversation
     clientSeq = 0
     hostSeq = 0
@@ -165,7 +165,7 @@ def reassemble_tcp(packets, skey, num_packets=1000):
     return results
 
 
-def parse_req_or_res1(data):
+def parse_req_or_res(data,session_id=None):
     if data.find(b"\r\n\r\n") != -1:
         res = data.split(b"\r\n\r\n", 1)
         header = res[0]
@@ -217,6 +217,7 @@ def parse_req_or_res1(data):
                 [line.strip() for line in filter_visible_chars(decompressed).splitlines() if
                  line.strip() != ""])
         except Exception as e:
+            print(f"session_id:{session_id}")
             traceback.print_exc()
             result_body_str = filter_visible_chars(result_body)
     else:
@@ -224,7 +225,7 @@ def parse_req_or_res1(data):
     return filter_visible_chars(header), result_body_str
 
 
-def reassemble_session(reassemble_tcp_res, skey):
+def reassemble_session(reassemble_tcp_res, skey,session_id=None):
     my_map = {
         'key':'',
         'req_header': '',
@@ -238,7 +239,7 @@ def reassemble_session(reassemble_tcp_res, skey):
     }
     packet_list = []
     for index, packet in enumerate(reassemble_tcp_res):
-        header, body = parse_req_or_res1(packet['data'])
+        header, body = parse_req_or_res(packet['data'],session_id)
         if index == len(reassemble_tcp_res) - 1:
             packet_list.append(copy.deepcopy(my_map))
         if packet['key'] == skey:

{xbase_util-0.7.9 → xbase_util-0.8.1}/xbase_util.egg-info/PKG-INFO

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