xbase-util 0.6.4__tar.gz → 0.6.6__tar.gz

{xbase_util-0.6.4 → xbase_util-0.6.6}/PKG-INFO

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

{xbase_util-0.6.4 → xbase_util-0.6.6}/setup.py

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

{xbase_util-0.6.4 → xbase_util-0.6.6}/xbase_util/packet_util.py

@@ -96,14 +96,6 @@ def get_all_packets_by_reg(packets):
     return packet_list
 
 
-def get_body(packet):
-    try:
-        return "".join([item for item in packet.split("\r\n\r\n") if "HTTP/" not in item])
-    except Exception:
-        traceback.print_exc()
-        return ""
-
-
 def get_header_value(header_set, value):
     result = [item for item in header_set if value in item]
     if len(result) != 0:
@@ -112,23 +104,20 @@ def get_header_value(header_set, value):
         return ""
 
 
-def get_detail_by_package(packets_from_pcap, publicField, use_regx):
+def get_detail_by_package(publicField, req_header, req_body, res_header, res_body):
     """
     通过pcap的数量分离session并完善相关字段
-    :param packets_from_pcap: 通过PcAp解析出的包
     :param publicField: 原始的session单条数据
+    :param req_header:请求头
+    :param req_body:请求体
+    :param res_header:响应头
+    :param res_body:响应体
     :return: 完整的单条数据
     """
     res_field = publicField.copy()
-    if use_regx:
-        req = packets_from_pcap['req_text']
-        res = packets_from_pcap['res_text']
-    else:
-        res = packets_from_pcap["response"]
-        req = packets_from_pcap["request"]
     res_field["initRTT"] = firstOrZero(res_field.get("initRTT", 0))
     res_field["length"] = firstOrZero(res_field.get("length", 0))
-    request_lines = req.strip().split("\n")
+    request_lines = req_header.strip().split("\n")
     http_request_lines = [item for item in request_lines if "HTTP" in item]
     if len(http_request_lines) != 0:
         first_line = http_request_lines[0].split(" ")
@@ -144,15 +133,13 @@ def get_detail_by_package(packets_from_pcap, publicField, use_regx):
                                                               value="Content-Type")
     res_field['http.hostTokens'] = get_header_value(header_set=request_lines, value="Host")
 
-    if 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)
-        if content_type_is_plain(res):
-            res_field['plain_body_dst'] = get_body(res)
-
-    response_lines = res.strip().split("\n")
+    res_field['plain_body_src'] = ""
+    res_field['plain_body_dst'] = ""
+    if content_type_is_plain(req_header):
+        res_field['plain_body_src'] = req_body
+    if content_type_is_plain(res_header):
+        res_field['plain_body_dst'] = res_body
+    response_lines = res_body.strip().split("\n")
     http_response_lines = [item for item in response_lines if "HTTP" in item]
     if len(http_response_lines) != 0:
         first_line = http_response_lines[0].strip().split(" ")

{xbase_util-0.6.4 → xbase_util-0.6.6}/xbase_util.egg-info/PKG-INFO

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

{xbase_util-0.6.4 → xbase_util-0.6.6}/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.4/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))