- if blocked == "":
- logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
- continue
- elif blocked.count("*") > 0:
- logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
- instances.set_has_obfuscation(domain, True)
-
- # Obscured domain name with no hash
- row = instances.deobfuscate("*", blocked)
-
- logger.debug("row[]='%s'", type(row))
- if row is None:
- logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
- continue
-
- logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
- blocked = row[0]
- elif blocked.count("?") > 0:
- logger.debug("domain='%s' uses obfuscated domains, marking ...", domain)
- instances.set_has_obfuscation(domain, True)
-
- # Obscured domain name with no hash
- row = instances.deobfuscate("?", blocked)
-
- logger.debug("row[]='%s'", type(row))
- if row is None:
- logger.warning("Cannot deobfuscate blocked='%s',domain='%s' - SKIPPED!", blocked, domain)
- continue
-
- logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
- blocked = row[0]
+ 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)