traffic-taffy 0.9.8__py3-none-any.whl → 0.9.9__py3-none-any.whl

traffic_taffy/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.9.8"
+__VERSION__ = "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/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/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.8.dist-info → traffic_taffy-0.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: traffic-taffy
-Version: 0.9.8
+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.8.dist-info → traffic_taffy-0.9.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-traffic_taffy/__init__.py,sha256=uP67YUi8VVs_JVB_tdvT_PnmKv3-I2IqRNX1DcwDqGs,22
+traffic_taffy/__init__.py,sha256=YzFL7CfEcDRyEbnlof00gym6eTq-mBSIojBAQGrorTU,22
 traffic_taffy/compare.py,sha256=g9rU6oa_2Wy0nUJ7K6TI8JTctyGCRvYEUakDBf7blOY,8644
 traffic_taffy/comparison.py,sha256=KJxOp4UqhfRkF4LI1PMDRIefeyTm2w5sbdr7VUTS4KM,1451
 traffic_taffy/config.py,sha256=DgTu2kA1Ec4Hbwl_44kTsdyJYvxAabgJk9a7aOH2XXU,4444
@@ -19,8 +19,8 @@ traffic_taffy/dissector_engine/dnstap.py,sha256=rBzVlB0D3YVhHOsr17cbnCIZU13g20sr
 traffic_taffy/dissector_engine/dpkt.py,sha256=q7cJz6WWpe9xUcEbAY_yn_cma_4loXuS3QKIVln6FHQ,12788
 traffic_taffy/dissector_engine/scapy.py,sha256=S3yrUmSeDjt3oE1I07L3iLFLF8Df8XAZg535FY_eu90,5004
 traffic_taffy/hooks/__init__.py,sha256=Bvhl6RnyBqQkWuCU6TS0O_ZHe4qCQsC4HE8FELigWPw,661
-traffic_taffy/hooks/blag.py,sha256=KWFhDYbH8sRcUsujCSdlycE0pYkX5ymyRRbHxi20z3U,1626
-traffic_taffy/hooks/ip2asn.py,sha256=G7zo2lFRLK-fbbzGMMcsaxIIh9ME6BoM0E6cJDaeE18,2233
+traffic_taffy/hooks/blag.py,sha256=NgXcJ0uRFMUk-YkBeAdixNKFuzZ5iZJhh9rxuLb5zrI,2172
+traffic_taffy/hooks/ip2asn.py,sha256=wTOevUytyogehV20JU-UdJ0vRhzgm7te1KVIuuKCvH0,2235
 traffic_taffy/hooks/labels.py,sha256=5jHXq3-kxDQj9PRYgak-gDzE8dvSUiCEq9mBs9nE014,1933
 traffic_taffy/hooks/psl.py,sha256=A3maHS9FOholOEv1LuX0xSO3u34GyqeYl9_EtJG1pMY,2119
 traffic_taffy/iana/tables.msgpak,sha256=d-R5Xw9yG9t4RqGJRrpE6cjH4YfaxQBwQiBhNjKZbwI,172825
@@ -45,13 +45,13 @@ traffic_taffy/tests/test_value_printing.py,sha256=rhmCUqnh1Lk1TTZvZi7ksvUWm4XDB4
 traffic_taffy/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 traffic_taffy/tools/cache_info.py,sha256=ZanO6jDlTdfJ7w0N_7BkLyJj4NyZGShaH7SrUulbIoE,2085
 traffic_taffy/tools/compare.py,sha256=oT5fIqfPeY6nGI9vSVAoKDsAVzzqfXJDzyOw2BhPfSI,3509
-traffic_taffy/tools/config.py,sha256=RwJYyfI1yiAKbMzU5mcPTguBiH-hGRy5vk_YvAAjPuM,2343
+traffic_taffy/tools/config.py,sha256=lW9KKlWedGsVpq6c2KyC4TzbowYmGHWyEY3WqfGnhVI,2501
 traffic_taffy/tools/dissect.py,sha256=kGG0K2d9-OwrAhEU97id2m29PvhYaXZYIw1nLi1aVsE,3346
 traffic_taffy/tools/explore.py,sha256=gUcOfAgangJJI1si1gLPUoWRUKmWUAXSP0oTD2JJygw,24149
 traffic_taffy/tools/export.py,sha256=9zBBGhZK95b4ZiLJ8XK30GPsaBjgR84Sk1HoPIxRpTI,2844
 traffic_taffy/tools/graph.py,sha256=KiKDY9R8JLT5-JouANoi_1WGcdFMhXsLnYlhPsFRWpM,2316
-traffic_taffy-0.9.8.dist-info/METADATA,sha256=AhnwUs9q5jfXHgQOWbF5wYFEkSX3al81a02UgMZLgak,2311
-traffic_taffy-0.9.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-traffic_taffy-0.9.8.dist-info/entry_points.txt,sha256=F0lqjvw94nQ3hY4eerN7faT9aKhhGUHbqBhuEr9q1r8,361
-traffic_taffy-0.9.8.dist-info/licenses/LICENSE.txt,sha256=eFp2vwcZFJW55SUQRoEfXio3K9XdwvsaI_WHntR7I2M,11338
-traffic_taffy-0.9.8.dist-info/RECORD,,
+traffic_taffy-0.9.9.dist-info/METADATA,sha256=c287QYMbyfRv0cjIKLnaoyTowxqr6mVa_sd4q9MUW5w,2311
+traffic_taffy-0.9.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+traffic_taffy-0.9.9.dist-info/entry_points.txt,sha256=F0lqjvw94nQ3hY4eerN7faT9aKhhGUHbqBhuEr9q1r8,361
+traffic_taffy-0.9.9.dist-info/licenses/LICENSE.txt,sha256=eFp2vwcZFJW55SUQRoEfXio3K9XdwvsaI_WHntR7I2M,11338
+traffic_taffy-0.9.9.dist-info/RECORD,,