xbase-util 0.6.8__tar.gz → 0.7.0__tar.gz

{xbase_util-0.6.8 → xbase_util-0.7.0}/PKG-INFO

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

{xbase_util-0.6.8 → xbase_util-0.7.0}/setup.py

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

{xbase_util-0.6.8 → xbase_util-0.7.0}/xbase_util/packet_util.py

@@ -17,7 +17,7 @@ def content_type_is_plain(packet):
     """
     if ":" not in packet:
         return False
-    for item in packet.replace("-", "_").replace(" ", "").lower().split("\n"):
+    for item in packet.replace("-", "_").replace(" ", "").lower().splitlines():
         if "content_type" in item:
             if ":" not in item:
                 continue
@@ -139,16 +139,16 @@ 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 ""
 
     status_code = res_status_code_pattern.findall(res_header)
     res_field['http.statuscode'] = status_code[0] if len(status_code) > 0 else ""
-    response_lines = res_header.striplines()
+    response_lines = res_header.splitlines()
     res_field['http.response-server'] = get_header_value(header_set=response_lines, value="Server")
     res_field['http.response-content-type'] = get_header_value(header_set=response_lines,
                                                                value="Content-Type")

{xbase_util-0.6.8 → xbase_util-0.7.0}/xbase_util/xbase_util.py

@@ -36,7 +36,7 @@ def parse_expression(expression):
 
 def get_cookie_end_with_semicolon_count(text_data):
     count = 0
-    for text in text_data.replace("-", "_").lower().split("\n"):
+    for text in text_data.replace("-", "_").lower().splitlines():
         item_text = text.replace("\n", "").replace("\t", "").replace(" ", "")
         if "cookie:" in item_text and f"{item_text}".endswith(";"):
             count = count + 1
@@ -47,7 +47,7 @@ def get_cookie_end_with_semicolon_count(text_data):
 
 def get_ua_duplicate_count(text_data):
     ua_list = []
-    for text in text_data.replace("-", "_").lower().split("\n"):
+    for text in text_data.replace("-", "_").lower().splitlines():
         item_text = text.replace("\n", "").replace("\t", "").replace(" ", "")
         if "user_agent:" in item_text and f"{item_text}".endswith(";"):
             ua_list.append(item_text.replace("user_agent:", ""))
@@ -66,7 +66,7 @@ def get_res_status_code_list(text_data):
     num_4 = 0
     num_5 = 0
 
-    res.extend([item for item in text_data.split("\n") if item.startswith("HTTP/")])
+    res.extend([item for item in text_data.splitlines() if item.startswith("HTTP/")])
     for item in res:
         m = re.search(r"\b(\d{3})\b", item)
         if m:

{xbase_util-0.6.8 → xbase_util-0.7.0}/xbase_util.egg-info/PKG-INFO

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