- if blocked == "":
- logger.warning("blocked is empty after tidyup.domain():", domain, block_level)
- 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("Cannot deobsfucate blocked='%s',domain='%s',origin='%s' - SKIPPED!", blocked, domain, origin)
- continue
-
- logger.debug("blocked='%s' de-obscured to '%s'", blocked, 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("Cannot deobsfucate blocked='%s',domain='%s',origin='%s' - SKIPPED!", blocked, domain, origin)
- continue
-
- logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
- blocked = row[0]
- origin = row[1]
- nodeinfo_url = row[2]
-
- logger.debug("blocked='%s' - DEOBSFUCATED!", blocked)
- if not utils.is_domain_wanted(blocked):
- logger.warning("blocked='%s' is not wanted - SKIPPED!", blocked)
+ 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"])