xbase-util 0.6.2__tar.gz → 0.6.3__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 (35) hide show
  1. {xbase_util-0.6.2 → xbase_util-0.6.3}/PKG-INFO +1 -1
  2. {xbase_util-0.6.2 → xbase_util-0.6.3}/setup.py +1 -1
  3. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/packet_util.py +4 -2
  4. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util.egg-info/PKG-INFO +1 -1
  5. {xbase_util-0.6.2 → xbase_util-0.6.3}/README.md +0 -0
  6. {xbase_util-0.6.2 → xbase_util-0.6.3}/setup.cfg +0 -0
  7. {xbase_util-0.6.2 → xbase_util-0.6.3}/test/test.py +0 -0
  8. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/__init__.py +0 -0
  9. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/add_column_util.py +0 -0
  10. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/dangerous_util.py +0 -0
  11. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/__init__.py +0 -0
  12. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/bean/ConfigBean.py +0 -0
  13. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/bean/CurrentConfigBean.py +0 -0
  14. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/bean/FlowBean.py +0 -0
  15. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/bean/TaskTemplateBean.py +0 -0
  16. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/bean/__init__.py +0 -0
  17. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/dao/ConfigDao.py +0 -0
  18. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/dao/CurrentConfigDao.py +0 -0
  19. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/dao/FlowDao.py +0 -0
  20. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/dao/TaskTemplateDao.py +0 -0
  21. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/dao/__init__.py +0 -0
  22. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/db/initsqlite3.py +0 -0
  23. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/es_db_util.py +0 -0
  24. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/esreq.py +0 -0
  25. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/geo_util.py +0 -0
  26. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/handle_features_util.py +0 -0
  27. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/pcap_util.py +0 -0
  28. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/xbase_constant.py +0 -0
  29. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/xbase_util.py +0 -0
  30. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util.egg-info/SOURCES.txt +0 -0
  31. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util.egg-info/dependency_links.txt +0 -0
  32. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util.egg-info/not-zip-safe +0 -0
  33. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util.egg-info/top_level.txt +0 -0
  34. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util_assets/GeoLite2-City.mmdb +0 -0
  35. {xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util_assets/arkimeparse.js +0 -0
{xbase_util-0.6.2 → xbase_util-0.6.3}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xbase_util
3
- Version: 0.6.2
3
+ Version: 0.6.3
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.6.2 → xbase_util-0.6.3}/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.6.2",
6
+ version="0.6.3",
7
7
  description="网络安全基础工具",
8
8
  long_description="包含提取，预测，训练的基础工具",
9
9
  author="xyt",
{xbase_util-0.6.2 → xbase_util-0.6.3}/xbase_util/packet_util.py RENAMED
@@ -98,15 +98,17 @@ def get_all_packets_by_reg(packets):
98
98
 
99
99
  def get_body(packet, is_req):
100
100
  try:
101
- if is_req and 'req_text' in packet:
101
+ print(type(packet))
102
+ if is_req is True and 'req_text' in packet:
102
103
  a = packet['req_text']
103
104
  print(f"req_text类型：{a}")
104
105
  return "".join([item for item in f"{a}".split("\r\n\r\n") if "HTTP/" not in item])
105
- elif 'res_text' in packet:
106
+ elif is_req is False and 'res_text' in packet:
106
107
  a = packet['res_text']
107
108
  print(f"res_text类型：{a}")
108
109
  return "".join([item for item in f"{a}".split("\r\n\r\n") if "HTTP/" not in item])
109
110
  else:
111
+ print("里面没有")
110
112
  return ""
111
113
  except Exception as e:
112
114
  print("-" * 30)
{xbase_util-0.6.2 → xbase_util-0.6.3}/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.6.2
3
+ Version: 0.6.3
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.6.2 → xbase_util-0.6.3}/README.md RENAMED
File without changes
{xbase_util-0.6.2 → xbase_util-0.6.3}/setup.cfg RENAMED
File without changes
{xbase_util-0.6.2 → xbase_util-0.6.3}/test/test.py RENAMED
File without changes