traffic-taffy 0.9.1__tar.gz → 0.9.3__tar.gz

{traffic_taffy-0.9.1 → traffic_taffy-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: traffic-taffy
-Version: 0.9.1
+Version: 0.9.3
 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>
@@ -56,6 +56,12 @@ might be coming that will cause merge conflicts.
 
 # Copyright and License
 
+Traffic-taffy was created by [Wes Hardaker], a computer scientist at
+[USC/ISI], with support from the Comcast Innovation Fund.
+
+[Wes Hardaker]: https://ant.isi.edu/~hardaker/
+[USC/ISI]: https://www.isi.edu/
+
 This project is copyrighted by the University of Southern California,
 Information Sciences institute.  It is released under the Apache 2.0
 license.

{traffic_taffy-0.9.1 → traffic_taffy-0.9.3}/README.md

@@ -28,6 +28,12 @@ might be coming that will cause merge conflicts.
 
 # Copyright and License
 
+Traffic-taffy was created by [Wes Hardaker], a computer scientist at
+[USC/ISI], with support from the Comcast Innovation Fund.
+
+[Wes Hardaker]: https://ant.isi.edu/~hardaker/
+[USC/ISI]: https://www.isi.edu/
+
 This project is copyrighted by the University of Southern California,
 Information Sciences institute.  It is released under the Apache 2.0
 license.

traffic_taffy-0.9.3/traffic_taffy/__init__.py

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

{traffic_taffy-0.9.1 → traffic_taffy-0.9.3}/traffic_taffy/algorithms/statistical.py

@@ -64,7 +64,10 @@ class ComparisonStatistical(ComparisonSlicesAlgorithm):
                     left_count = 0
                     right_count = right_side[key][subkey]
                     left_percentage = 0.0
-                    right_percentage = right_side[key][subkey] / right_side_total
+                    if right_side_total == 0:
+                        right_percentage = 100
+                    else:
+                        right_percentage = right_side[key][subkey] / right_side_total
                     new_right_count += 1  # this value wasn't in the left
 
                     report[key][subkey] = CompareSlicesReport(

{traffic_taffy-0.9.1 → traffic_taffy-0.9.3}/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.1 → traffic_taffy-0.9.3}/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.1 → traffic_taffy-0.9.3}/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.1 → traffic_taffy-0.9.3}/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.1 → traffic_taffy-0.9.3}/traffic_taffy/tools/config.py

@@ -33,48 +33,48 @@ except ModuleNotFoundError:
     logging.debug("psl module not loadable")
 
 
+def taffy_config_parse_args() -> Namespace:
+    """Parse the command line arguments."""
+
+    config: TaffyConfig = TaffyConfig()
+    config.config_option_names = ["-y", "--config"]
+    config[TT_CFG.LOG_LEVEL] = "info"
+
+    config.read_configfile_from_arguments(sys.argv)
+
+    parser = ArgumentParser(
+        formatter_class=RichHelpFormatter,
+        description=__doc__,
+        epilog="Example Usage: taffy-config > defaults.yml",
+    )
+
+    parser.add_argument(
+        "-y",
+        "--config",
+        default=None,
+        type=str,
+        help="Configuration file (YAML) to load.",
+    )
+
+    parser.add_argument(
+        "--log-level",
+        "--ll",
+        default="info",
+        help="Define the logging verbosity level (debug, info, warning, error, fotal, critical).",
+    )
+
+    args = parser.parse_args()
+    log_level = args.log_level.upper()
+    logging.basicConfig(level=log_level, format="%(levelname)-10s:\t%(message)s")
+
+    config.load_namespace(args)
+    return config
+
+
 def main() -> None:
     """Dissect a pcap file and report contents."""
 
-    def parse_args() -> Namespace:
-        """Parse the command line arguments."""
-
-        config: TaffyConfig = TaffyConfig()
-        config.config_option_names = ["-y", "--config"]
-        config[TT_CFG.LOG_LEVEL] = "info"
-
-        config.read_configfile_from_arguments(sys.argv)
-
-        parser = ArgumentParser(
-            formatter_class=RichHelpFormatter,
-            description=__doc__,
-            epilog="Example Usage: taffy-config > defaults.yml",
-        )
-
-        parser.add_argument(
-            "-y",
-            "--config",
-            default=None,
-            type=str,
-            help="Configuration file (YAML) to load.",
-        )
-
-        parser.add_argument(
-            "--log-level",
-            "--ll",
-            default="info",
-            help="Define the logging verbosity level (debug, info, warning, error, fotal, critical).",
-        )
-
-        args = parser.parse_args()
-        log_level = args.log_level.upper()
-        logging.basicConfig(level=log_level, format="%(levelname)-10s:\t%(message)s")
-
-        config.load_namespace(args)
-        return config
-
-    config = parse_args()
-    config.as_namespace()
+    config = taffy_config_parse_args()
 
     print(yaml.dump(dict(config)))
 

traffic_taffy-0.9.1/traffic_taffy/__init__.py

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