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

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

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

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

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

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

@@ -98,14 +98,20 @@ 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 and 'req_text' in packet])
+        print(type(packet))
+        if is_req is True and 'req_text' in packet:
+            a = packet['req_text']
+            print(f"req_text类型：{a}")
+            return "".join([item for item in f"{a}".split("\r\n\r\n") if "HTTP/" not in item])
+        elif is_req is False and 'res_text' in packet:
+            a = packet['res_text']
+            print(f"res_text类型：{a}")
+            return "".join([item for item in f"{a}".split("\r\n\r\n") if "HTTP/" not in item])
         else:
-            return "".join([item for item in packet['res_text'].split("\r\n\r\n") if "HTTP/" not in item and 'res_text' in packet])
+            print("里面没有")
+            return ""
     except Exception as e:
-        print("-"*30)
-        print(type(packet['req_text']))
-        print(type(packet['res_text']))
+        print("-" * 30)
         traceback.print_exc()
         return ""
 

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

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