traffic-taffy 0.9__tar.gz → 0.9.2__tar.gz

{traffic_taffy-0.9 → traffic_taffy-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: traffic-taffy
-Version: 0.9
+Version: 0.9.2
 Summary: A tool for doing differential analysis of pcap files
 Project-URL: Homepage, https://traffic-taffy.github.io/
 Author-email: Wes Hardaker <opensource@hardakers.net>
@@ -8,7 +8,7 @@ License-File: LICENSE.txt
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.7
-Requires-Dist: argparse-with-config>=1.1.4
+Requires-Dist: argparse-with-config>=0.1.4
 Requires-Dist: cryptography
 Requires-Dist: dnssplitter
 Requires-Dist: dotnest>=1.0

{traffic_taffy-0.9 → traffic_taffy-0.9.2}/pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "dnssplitter",
     "ip2asn",
     "dotnest>=1.0",
-    "argparse-with-config>=1.1.4",
+    "argparse-with-config>=0.1.4",
 ]
 
 [project.package_data]

traffic_taffy-0.9.2/traffic_taffy/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "0.9.2"

{traffic_taffy-0.9 → traffic_taffy-0.9.2}/traffic_taffy/dissector.py

@@ -47,6 +47,7 @@ class TTL_CFG:
 
 
 POST_DISSECT_HOOK: str = "post_dissect"
+INIT_HOOK: str = "init_hooks"
 
 
 def dissector_default(name: str, value: Any) -> None:
@@ -455,6 +456,7 @@ def dissector_handle_arguments(args) -> None:
     """Handle checking and loading arguments."""
     check_dissector_level(args.dissection_level)
     dissector_load_extra_modules(args.modules)
+    call_hooks(INIT_HOOK)
 
 
 def dissector_load_extra_modules(modules: List[str]) -> None:

{traffic_taffy-0.9 → traffic_taffy-0.9.2}/traffic_taffy/hooks/ip2asn.py

@@ -3,7 +3,7 @@ from logging import error, info, debug
 import ip2asn
 
 from traffic_taffy.hooks import register_hook
-from traffic_taffy.dissector import POST_DISSECT_HOOK
+from traffic_taffy.dissector import POST_DISSECT_HOOK, INIT_HOOK
 from traffic_taffy.dissection import Dissection
 from traffic_taffy.taffy_config import taffy_default, TaffyConfig
 
@@ -12,8 +12,8 @@ i2a = None
 taffy_default("modules.ip2asn.database", "ip2asn-combined.tsv")
 
 
-@register_hook(POST_DISSECT_HOOK)
-def ip_to_asn(dissection: Dissection, **kwargs):
+@register_hook(INIT_HOOK)
+def init_ip2asn(**kwargs):
     global i2a
 
     if i2a is None:
@@ -28,6 +28,11 @@ def ip_to_asn(dissection: Dissection, **kwargs):
         i2a = ip2asn.IP2ASN(db_path)
         info("  ... loaded")
 
+
+@register_hook(POST_DISSECT_HOOK)
+def ip_to_asn(dissection: Dissection, **kwargs):
+    init_ip2asn()
+
     timestamps = dissection.data.keys()
 
     for timestamp in timestamps:

{traffic_taffy-0.9 → traffic_taffy-0.9.2}/traffic_taffy/hooks/labels.py

@@ -30,6 +30,8 @@ def split_dns_names(dissection: Dissection, **kwargs):
                     parts = value.split(".")
                     if parts[-1] == "":
                         parts = parts[:-1]  # drop the empty end "." split
+                    if len(parts) == 0:
+                        continue
                     dissection.data[timestamp][key + "_tld"][parts[-1]] += count
                     if len(parts) > 1:
                         dissection.data[timestamp][key + "_sld"][parts[-2]] += count

{traffic_taffy-0.9 → traffic_taffy-0.9.2}/traffic_taffy/hooks/psl.py

@@ -2,7 +2,7 @@ from logging import info
 import dnssplitter
 
 from traffic_taffy.hooks import register_hook
-from traffic_taffy.dissector import POST_DISSECT_HOOK
+from traffic_taffy.dissector import POST_DISSECT_HOOK, INIT_HOOK
 from traffic_taffy.dissection import Dissection
 from traffic_taffy.taffy_config import taffy_default, TaffyConfig
 
@@ -11,8 +11,8 @@ splitter = None
 taffy_default("modules.psl.database", "__internal__")
 
 
-@register_hook(POST_DISSECT_HOOK)
-def split_dns_names(dissection: Dissection, **kwargs):
+@register_hook(INIT_HOOK)
+def init_splitter(**kwargs):
     global splitter
 
     if not splitter:
@@ -28,6 +28,11 @@ def split_dns_names(dissection: Dissection, **kwargs):
             info(f"loading PSL from {path}")
             splitter.load_psl_file(path)
 
+
+@register_hook(POST_DISSECT_HOOK)
+def split_dns_names(dissection: Dissection, **kwargs):
+    init_splitter()
+
     timestamps = dissection.data.keys()
 
     for timestamp in timestamps:

traffic_taffy-0.9/traffic_taffy/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "0.9"