xbase-util 0.3.0__tar.gz → 0.3.2__tar.gz

{xbase_util-0.3.0 → xbase_util-0.3.2}/PKG-INFO

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

{xbase_util-0.3.0 → xbase_util-0.3.2}/setup.py

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

{xbase_util-0.3.0 → xbase_util-0.3.2}/xbase_util/geo_util.py

@@ -35,7 +35,7 @@ class GeoUtil:
         if value == "" or value is None:
             return "IP_GEO_EMPTY"
         else:
-            return value
+            return f"{value}"
 
     def get_geo_by_ip(self, geo_map):
         source_ip = geo_map["source.ip"]
@@ -63,6 +63,7 @@ class GeoUtil:
                 geo_map['source.ip_Location_Latitude'] = "IP_GEO_EMPTY"
                 geo_map["source.ip_Location_Longitude"] = "IP_GEO_EMPTY"
         else:
+            source_ip_name=f"{source_ip_name}"
             geo_map["source.ip_Country_IsoCode"] = source_ip_name
             geo_map['source.ip_Country_Name'] = source_ip_name
             geo_map["source.ip_Country_SpecificName"] = source_ip_name
@@ -96,6 +97,7 @@ class GeoUtil:
                 geo_map['destination.ip_Location_Latitude'] = "IP_GEO_EMPTY"
                 geo_map["destination.ip_Location_Longitude"] = "IP_GEO_EMPTY"
         else:
+            destination_ip_name=f"{destination_ip_name}"
             geo_map["destination.ip_Country_IsoCode"] = destination_ip_name
             geo_map['destination.ip_Country_Name'] = destination_ip_name
             geo_map["destination.ip_Country_SpecificName"] = destination_ip_name

{xbase_util-0.3.0 → xbase_util-0.3.2}/xbase_util/xbase_util.py

@@ -225,22 +225,21 @@ def get_statistic_fields(packets):
     return field_map
 
 
-def get_dns_domain(packets):
-    domain_name = ""
+def get_dns_domains(packets):
+    domain_names = []
     for packet_item in packets:
         if DNS in packet_item:
             dns_layer = packet_item[DNS]
             if dns_layer.qd:
                 try:
                     domain_name = dns_layer.qd.qname.decode('utf-8')
-                    # print(f"dns域名:{domain_name}")
                 except Exception:
                     domain_name = str(dns_layer.qd.qname)
                     print(f"dns域名编码失败的字符串:{domain_name}")
-                break
-    if domain_name.endswith("."):
-        domain_name = domain_name[:-1]
-    return domain_name
+                if domain_name.endswith("."):
+                    domain_name = domain_name[:-1]
+                domain_names.append(domain_name)
+    return domain_names
 
 
 def extract_session_fields(origin_list, geoUtil):

{xbase_util-0.3.0 → xbase_util-0.3.2}/xbase_util.egg-info/PKG-INFO

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