xbase-util 0.5.9__tar.gz → 0.6.1__tar.gz

{xbase_util-0.5.9 → xbase_util-0.6.1}/PKG-INFO

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

{xbase_util-0.5.9 → xbase_util-0.6.1}/setup.py

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

{xbase_util-0.5.9 → xbase_util-0.6.1}/xbase_util/packet_util.py

@@ -99,15 +99,13 @@ def get_all_packets_by_reg(packets):
 def get_body(packet, is_req):
     try:
         if is_req:
-            return "".join([item for item in packet['req_text'].split("\r\n\r\n") if "HTTP/" not in item])
+            return "".join([item for item in packet['req_text'].split("\r\n\r\n") if "HTTP/" not in item and 'req_text' in packet])
         else:
-            return "".join([item for item in packet['res_text'].split("\r\n\r\n") if "HTTP/" not in item])
+            return "".join([item for item in packet['res_text'].split("\r\n\r\n") if "HTTP/" not in item and 'res_text' in packet])
     except Exception as e:
-        print("emmmmm")
-        if is_req:
-            print(packet['req_text'])
-        else:
-            print(packet['res_text'])
+        print("-"*30)
+        print(type(packet['req_text']))
+        print(type(packet['res_text']))
         traceback.print_exc()
         return ""
 

{xbase_util-0.5.9 → xbase_util-0.6.1}/xbase_util.egg-info/PKG-INFO

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