xbase-util 0.5.6__tar.gz → 0.5.8__tar.gz

{xbase_util-0.5.6 → xbase_util-0.5.8}/PKG-INFO

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

{xbase_util-0.5.6 → xbase_util-0.5.8}/setup.py

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

{xbase_util-0.5.6 → xbase_util-0.5.8}/xbase_util/packet_util.py

@@ -95,8 +95,11 @@ def get_all_packets_by_reg(packets):
     return packet_list
 
 
-def get_body(packet):
-    return "".join([item for item in packet['res_text'].split("\r\n\r\n")if "HTTP/"not in item])
+def get_body(packet,is_req):
+    if is_req:
+        return "".join([item for item in packet['req_text'].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])
 
 
 def get_header_value(header_set, value):
@@ -143,9 +146,9 @@ def get_detail_by_package(packets_from_pcap, publicField, use_regx):
         res_field['plain_body_src'] = ""
         res_field['plain_body_dst'] = ""
         if content_type_is_plain(req):
-            res_field['plain_body_src'] = get_body(req)
+            res_field['plain_body_src'] = get_body(req,is_req=True)
         if content_type_is_plain(res):
-            res_field['plain_body_dst'] = get_body(res)
+            res_field['plain_body_dst'] = get_body(res,is_req=False)
 
     response_lines = res.strip().split("\n")
     http_response_lines = [item for item in response_lines if "HTTP" in item]

{xbase_util-0.5.6 → xbase_util-0.5.8}/xbase_util.egg-info/PKG-INFO

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