Continued:

- need to negate this state: only skip/reject .i2p domains when they are not
  allowed by configuration (which is default)

diff --git a/fba/commands.py b/fba/commands.py
index 3f10f715e08203c4c55d28115cc5d084d2e8d2dc..ce6623e7c0336bb3219f581e14532fa8509ab149 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -373,7 +373,7 @@ def fetch_blocks(args: argparse.Namespace) -> int:
             elif block["blocked"].endswith(".onion"):
                 logger.debug("blocked='%s' is a TOR .onion domain - SKIPPED", block["blocked"])
                 continue
-            elif block["blocked"].endswith(".i2p") and config.get("allow_i2p_domain") == "true":
+            elif block["blocked"].endswith(".i2p") and not config.get("allow_i2p_domain") == "true":
                 logger.debug("blocked='%s' is an I2P .onion domain - SKIPPED", block["blocked"])
                 continue
             elif block["blocked"].endswith(".arpa"):
@@ -1342,7 +1342,7 @@ def recheck_obfuscation(args: argparse.Namespace) -> int:
             elif block["blocked"].endswith(".onion"):
                 logger.debug("blocked='%s' is a TOR onion domain name - SKIPPED!", block["blocked"])
                 continue
-            elif block["blocked"].endswith(".i2p") and config.get("allow_i2p_domain") == "true":
+            elif block["blocked"].endswith(".i2p") and not config.get("allow_i2p_domain") == "true":
                 logger.debug("blocked='%s' is an I2P onion domain name - SKIPPED!", block["blocked"])
                 continue
             elif block["blocked"].endswith(".arpa"):

diff --git a/fba/helpers/domain.py b/fba/helpers/domain.py
index 39fbb7797acee74c7c5207ed0b3b60c507276b2f..86148928e405748613a914f241f93489aed216b5 100644 (file)
--- a/fba/helpers/domain.py
+++ b/fba/helpers/domain.py
@@ -42,7 +42,7 @@ def raise_on(domain: str):
         raise ValueError(f"domain='{domain}' is not a valid domain")
     elif domain.endswith(".onion"):
         raise ValueError(f"domain='{domain}' is a TOR, please don't crawl them!")
-    elif domain.endswith(".i2p") and config.get("allow_i2p_domain") == "true":
+    elif domain.endswith(".i2p") and not config.get("allow_i2p_domain") == "true":
         raise ValueError(f"domain='{domain}' is an I2P, please don't crawl them!")
     elif domain.endswith(".arpa"):
         raise ValueError(f"domain='{domain}' is a domain for reversed IP addresses, please don't crawl them!")
@@ -97,7 +97,7 @@ def is_wanted(domain: str) -> bool:
     elif domain.endswith(".onion"):
         logger.debug("domain='%s' is a TOR .onion domain - setting False ...", domain)
         wanted = False
-    elif domain.endswith(".i2p") and config.get("allow_i2p_domain") == "true":
+    elif domain.endswith(".i2p") and not config.get("allow_i2p_domain") == "true":
         logger.debug("domain='%s' is an I2P domain - setting False ...", domain)
         wanted = False
     elif domain.endswith(".tld"):

diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py
index 5e0b832f24cae310544cd5d1bc50f9218b6627b7..5a96ac9bf22b9476ccc9764203670e3d1346e520 100644 (file)
--- a/fba/helpers/processing.py
+++ b/fba/helpers/processing.py
@@ -205,7 +205,7 @@ def csv_block(blocker: str, url: str, command: str):
         elif domain.endswith(".onion"):
             logger.debug("domain='%s' is a TOR .onion domain - SKIPPED", domain)
             continue
-        elif domain.endswith(".i2p") and config.get("allow_i2p_domain") == "true":
+        elif domain.endswith(".i2p") and not config.get("allow_i2p_domain") == "true":
             logger.debug("domain='%s' is an I2P .onion domain - SKIPPED", domain)
             continue
         elif domain.endswith(".arpa"):