- if blocked == "":
- logger.warning("blocked is empty after tidyup.domain():", domain, block_level)
- continue
- elif blacklist.is_blacklisted(blocked):
- logger.debug("blocked='%s' is blacklisted - SKIPPED!", blocked)
- continue
- elif blocked.count("*") > 0:
- # Obscured domain name with no hash
- row = instances.deobscure("*", blocked)
-
- logger.debug("row[]='%s'", type(row))
- if row is None:
- logger.warning(f"Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
- continue
-
- logger.debug(f"blocked='{blocked}' de-obscured to '{row[0]}'")
- blocked = row[0]
- origin = row[1]
- nodeinfo_url = row[2]
- elif blocked.count("?") > 0:
- # Obscured domain name with no hash
- row = instances.deobscure("?", blocked)
-
- logger.debug("row[]='%s'", type(row))
- if row is None:
- logger.warning(f"Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
- continue
-
- logger.debug(f"blocked='{blocked}' de-obscured to '{row[0]}'")
- blocked = row[0]
- origin = row[1]
- nodeinfo_url = row[2]
-
- logger.debug(f"blocked='{blocked}'")
- if not utils.is_domain_wanted((blocked):
- logger.warning("blocked='%s' is not wanted - SKIPPED!", blocked)
+ logger.debug("rows[%s]()=%d'", type(rows), len(rows))
+ for block in rows:
+ logger.debug("Invoking utils.deobfuscate(%s, %s) ...", block["blocked"], domain)
+ block["blocked"] = utils.deobfuscate(block["blocked"], domain)
+
+ logger.debug("block[blocked]='%s' - DEOBFUSCATED!", block["blocked"])
+ if not domain_helper.is_wanted(block["blocked"]):
+ logger.debug("block[blocked]='%s' is not wanted - SKIPPED!", block["blocked"])