xbase-util 0.4.7__tar.gz → 0.4.8__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. {xbase_util-0.4.7 → xbase_util-0.4.8}/PKG-INFO +1 -1
  2. {xbase_util-0.4.7 → xbase_util-0.4.8}/setup.py +1 -1
  3. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/packet_util.py +4 -4
  4. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util.egg-info/PKG-INFO +1 -1
  5. {xbase_util-0.4.7 → xbase_util-0.4.8}/README.md +0 -0
  6. {xbase_util-0.4.7 → xbase_util-0.4.8}/setup.cfg +0 -0
  7. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/__init__.py +0 -0
  8. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/add_column_util.py +0 -0
  9. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/dangerous_util.py +0 -0
  10. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/__init__.py +0 -0
  11. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/bean/ConfigBean.py +0 -0
  12. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/bean/CurrentConfigBean.py +0 -0
  13. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/bean/FlowBean.py +0 -0
  14. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/bean/TaskTemplateBean.py +0 -0
  15. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/bean/__init__.py +0 -0
  16. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/dao/ConfigDao.py +0 -0
  17. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/dao/CurrentConfigDao.py +0 -0
  18. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/dao/FlowDao.py +0 -0
  19. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/dao/TaskTemplateDao.py +0 -0
  20. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/dao/__init__.py +0 -0
  21. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/db/initsqlite3.py +0 -0
  22. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/es_db_util.py +0 -0
  23. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/esreq.py +0 -0
  24. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/geo_util.py +0 -0
  25. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/handle_features_util.py +0 -0
  26. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/pcap_util.py +0 -0
  27. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/xbase_constant.py +0 -0
  28. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/xbase_util.py +0 -0
  29. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util.egg-info/SOURCES.txt +0 -0
  30. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util.egg-info/dependency_links.txt +0 -0
  31. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util.egg-info/not-zip-safe +0 -0
  32. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util.egg-info/top_level.txt +0 -0
  33. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util_assets/GeoLite2-City.mmdb +0 -0
  34. {xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util_assets/arkimeparse.js +0 -0
{xbase_util-0.4.7 → xbase_util-0.4.8}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xbase_util
3
- Version: 0.4.7
3
+ Version: 0.4.8
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.4.7 → xbase_util-0.4.8}/setup.py RENAMED
@@ -3,7 +3,7 @@ from distutils.core import setup
3
3
  from setuptools import find_packages
4
4
 
5
5
  setup(name="xbase_util",
6
- version="0.4.7",
6
+ version="0.4.8",
7
7
  description="网络安全基础工具",
8
8
  long_description="包含提取，预测，训练的基础工具",
9
9
  author="xyt",
{xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util/packet_util.py RENAMED
@@ -137,8 +137,8 @@ def get_all_packets_by_reg(packets):
137
137
  return packet_list
138
138
 
139
139
 
140
- def get_body(param, is_src):
141
- body = param.split("\r\n\r\n")[1].strip()
140
+ def get_body(param):
141
+ body = "".join([item.strip() for item in param.split("\r\n\r\n") if item.strip() != "" and "HTTP/" not in param])
142
142
  return "" if body is None else body
143
143
 
144
144
 
@@ -186,9 +186,9 @@ def get_detail_by_package(packets_from_pcap, publicField, use_regx):
186
186
  res_field['plain_body_src'] = ""
187
187
  res_field['plain_body_dst'] = ""
188
188
  if content_type_is_plain(req):
189
- res_field['plain_body_src'] = get_body(req, is_src=True)
189
+ res_field['plain_body_src'] = get_body(req)
190
190
  if content_type_is_plain(res):
191
- res_field['plain_body_dst'] = get_body(res, is_src=False)
191
+ res_field['plain_body_dst'] = get_body(res)
192
192
 
193
193
  response_lines = res.strip().split("\n")
194
194
  http_response_lines = [item for item in response_lines if "HTTP" in item]
{xbase_util-0.4.7 → xbase_util-0.4.8}/xbase_util.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xbase-util
3
- Version: 0.4.7
3
+ Version: 0.4.8
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.4.7 → xbase_util-0.4.8}/README.md RENAMED
File without changes
{xbase_util-0.4.7 → xbase_util-0.4.8}/setup.cfg RENAMED
File without changes