xbase-util 0.6.9__tar.gz → 0.7.1__tar.gz

{xbase_util-0.6.9 → xbase_util-0.7.1}/PKG-INFO

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

{xbase_util-0.6.9 → xbase_util-0.7.1}/setup.py

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

{xbase_util-0.6.9 → xbase_util-0.7.1}/xbase_util/packet_util.py

@@ -22,6 +22,7 @@ def content_type_is_plain(packet):
             if ":" not in item:
                 continue
             content_type = item.split(":")[1].replace("\r", "").strip()
+            print(content_type)
             return content_type in plain_content_type_columns
     return False
 
@@ -71,34 +72,34 @@ http_req_path = re.compile(r"(?:GET|POST|HEAD|PUT|DELETE|OPTIONS|PATCH)\s+(\/[^\
 res_status_code_pattern = re.compile(r"HTTP\/\d\.\d\s+(\d{3})\s+.*")
 
 
-def get_all_packets_by_reg(packets):
-    http_Req_Raw = {}
-    http_methods = ("POST /", "PUT /", "OPTIONS /", "DELETE /", "GET /")
-    for packet in packets:
-        if TCP in packet and Raw in packet:
-            data = packet[Raw].load
-            ack = packet[TCP].ack
-            next_ack = packet[TCP].seq + len(data)
-            if ack not in http_Req_Raw:
-                http_Req_Raw[ack] = {"time": [float(packet.time)], "data": data, "next_ack": next_ack}
-            else:
-                http_Req_Raw[ack]["time"].append(float(packet.time))
-                http_Req_Raw[ack]["data"] += data
-                http_Req_Raw[ack]["next_ack"] = next_ack
-    packet_list = [
-        {
-            'req_data': item['data'],
-            'res_data': http_Req_Raw[item['next_ack']]['data'],
-            'req_text': filter_visible_chars(item['data']),
-            'res_text': filter_visible_chars(http_Req_Raw[item['next_ack']]['data']),
-            'req_time': item['time'],
-            'res_time': http_Req_Raw[item['next_ack']]['time']
-        }
-        for ack, item in http_Req_Raw.items()
-        if item['next_ack'] in http_Req_Raw  # 检查 next_ack 是否存在
-           and any(method in filter_visible_chars(item['data']) for method in http_methods)
-    ]
-    return packet_list
+# def get_all_packets_by_reg(packets):
+#     http_Req_Raw = {}
+#     http_methods = ("POST /", "PUT /", "OPTIONS /", "DELETE /", "GET /")
+#     for packet in packets:
+#         if TCP in packet and Raw in packet:
+#             data = packet[Raw].load
+#             ack = packet[TCP].ack
+#             next_ack = packet[TCP].seq + len(data)
+#             if ack not in http_Req_Raw:
+#                 http_Req_Raw[ack] = {"time": [float(packet.time)], "data": data, "next_ack": next_ack}
+#             else:
+#                 http_Req_Raw[ack]["time"].append(float(packet.time))
+#                 http_Req_Raw[ack]["data"] += data
+#                 http_Req_Raw[ack]["next_ack"] = next_ack
+#     packet_list = [
+#         {
+#             'req_data': item['data'],
+#             'res_data': http_Req_Raw[item['next_ack']]['data'],
+#             'req_text': filter_visible_chars(item['data']),
+#             'res_text': filter_visible_chars(http_Req_Raw[item['next_ack']]['data']),
+#             'req_time': item['time'],
+#             'res_time': http_Req_Raw[item['next_ack']]['time']
+#         }
+#         for ack, item in http_Req_Raw.items()
+#         if item['next_ack'] in http_Req_Raw  # 检查 next_ack 是否存在
+#            and any(method in filter_visible_chars(item['data']) for method in http_methods)
+#     ]
+#     return packet_list
 
 
 def get_header_value(header_set, value):
@@ -139,9 +140,9 @@ def get_detail_by_package(publicField, req_header, req_body, res_header, res_bod
     res_field['plain_body_src'] = ""
     res_field['plain_body_dst'] = ""
     if content_type_is_plain(req_header):
-        res_field['plain_body_src'] = req_body
+        res_field['plain_body_src'] = f"{req_body}"
     if content_type_is_plain(res_header):
-        res_field['plain_body_dst'] = res_body
+        res_field['plain_body_dst'] = f"{res_body}"
 
     http_server_version_res = http_version.findall(res_header)
     res_field['http.serverVersion'] = http_server_version_res[0] if len(http_server_version_res) > 0 else ""

{xbase_util-0.6.9 → xbase_util-0.7.1}/xbase_util/xbase_constant.py

@@ -223,14 +223,14 @@ regex_patterns = {
         re.IGNORECASE)
 }
 # 可见的content-type值
-plain_content_type_columns = ['text/json;charset=gbk',
+plain_content_type_columns = ['text/json;charset=gbk','text/javascript','text/css','text/html;charset=gb2312',
                               'application/xml;charset=gbk', 'application/xml;charset=utf_8', 'application/tlt_notify',
                               'application/json;charset=gbk', 'text/xml;charset=utf_8', 'application/json',
                               'text/csv;charset=utf_8', 'application/json;charse=utf_8',
                               'application/soap+xml;charset=utf_8;action="urn:dopricetaxseparated"',
                               'text/xml;charset=gbk', 'text/xml', 'application/x_cm_json;charset=utf_8',
                               'application/xml;tz=utc', 'text/xml;charset="utf_8"', 'application/x_java_archive',
-                              'application/msword', 'image/png', 'application/xml',
+                              'application/msword', 'application/xml',
                               'application/x_stapler_method_invocation;charset=utf_8', 'text/plain;charset=iso_8859_1',
                               'application/x_www_form_urlencoded;charset=utf_8', 'text/plain;charset=gbk',
                               'application/octet_stream;charset=utf_8', 'application/x_tika_ooxml',

{xbase_util-0.6.9 → xbase_util-0.7.1}/xbase_util.egg-info/PKG-INFO

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