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

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

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

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

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

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

@@ -96,22 +96,10 @@ def get_all_packets_by_reg(packets):
     return packet_list
 
 
-def get_body(packet, is_req):
+def get_body(packet):
     try:
-        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:
-            print("里面没有")
-            return ""
-    except Exception as e:
-        print("-" * 30)
+        return "".join([item for item in packet.split("\r\n\r\n") if "HTTP/" not in item])
+    except Exception:
         traceback.print_exc()
         return ""
 
@@ -133,8 +121,8 @@ def get_detail_by_package(packets_from_pcap, publicField, use_regx):
     """
     res_field = publicField.copy()
     if use_regx:
-        req = packets_from_pcap['req_text']
-        res = packets_from_pcap['res_text']
+        req = packets_from_pcap['req_body']
+        res = packets_from_pcap['res_body']
     else:
         res = packets_from_pcap["response"]
         req = packets_from_pcap["request"]
@@ -160,9 +148,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, is_req=True)
+            res_field['plain_body_src'] = get_body(req)
         if content_type_is_plain(res):
-            res_field['plain_body_dst'] = get_body(res, is_req=False)
+            res_field['plain_body_dst'] = get_body(res)
 
     response_lines = res.strip().split("\n")
     http_response_lines = [item for item in response_lines if "HTTP" in item]

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

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

{xbase_util-0.6.3 → xbase_util-0.6.5}/xbase_util.egg-info/SOURCES.txt

@@ -1,6 +1,5 @@
 README.md
 setup.py
-test/test.py
 xbase_util/__init__.py
 xbase_util/add_column_util.py
 xbase_util/dangerous_util.py

xbase_util-0.6.3/test/test.py

@@ -1,9 +0,0 @@
-from scapy.utils import rdpcap
-
-from xbase_util.packet_util import get_all_packets_by_reg, get_body
-
-if __name__ == '__main__':
-    p = get_all_packets_by_reg(rdpcap("t1.pcap"))
-    for packet in p:
-        print( packet['req_text'])
-        print(get_body(packet,is_req=True))