xbase-util 0.3.7__tar.gz → 0.3.9__tar.gz

{xbase_util-0.3.7 → xbase_util-0.3.9}/PKG-INFO

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

{xbase_util-0.3.7 → xbase_util-0.3.9}/setup.py

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

{xbase_util-0.3.7 → xbase_util-0.3.9}/xbase_util/xbase_util.py

@@ -118,17 +118,24 @@ def split_process(subsection, process_count):
     return lengths
 
 
-def build_es_expression(size, arkime_expression,start_time=None, end_time=None):
+def build_es_expression(size, arkime_expression, start_time, end_time, bounded_type="bounded"):
     expression = {"query": {"bool": {"filter": []}}}
     try:
         if size:
             expression['size'] = size
-        if start_time:
-            expression['query']['bool']['filter'].append(
-                {"range": {"firstPacket": {"gte": round(start_time.timestamp() * 1000)}}})
-        if end_time:
+
+        if bounded_type == "bounded":
+            if start_time:
+                expression['query']['bool']['filter'].append(
+                    {"range": {"firstPacket": {"gte": round(start_time.timestamp() * 1000)}}})
+            if end_time:
+                expression['query']['bool']['filter'].append(
+                    {"range": {"lastPacket": {"lte": round(end_time.timestamp() * 1000)}}})
+        elif bounded_type == "last" and start_time and end_time:
             expression['query']['bool']['filter'].append(
-                {"range": {"lastPacket": {"lte": round(end_time.timestamp() * 1000)}}})
+                {"range": {"lastPacket": {"gte": round(start_time.timestamp() * 1000),
+                                          "lte": round(end_time.timestamp() * 1000)}}})
+
         arkime_2_es = parse_expression(arkime_expression)
         if arkime_2_es:
             expression['query']['bool']['filter'].append(arkime_2_es)
@@ -395,16 +402,15 @@ def get_uri_filename_length(uri):
     return 0
 
 
-def get_dns_domain_suffix(domain, dns_lock):
-    with dns_lock:
-        try:
-            for tmp_suffix in dns_domain_list:
-                if tmp_suffix in domain:
-                    return tmp_suffix
-            extracted = tldextract.extract(domain)
-            return extracted.suffix
-        except Exception as e:
-            return ""
+def get_dns_domain_suffix(domain):
+    try:
+        for tmp_suffix in dns_domain_list:
+            if tmp_suffix in domain:
+                return tmp_suffix
+        extracted = tldextract.extract(domain)
+        return extracted.suffix
+    except Exception as e:
+        return ""
 
 
 def check_path(file_path: str):

{xbase_util-0.3.7 → xbase_util-0.3.9}/xbase_util.egg-info/PKG-INFO

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