traffic-taffy 0.9.7__tar.gz → 0.9.9__tar.gz

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: traffic-taffy
-Version: 0.9.7
+Version: 0.9.9
 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>

traffic_taffy-0.9.9/traffic_taffy/__init__.py

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

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/traffic_taffy/hooks/blag.py

@@ -1,14 +1,20 @@
 """Traffic-Taffy plugin to look up addresses in the BLAG blocklist."""
+from pathlib import Path
 from blagbl import BlagBL
+import blagbl
 import ipaddress
+from logging import error
 
 from traffic_taffy.hooks import register_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
 
 blag = None
 blag_ips = None
 
+taffy_default("modules.blag.database", str(blagbl.DEFAULT_STORE.joinpath("blag.zip")))
+
 
 @register_hook(INIT_HOOK)
 def init_blag(**kwargs):
@@ -17,7 +23,14 @@ def init_blag(**kwargs):
     global blag_ips
 
     if blag is None:
-        blag = BlagBL()
+        config = TaffyConfig()
+        blag_db_path = config.get_dotnest("modules.blag.database")
+
+        if blag_db_path and not Path(blag_db_path).exists():
+            error(f"The ip2asn plugin requires a blag.zip file in {blag_db_path}")
+            error("Please run blagbl --fetch to download it")
+
+        blag = BlagBL(database=blag_db_path)
         blag.parse_blag_contents()
         blag_ips = blag.ips
 

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/traffic_taffy/hooks/ip2asn.py

@@ -9,7 +9,7 @@ from traffic_taffy.taffy_config import taffy_default, TaffyConfig
 
 i2a = None
 
-taffy_default("modules.ip2asn.database", ip2asn.DEFAULT_IP2ASN_FILE)
+taffy_default("modules.ip2asn.database", str(ip2asn.DEFAULT_IP2ASN_FILE))
 
 
 @register_hook(INIT_HOOK)
@@ -21,8 +21,8 @@ def init_ip2asn(**kwargs):
         db_path = config.get_dotnest("modules.ip2asn.database")
 
         if db_path and not Path(db_path).exists():
-            error("The ip2asn plugin requires a ip2asn-combined.tsv in this directory")
-            error("Please download it from https://iptoasn.com/")
+            error(f"The ip2asn plugin requires a ip2asn-combined.tsv file in {db_path}")
+            error("Please run ip2asn --fetch to download it")
 
         info(f"loading {db_path}")
         i2a = ip2asn.IP2ASN(db_path)

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/traffic_taffy/output/console.py

@@ -65,6 +65,7 @@ class Console(Output):
     def output_record(self, key: str, subkey: Any, data: Dict[str, Any]) -> None:
         """Print a report to the console."""
 
+        marker = " "
         style = ""
         endstyle = ""
         if getattr(data, "delta_percentage", None):
@@ -73,12 +74,16 @@ class Console(Output):
             # apply some styling depending on range
             if delta_percentage < -Console.BOLD_LIMIT:
                 style = "[bold red]"
+                marker = "v"
             elif delta_percentage < Console.POSITIVE:
                 style = "[red]"
+                marker = "v"
             elif delta_percentage > Console.BOLD_LIMIT:
                 style = "[bold green]"
+                marker = "^"
             elif delta_percentage > Console.POSITIVE:
                 style = "[green]"
+                marker = "^"
             endstyle = style.replace("[", "[/")
 
         # construct the output line with styling
@@ -92,6 +97,7 @@ class Console(Output):
             style=style,
             endstyle=endstyle,
             subkey=subkey,
+            marker=marker,
             **field_values,
         )
 

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/traffic_taffy/reports/compareslicesreport.py

@@ -34,7 +34,7 @@ class CompareSlicesReport(Report):
     @property
     def header_string(self) -> str:
         """Header string."""
-        line = "  {style}{subkey:<50}{endstyle}"
+        line = "  {style}  {subkey:<50}{endstyle}"
         line += " {left_count:>8} {right_count:>8} {delta_absolute:>8}"
         line += " {left_percentage:>7} {right_percentage:>7}  {delta_percentage:>7}"
 
@@ -43,7 +43,7 @@ class CompareSlicesReport(Report):
     @property
     def format_string(self) -> str:
         """Formatting string for each printed line."""
-        line = "  {style}{subkey:<50}{endstyle}"
+        line = "  {style}{marker} {subkey:<50}{endstyle}"
         line += " {left_count:>8} {right_count:>8} {delta_absolute:>8}"
         line += " {left_percentage:>7.2f} {right_percentage:>7.2f}  {delta_percentage:>7.2f}"
 

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/traffic_taffy/reports/correlationchangereport.py

@@ -28,7 +28,7 @@ class CorrelationChangeReport(Report):
     @property
     def header_string(self) -> str:
         """Formatting string for each printed line."""
-        line = "  {style}{subkey:<50}{endstyle}"
+        line = "  {style}  {subkey:<50}{endstyle}"
         line += " {timestamp:>10}"
         line += " {left_correlation:>17}"
         line += " {right_correlation:>17}"
@@ -39,7 +39,7 @@ class CorrelationChangeReport(Report):
     @property
     def format_string(self) -> str:
         """Formatting string for each printed line."""
-        line = "  {style}{subkey:<50}{endstyle}"
+        line = "  {style}{marker} {subkey:<50}{endstyle}"
         line += " {timestamp:>10}"
         line += " {left_correlation:>17.2f}"
         line += " {right_correlation:>17.2f}"

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/traffic_taffy/reports/correlationreport.py

@@ -22,7 +22,7 @@ class CorrelationReport(Report):
     @property
     def header_string(self) -> str:
         """Formatting string for each printed line."""
-        line = "  {style}{subkey:<50}{endstyle}"
+        line = "  {style}  {subkey:<50}{endstyle}"
         line += " {correlation:>11}"
 
         return line
@@ -30,7 +30,7 @@ class CorrelationReport(Report):
     @property
     def format_string(self) -> str:
         """Formatting string for each printed line."""
-        line = "  {style}{subkey:<50}{endstyle}"
+        line = "  {style}{marker} {subkey:<50}{endstyle}"
         line += " {correlation:>11.2f}"
 
         return line

{traffic_taffy-0.9.7 → traffic_taffy-0.9.9}/traffic_taffy/tools/config.py

@@ -32,6 +32,11 @@ try:
 except ModuleNotFoundError:
     logging.debug("psl module not loadable")
 
+try:
+    from traffic_taffy.hooks.blag import ip_blagbl_lookup as ip_blagbl_lookup
+except ModuleNotFoundError:
+    logging.debug("blag module not loadable")
+
 
 def taffy_config_parse_args() -> Namespace:
     """Parse the command line arguments."""

traffic_taffy-0.9.7/traffic_taffy/__init__.py

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

traffic_taffy-0.9.7/traffic_taffy/report.py

@@ -1,12 +0,0 @@
-from dataclasses import dataclass
-
-
-@dataclass
-class Report:
-    delta_percentage: float
-    delta_absolute: int
-    total: int
-    left_count: int
-    right_count: int
-    left_percentage: float
-    right_percentage: float

traffic_taffy-0.9.7/traffic_taffy/tests/test_dpkt_engine.py

@@ -1,15 +0,0 @@
-import os
-from traffic_taffy.dissection import PCAPDissectorLevel
-from traffic_taffy.dissector_engine.dpkt import DissectionEngineDpkt
-
-def test_dpkt_engine():
-    test_pcap = "dns.pcap"
-    test_pcap = "port53-2023-30-31_20.pcap"
-    test_pcap = "airplane-wireless.pcap"
-    if not os.path.exists(test_pcap):
-        return
-
-    engine = DissectionEngineDpkt(test_pcap,
-                                  dissector_level = PCAPDissectorLevel.COMMON_LAYERS)
-    dissection = engine.load()
-