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

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

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

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

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

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

@@ -65,6 +65,11 @@ res_pattern = re.compile(r"HTTP/\d\.\d \d{3}.*", re.DOTALL)
 req_body_pattern = re.compile(
     r"(GET|POST|HEAD|PUT|DELETE|OPTIONS|PATCH) \/[^\s]* HTTP\/\d\.\d[\s\S]*?(?=HTTP/\d\.\d)", re.DOTALL)
 
+http_version = re.compile(r"HTTP\/(\d\.\d)")
+http_req_method = re.compile(r"(GET|POST|HEAD|PUT|DELETE|OPTIONS|PATCH) \/[^\s]* HTTP\/\d\.\d")
+http_req_path = re.compile(r"(?:GET|POST|HEAD|PUT|DELETE|OPTIONS|PATCH)\s+(\/[^\s]*)\s+HTTP\/\d\.\d")
+res_status_code_pattern = re.compile(r"HTTP\/\d\.\d\s+(\d{3})\s+.*")
+
 
 def get_all_packets_by_reg(packets):
     http_Req_Raw = {}
@@ -117,17 +122,15 @@ def get_detail_by_package(publicField, req_header, req_body, res_header, res_bod
     res_field = copy.deepcopy(publicField)
     res_field["initRTT"] = firstOrZero(res_field.get("initRTT", 0))
     res_field["length"] = firstOrZero(res_field.get("length", 0))
-    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(" ")
-        res_field['http.clientVersion'] = str(first_line[2]).replace("\n", "").replace("\r", "")
-        res_field['http.path'] = first_line[1]
-        res_field['http.method'] = first_line[0]
-    else:
-        res_field['http.clientVersion'] = ''
-        res_field['http.path'] = ''
-        res_field['http.method'] = ''
+
+    http_version_res = http_version.findall(req_header)
+    res_field['http.clientVersion'] = http_version_res[0] if len(http_version_res) > 0 else ""
+    http_method = http_req_method.findall(req_header)
+    http_path = http_req_path.findall(req_header)
+    res_field['http.clientVersion'] = http_version_res[0] if len(http_version_res) > 0 else ""
+    res_field['http.method'] = http_method[0] if len(http_method) > 0 else ""
+    res_field['http.path'] = http_path[0] if len(http_path) > 0 else ""
+    request_lines = req_header.splitlines()
     res_field['http.request-referer'] = get_header_value(header_set=request_lines, value="Referer")
     res_field['http.request-content-type'] = get_header_value(header_set=request_lines,
                                                               value="Content-Type")
@@ -139,15 +142,13 @@ def get_detail_by_package(publicField, req_header, req_body, res_header, res_bod
         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(" ")
-        res_field['http.statuscode'] = first_line[1]
-        res_field['http.serverVersion'] = first_line[0].split("/")[1]
-    else:
-        res_field['http.statuscode'] = ""
-        res_field['http.serverVersion'] = ""
+
+    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()
     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.7 → xbase_util-0.6.8}/xbase_util.egg-info/PKG-INFO

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