xbase-util 0.1.9__tar.gz → 0.2.0__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 (31) hide show
  1. {xbase_util-0.1.9 → xbase_util-0.2.0}/PKG-INFO +1 -1
  2. {xbase_util-0.1.9 → xbase_util-0.2.0}/setup.py +1 -1
  3. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/esreq.py +2 -2
  4. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/xbase_util.py +11 -0
  5. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util.egg-info/PKG-INFO +1 -1
  6. {xbase_util-0.1.9 → xbase_util-0.2.0}/README.md +0 -0
  7. {xbase_util-0.1.9 → xbase_util-0.2.0}/setup.cfg +0 -0
  8. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/__init__.py +0 -0
  9. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/__init__.py +0 -0
  10. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/bean/ConfigBean.py +0 -0
  11. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/bean/CurrentConfigBean.py +0 -0
  12. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/bean/FlowBean.py +0 -0
  13. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/bean/TaskTemplateBean.py +0 -0
  14. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/bean/__init__.py +0 -0
  15. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/dao/ConfigDao.py +0 -0
  16. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/dao/CurrentConfigDao.py +0 -0
  17. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/dao/FlowDao.py +0 -0
  18. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/dao/TaskTemplateDao.py +0 -0
  19. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/dao/__init__.py +0 -0
  20. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/db/initsqlite3.py +0 -0
  21. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/es_db_util.py +0 -0
  22. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/geo_util.py +0 -0
  23. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/handle_features_util.py +0 -0
  24. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/pcap_util.py +0 -0
  25. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/xbase_constant.py +0 -0
  26. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util.egg-info/SOURCES.txt +0 -0
  27. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util.egg-info/dependency_links.txt +0 -0
  28. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util.egg-info/not-zip-safe +0 -0
  29. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util.egg-info/top_level.txt +0 -0
  30. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util_assets/GeoLite2-City.mmdb +0 -0
  31. {xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util_assets/arkimeparse.js +0 -0
{xbase_util-0.1.9 → xbase_util-0.2.0}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xbase_util
3
- Version: 0.1.9
3
+ Version: 0.2.0
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.1.9 → xbase_util-0.2.0}/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.1.9",
6
+ version="0.2.0",
7
7
  description="网络安全基础工具",
8
8
  long_description="包含提取，预测，训练的基础工具",
9
9
  author="xyt",
{xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/esreq.py RENAMED
@@ -13,8 +13,8 @@ class EsReq:
13
13
  def search(self, body):
14
14
  return requests.post(self.es_url + "/_search", timeout=self.timeout, json=body)
15
15
 
16
- def start_scroll(self, exp, scroll):
17
- return requests.post(self.es_url + f"/_search?scroll={scroll}", timeout=self.timeout,
16
+ def start_scroll(self, exp, scroll,index=""):
17
+ return requests.post(self.es_url + f"{index}/_search?scroll={scroll}", timeout=self.timeout,
18
18
  json=exp)
19
19
 
20
20
  def scroll_by_id(self, scroll_id, scroll):
{xbase_util-0.1.9 → xbase_util-0.2.0}/xbase_util/xbase_util.py RENAMED
@@ -10,6 +10,17 @@ from scapy.layers.dns import DNS
10
10
  from xbase_util.xbase_constant import parse_path, dns_domain_list
11
11
 
12
12
 
13
+ def process_origin_pos(originPos):
14
+ temres = (f"{originPos}"
15
+ .replace("]", "")
16
+ .replace("[", "")
17
+ .replace("\\", "")
18
+ .replace("\"", "")
19
+ .replace(" ","")
20
+ .split(","))
21
+ return [int(f"{i}") for i in temres]
22
+
23
+
13
24
  def parse_expression(expression):
14
25
  if expression:
15
26
  with open(parse_path, "r") as f:
{xbase_util-0.1.9 → xbase_util-0.2.0}/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.1.9
3
+ Version: 0.2.0
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.1.9 → xbase_util-0.2.0}/README.md RENAMED
File without changes
{xbase_util-0.1.9 → xbase_util-0.2.0}/setup.cfg RENAMED
File without changes