X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fba%2Fcommands.py;h=1ecf9e2b30d8cd5e9f73fb3f40248d32a8e19312;hb=ae5597c66caace7a3f8d053503c80d92a5afaeea;hp=bf3f1d429d543c208996c36d879965a13b4c4eaa;hpb=e693264e79dc730b6d4a7c2e86a90bc2d670a69d;p=fba.git diff --git a/fba/commands.py b/fba/commands.py index bf3f1d4..1ecf9e2 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -20,6 +20,8 @@ import json import logging import time +from urllib.parse import urlparse + import argparse import atoma import bs4 @@ -27,6 +29,7 @@ import markdown import reqto import validators +from fba import csrf from fba import database from fba import utils @@ -34,6 +37,8 @@ from fba.helpers import blacklist from fba.helpers import config from fba.helpers import cookies from fba.helpers import locking +from fba.helpers import processing +from fba.helpers import software as software_helper from fba.helpers import tidyup from fba.http import federation @@ -41,6 +46,7 @@ from fba.http import network from fba.models import blocks from fba.models import instances +from fba.models import sources from fba.networks import friendica from fba.networks import lemmy @@ -67,23 +73,136 @@ def check_instance(args: argparse.Namespace) -> int: else: logger.info("args.domain='%s' is not known", args.domain) - logger.debug("status='%d' - EXIT!", status) + logger.debug("status=%d - EXIT!", status) return status +def check_nodeinfo(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + # Fetch rows + database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE nodeinfo_url IS NOT NULL ORDER BY domain ASC") + + cnt = 0 + for row in database.cursor.fetchall(): + logger.debug("Checking row[domain]='%s',row[software]='%s',row[nodeinfo_url]='%s' ...", row["domain"], row["software"], row["nodeinfo_url"]) + punycode = row["domain"].encode("idna").decode("utf-8") + + if row["nodeinfo_url"].startswith("/"): + logger.debug("row[nodeinfo_url]='%s' is a relative URL and always matches", row["nodeinfo_url"]) + continue + elif row["nodeinfo_url"].find(punycode) == -1 and row["nodeinfo_url"].find(row["domain"]) == -1: + logger.warning("punycode='%s' is not found in row[nodeinfo_url]='%s',row[software]='%s'", punycode, row["nodeinfo_url"], row["software"]) + cnt = cnt + 1 + + logger.info("Found %d row(s)", cnt) + + logger.debug("EXIT!") + return 0 + +def fetch_pixelfed_api(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + # No CSRF by default, you don't have to add network.source_headers by yourself here + headers = tuple() + source_domain = "pixelfed.org" + + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + try: + logger.debug("Checking CSRF from source_domain='%s' ...", source_domain) + headers = csrf.determine(source_domain, dict()) + except network.exceptions as exception: + logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s) - EXIT!", type(exception), __name__) + return list() + + try: + logger.debug("Fetching JSON from pixelfed.org API, headers()=%d ...", len(headers)) + fetched = network.get_json_api( + source_domain, + "/api/v1/servers/all.json?scope=All&country=all&language=all", + headers, + (config.get("connection_timeout"), config.get("read_timeout")) + ) + + logger.debug("JSON API returned %d elements", len(fetched)) + if "error_message" in fetched: + logger.warning("API returned error_message='%s' - EXIT!", fetched["error_message"]) + return 101 + elif "data" not in fetched["json"]: + logger.warning("API did not return JSON with 'data' element - EXIT!") + return 102 + + rows = fetched["json"]["data"] + logger.info("Checking %d fetched rows ...", len(rows)) + for row in rows: + logger.debug("row[]='%s'", type(row)) + if "domain" not in row: + logger.warning("row='%s' does not contain element 'domain' - SKIPPED!", row) + continue + elif row["domain"] == "": + logger.debug("row[domain] is empty - SKIPPED!") + continue + + logger.debug("row[domain]='%s' - BEFORE!", row["domain"]) + domain = row["domain"].encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) + + if not utils.is_domain_wanted(domain): + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) + continue + elif instances.is_registered(domain): + logger.debug("domain='%s' is already registered - SKIPPED!", domain) + continue + elif instances.is_recent(domain): + logger.debug("domain='%s' has been recently crawled - SKIPPED!", domain) + continue + + logger.debug("Fetching instances from domain='%s' ...", domain) + federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) + + except network.exceptions as exception: + logger.warning("Cannot fetch graphql,exception[%s]:'%s' - EXIT!", type(exception), str(exception)) + return 103 + + logger.debug("Success! - EXIT!") + return 0 + def fetch_bkali(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + source_domain = "gql.api.bka.li" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + domains = list() try: - fetched = network.post_json_api("gql.api.bka.li", "/v1/graphql", json.dumps({ - "query": "query domainlist {nodeinfo(order_by: {domain: asc}) {domain}}" - })) + logger.info("Fetching domainlist from source_domain='%s' ...", source_domain) + fetched = network.post_json_api( + source_domain, + "/v1/graphql", + json.dumps({ + "query": "query domainlist {nodeinfo(order_by: {domain: asc}) {domain}}" + }) + ) logger.debug("fetched[]='%s'", type(fetched)) if "error_message" in fetched: - logger.warning("post_json_api() for 'gql.api.bka.li' returned error message='%s", fetched['error_message']) + logger.warning("post_json_api() for 'gql.sources.bka.li' returned error message='%s", fetched["error_message"]) return 100 elif isinstance(fetched["json"], dict) and "error" in fetched["json"] and "message" in fetched["json"]["error"]: - logger.warning("post_json_api() returned error: '%s", fetched['error']['message']) + logger.warning("post_json_api() returned error: '%s", fetched["error"]["message"]) return 101 rows = fetched["json"] @@ -101,14 +220,20 @@ def fetch_bkali(args: argparse.Namespace) -> int: if "domain" not in entry: logger.warning("entry()=%d does not contain 'domain' - SKIPPED!", len(entry)) continue + elif entry["domain"] == "": + logger.debug("entry[domain] is empty - SKIPPED!") + continue elif not utils.is_domain_wanted(entry["domain"]): - logger.debug("entry[domain]='%s' is not wanted - SKIPPED!") + logger.warning("entry[domain]='%s' is not wanted - SKIPPED!", entry["domain"]) continue elif instances.is_registered(entry["domain"]): - logger.debug("domain='%s' is already registered - SKIPPED!", entry['domain']) + logger.debug("entry[domain]='%s' is already registered - SKIPPED!", entry["domain"]) + continue + elif instances.is_recent(entry["domain"]): + logger.debug("entry[domain]='%s' has been recently crawled - SKIPPED!", entry["domain"]) continue - logger.debug("Adding domain='%s' ...", entry['domain']) + logger.debug("Adding domain='%s' ...", entry["domain"]) domains.append(entry["domain"]) except network.exceptions as exception: @@ -117,19 +242,19 @@ def fetch_bkali(args: argparse.Namespace) -> int: logger.debug("domains()=%d", len(domains)) if len(domains) > 0: - locking.acquire() - logger.info("Adding %d new instances ...", len(domains)) for domain in domains: + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) + try: logger.info("Fetching instances from domain='%s' ...", domain) - federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) - - logger.debug("Invoking cookies.clear(%s) ...", domain) - cookies.clear(domain) + federation.fetch_instances(domain, 'tak.teleyal.blog', None, inspect.currentframe().f_code.co_name) except network.exceptions as exception: logger.warning("Exception '%s' during fetching instances (fetch_bkali) from domain='%s'", type(exception), domain) instances.set_last_error(domain, exception) + return 100 logger.debug("Success - EXIT!") return 0 @@ -148,6 +273,7 @@ def fetch_blocks(args: argparse.Namespace) -> int: logger.warning("args.domain='%s' is not registered, please run ./utils.py fetch_instances '%s' first.", args.domain, args.domain) return 102 + logger.debug("Invoking locking.acquire() ...") locking.acquire() if args.domain is not None and args.domain != "": @@ -160,19 +286,18 @@ def fetch_blocks(args: argparse.Namespace) -> int: # Re-check single software logger.debug("Querying database for args.software='%s' ...", args.software) database.cursor.execute( - "SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software = ?", [args.software] + "SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software = ? AND nodeinfo_url IS NOT NULL", [args.software] ) else: # Re-check after "timeout" (aka. minimum interval) database.cursor.execute( - "SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'peertube') AND (last_blocked IS NULL OR last_blocked < ?) ORDER BY rowid DESC", [time.time() - config.get("recheck_block")] + "SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey') AND (last_blocked IS NULL OR last_blocked < ?) AND nodeinfo_url IS NOT NULL ORDER BY rowid DESC", [time.time() - config.get("recheck_block")] ) rows = database.cursor.fetchall() logger.info("Checking %d entries ...", len(rows)) for blocker, software, origin, nodeinfo_url in rows: logger.debug("blocker='%s',software='%s',origin='%s',nodeinfo_url='%s'", blocker, software, origin, nodeinfo_url) - blockdict = list() blocker = tidyup.domain(blocker) logger.debug("blocker='%s' - AFTER!", blocker) @@ -209,147 +334,182 @@ def fetch_blocks(args: argparse.Namespace) -> int: else: logger.warning("Unknown software: blocker='%s',software='%s'", blocker, software) + logger.debug("blocker='%s'", blocker) + if blocker != "chaos.social": + logger.debug("Invoking instances.set_total_blocks(%s, %d) ...", blocker, len(blocking)) + instances.set_total_blocks(blocker, blocking) + logger.info("Checking %d entries from blocker='%s',software='%s' ...", len(blocking), blocker, software) + blockdict = list() for block in blocking: - logger.debug("blocked='%s',block_level='%s',reason='%s'", block['blocked'], block['block_level'], block['reason']) + logger.debug("blocked='%s',block_level='%s',reason='%s'", block["blocked"], block["block_level"], block["reason"]) - if block['block_level'] == "": - logger.warning("block_level is empty, blocker='%s',blocked='%s'", block['blocker'], block['blocked']) + if block["block_level"] == "": + logger.warning("block_level is empty, blocker='%s',blocked='%s'", block["blocker"], block["blocked"]) continue - logger.debug("blocked='%s',reason='%s' - BEFORE!", block['blocked'], block['reason']) - block['blocked'] = tidyup.domain(block['blocked']) - block['reason'] = tidyup.reason(block['reason']) if block['reason'] is not None and block['reason'] != "" else None - logger.debug("blocked='%s',reason='%s' - AFTER!", block['blocked'], block['reason']) + logger.debug("blocked='%s',reason='%s' - BEFORE!", block["blocked"], block["reason"]) + block["blocked"] = tidyup.domain(block["blocked"]) + block["reason"] = tidyup.reason(block["reason"]) if block["reason"] is not None and block["reason"] != "" else None + logger.debug("blocked='%s',reason='%s' - AFTER!", block["blocked"], block["reason"]) - if block['blocked'] == "": + if block["blocked"] == "": logger.warning("blocked is empty, blocker='%s'", blocker) continue - elif block['blocked'].count("*") > 0: - logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker) - instances.set_has_obfuscation(blocker, True) + elif block["blocked"].endswith(".onion"): + logger.debug("blocked='%s' is a TOR .onion domain - SKIPPED", block["blocked"]) + continue + elif block["blocked"].endswith(".arpa"): + logger.debug("blocked='%s' is a reverse IP address - SKIPPED", block["blocked"]) + continue + elif block["blocked"].endswith(".tld"): + logger.debug("blocked='%s' is a fake domain - SKIPPED", block["blocked"]) + continue + elif block["blocked"].find("*") >= 0: + logger.debug("blocker='%s' uses obfuscated domains", blocker) # Some friendica servers also obscure domains without hash - row = instances.deobfuscate("*", block['blocked']) + row = instances.deobfuscate("*", block["blocked"], block["hash"] if "hash" in block else None) logger.debug("row[]='%s'", type(row)) if row is None: - logger.warning("Cannot deobfuscate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block['blocked'], blocker, software) + logger.warning("Cannot deobfuscate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block["blocked"], blocker, software) + instances.set_has_obfuscation(blocker, True) continue - block['blocked'] = row[0] - origin = row[1] - nodeinfo_url = row[2] - elif block['blocked'].count("?") > 0: - logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker) - instances.set_has_obfuscation(blocker, True) + block["blocked"] = row["domain"] + origin = row["origin"] + nodeinfo_url = row["nodeinfo_url"] + elif block["blocked"].find("?") >= 0: + logger.debug("blocker='%s' uses obfuscated domains", blocker) # Some obscure them with question marks, not sure if that's dependent on version or not - row = instances.deobfuscate("?", block['blocked']) + row = instances.deobfuscate("?", block["blocked"], block["hash"] if "hash" in block else None) logger.debug("row[]='%s'", type(row)) if row is None: - logger.warning("Cannot deobfuscate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block['blocked'], blocker, software) + logger.warning("Cannot deobfuscate blocked='%s',blocker='%s',software='%s' - SKIPPED!", block["blocked"], blocker, software) + instances.set_has_obfuscation(blocker, True) continue - block['blocked'] = row[0] - origin = row[1] - nodeinfo_url = row[2] + block["blocked"] = row["domain"] + origin = row["origin"] + nodeinfo_url = row["nodeinfo_url"] - logger.debug("Looking up instance by domainm, blocked='%s'", block['blocked']) - if not utils.is_domain_wanted(block['blocked']): - logger.debug("blocked='%s' is not wanted - SKIPPED!", block['blocked']) + logger.debug("Looking up instance by domainm, blocked='%s'", block["blocked"]) + if block["blocked"] == "": + logger.debug("block[blocked] is empty - SKIPPED!") continue - elif not instances.is_registered(block['blocked']): - logger.debug("Hash wasn't found, adding: blocked='%s',blocker='%s'", block['blocked'], blocker) - try: - instances.add(block['blocked'], blocker, inspect.currentframe().f_code.co_name, nodeinfo_url) - except network.exceptions as exception: - logger.warning("Exception during adding blocked='%s',blocker='%s': '%s'", block['blocked'], blocker, type(exception)) - continue - if not blocks.is_instance_blocked(blocker, block['blocked'], block['block_level']): - blocks.add_instance(blocker, block['blocked'], block['reason'], block['block_level']) + logger.debug("block[blocked]='%s' - BEFORE!", block["blocked"]) + block["blocked"] = block["blocked"].lstrip(".").encode("idna").decode("utf-8") + logger.debug("block[blocked]='%s' - AFTER!", block["blocked"]) - if block['block_level'] == "reject": - blockdict.append({ - "blocked": block['blocked'], - "reason" : block['reason'], - }) - else: - logger.debug("Updating block last seen and reason for blocker='%s',blocked='%s' ...", blocker, block['blocked']) - blocks.update_last_seen(blocker, block['blocked'], block['block_level']) - blocks.update_reason(block['reason'], blocker, block['blocked'], block['block_level']) + if not utils.is_domain_wanted(block["blocked"]): + logger.warning("blocked='%s' is not wanted - SKIPPED!", block["blocked"]) + continue + elif block["block_level"] in ["accept", "accepted"]: + logger.debug("blocked='%s' is accepted, not wanted here - SKIPPED!", block["blocked"]) + continue + elif not instances.is_registered(block["blocked"]): + logger.debug("Hash wasn't found, adding: blocked='%s',blocker='%s'", block["blocked"], blocker) + federation.fetch_instances(block["blocked"], blocker, None, inspect.currentframe().f_code.co_name) - logger.debug("Invoking cookies.clear(%s) ...", block['blocked']) - cookies.clear(block['blocked']) + block["block_level"] = blocks.alias_block_level(block["block_level"]) + if processing.block(blocker, block["blocked"], block["reason"], block["block_level"]) and block["block_level"] == "reject" and config.get("bot_enabled"): + logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", block["blocked"], block["block_level"], blocker) + blockdict.append({ + "blocked": block["blocked"], + "reason" : block["reason"], + }) + + logger.debug("Invoking cookies.clear(%s) ...", block["blocked"]) + cookies.clear(block["blocked"]) + + logger.debug("Checking if blocker='%s' has pending updates ...", blocker) if instances.has_pending(blocker): - logger.debug("Invoking instances.update_data(%s) ...", blocker) + logger.debug("Flushing updates for blocker='%s' ...", blocker) instances.update_data(blocker) logger.debug("Invoking commit() ...") database.connection.commit() - if config.get("bot_enabled") and len(blockdict) > 0: - network.send_bot_post(blocker, blockdict) - logger.debug("Invoking cookies.clear(%s) ...", blocker) cookies.clear(blocker) + logger.debug("config.get(bot_enabled)='%s',blockdict()=%d'", config.get("bot_enabled"), len(blockdict)) + if config.get("bot_enabled") and len(blockdict) > 0: + logger.info("Sending bot POST for blocker='%s',blockdict()=%d ...", blocker, len(blockdict)) + network.send_bot_post(blocker, blockdict) + logger.debug("Success! - EXIT!") return 0 def fetch_observer(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) - types = [ - "akoma", - "birdsitelive", - "bookwyrm", - "calckey", - "diaspora", - "foundkey", - "friendica", - "funkwhale", - "gancio", - "gnusocial", - "gotosocial", - "hometown", - "hubzilla", - "kbin", - "ktistec", - "lemmy", - "mastodon", - "microblogpub", - "misskey", - "mitra", - "mobilizon", - "owncast", - "peertube", - "pixelfed", - "pleroma", - "plume", - "snac", - "takahe", - "wildebeest", - "writefreely" - ] + logger.debug("Invoking locking.acquire() ...") locking.acquire() + source_domain = "fediverse.observer" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + types = list() + if args.software is None: + logger.info("Fetching software list ...") + raw = utils.fetch_url( + f"https://{source_domain}", + network.web_headers, + (config.get("connection_timeout"), config.get("read_timeout")) + ).text + logger.debug("raw[%s]()=%d", type(raw), len(raw)) + + doc = bs4.BeautifulSoup(raw, features="html.parser") + logger.debug("doc[]='%s'", type(doc)) + + items = doc.find("div", {"aria-labelledby": "navbarDropdownMenuSoftwares"}).findAll("a", {"class": "dropdown-item"}) + logger.debug("items[]='%s'", type(items)) + + logger.info("Checking %d menu items ...", len(items)) + for item in items: + logger.debug("item[%s]='%s'", type(item), item) + if item.text.lower() == "all": + logger.debug("Skipping 'All' menu entry ...") + continue + + logger.debug("Appending item.text='%s' ...", item.text) + types.append(tidyup.domain(item.text)) + else: + logger.info("Adding args.software='%s' as type ...", args.software) + types.append(args.software) + logger.info("Fetching %d different table data ...", len(types)) for software in types: - doc = None + logger.debug("software='%s' - BEFORE!", software) + if args.software is not None and args.software != software: + logger.debug("args.software='%s' does not match software='%s' - SKIPPED!", args.software, software) + continue + doc = None try: logger.debug("Fetching table data for software='%s' ...", software) - raw = utils.fetch_url(f"https://fediverse.observer/app/views/tabledata.php?software={software}", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text + raw = utils.fetch_url( + f"https://{source_domain}/app/views/tabledata.php?software={software}", + network.web_headers, + (config.get("connection_timeout"), config.get("read_timeout")) + ).text logger.debug("raw[%s]()=%d", type(raw), len(raw)) - doc = bs4.BeautifulSoup(raw, features='html.parser') + doc = bs4.BeautifulSoup(raw, features="html.parser") logger.debug("doc[]='%s'", type(doc)) except network.exceptions as exception: - logger.warning("Cannot fetch software='%s' from fediverse.observer: '%s'", software, type(exception)) + logger.warning("Cannot fetch software='%s' from source_domain='%s': '%s'", software, source_domain, type(exception)) continue items = doc.findAll("a", {"class": "url"}) @@ -357,34 +517,53 @@ def fetch_observer(args: argparse.Namespace) -> int: for item in items: logger.debug("item[]='%s'", type(item)) domain = item.decode_contents() + logger.debug("domain='%s' - AFTER!", domain) + + if domain == "": + logger.debug("domain is empty - SKIPPED!") + continue + + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) - logger.debug("domain='%s'", domain) if not utils.is_domain_wanted(domain): - logger.debug("domain='%s' is not wanted - SKIPPED!", domain) + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) continue elif instances.is_registered(domain): logger.debug("domain='%s' is already registered - SKIPPED!", domain) continue + elif instances.is_recent(domain): + logger.debug("domain='%s' is recently being handled - SKIPPED!", domain) + continue - logger.info("Fetching instances for domain='%s',software='%s'", domain, software) + software = software_helper.alias(software) + logger.info("Fetching instances for domain='%s'", domain) federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) - logger.debug("Invoking cookies.clear(%s) ...", domain) - cookies.clear(domain) - logger.debug("Success! - EXIT!") return 0 def fetch_todon_wiki(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) + logger.debug("Invoking locking.acquire() ...") locking.acquire() + + source_domain = "wiki.todon.eu" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + blocklist = { "silenced": list(), "reject": list(), } - raw = utils.fetch_url("https://wiki.todon.eu/todon/domainblocks", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text + raw = utils.fetch_url(f"https://{source_domain}/todon/domainblocks", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text logger.debug("raw()=%d,raw[]='%s'", len(raw), type(raw)) doc = bs4.BeautifulSoup(raw, "html.parser") @@ -398,6 +577,13 @@ def fetch_todon_wiki(args: argparse.Namespace) -> int: logger.info("Checking %d suspended entries ...", len(suspended)) blocklist["reject"] = utils.find_domains(suspended, "div") + blocking = blocklist["silenced"] + blocklist["reject"] + blocker = "todon.eu" + + logger.debug("Invoking instances.set_total_blocks(%s, %d) ...", blocker, len(blocking)) + instances.set_total_blocks(blocker, blocking) + + blockdict = list() for block_level in blocklist: blockers = blocklist[block_level] @@ -408,29 +594,45 @@ def fetch_todon_wiki(args: argparse.Namespace) -> int: if not instances.is_registered(blocked): try: logger.info("Fetching instances from domain='%s' ...", blocked) - federation.fetch_instances(blocked, 'chaos.social', None, inspect.currentframe().f_code.co_name) - - logger.debug("Invoking cookies.clear(%s) ...", blocked) - cookies.clear(blocked) + federation.fetch_instances(blocked, blocker, None, inspect.currentframe().f_code.co_name) except network.exceptions as exception: logger.warning("Exception '%s' during fetching instances (fetch_cs) from blocked='%s'", type(exception), blocked) instances.set_last_error(blocked, exception) - if blocks.is_instance_blocked("todon.eu", blocked, block_level): + if blocks.is_instance_blocked(blocker, blocked, block_level): logger.debug("blocked='%s',block_level='%s' is already blocked - SKIPPED!", blocked, block_level) continue logger.info("Adding new block: blocked='%s',block_level='%s'", blocked, block_level) - blocks.add_instance("todon.eu", blocked, None, block_level) + if processing.block(blocker, blocked, None, block_level) and block_level == "reject" and config.get("bot_enabled"): + logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", blocked, block_level, blocker) + blockdict.append({ + "blocked": blocked, + "reason" : None, + }) logger.debug("Invoking commit() ...") database.connection.commit() + logger.debug("config.get(bot_enabled)='%s',blockdict()=%d", config.get("bot_enabled"), len(blockdict)) + if config.get("bot_enabled") and len(blockdict) > 0: + logger.info("Sending bot POST for blocker='%s',blockdict()=%d ...", blocker, len(blockdict)) + network.send_bot_post(blocker, blockdict) + + logger.debug("Checking if blocker='%s' has pending updates ...", blocker) + if instances.has_pending(blocker): + logger.debug("Flushing updates for blocker='%s' ...", blocker) + instances.update_data(blocker) + logger.debug("Success! - EXIT!") return 0 def fetch_cs(args: argparse.Namespace): logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + extensions = [ "extra", "abbr", @@ -451,59 +653,101 @@ def fetch_cs(args: argparse.Namespace): "wikilinks" ] - domains = { + blocklist = { "silenced": list(), "reject" : list(), } - raw = utils.fetch_url("https://raw.githubusercontent.com/chaossocial/meta/master/federation.md", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text + source_domain = "raw.githubusercontent.com" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + raw = utils.fetch_url(f"https://{source_domain}/chaossocial/meta/master/federation.md", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))).text logger.debug("raw()=%d,raw[]='%s'", len(raw), type(raw)) - doc = bs4.BeautifulSoup(markdown.markdown(raw, extensions=extensions), features='html.parser') + doc = bs4.BeautifulSoup(markdown.markdown(raw, extensions=extensions), features="html.parser") logger.debug("doc()=%d[]='%s'", len(doc), type(doc)) silenced = doc.find("h2", {"id": "silenced-instances"}).findNext("table").find("tbody") logger.debug("silenced[%s]()=%d", type(silenced), len(silenced)) - domains["silenced"] = federation.find_domains(silenced) + blocklist["silenced"] = federation.find_domains(silenced) blocked = doc.find("h2", {"id": "blocked-instances"}).findNext("table").find("tbody") logger.debug("blocked[%s]()=%d", type(blocked), len(blocked)) - domains["reject"] = federation.find_domains(blocked) + blocklist["reject"] = federation.find_domains(blocked) - logger.debug("domains[silenced]()=%d,domains[reject]()=%d", len(domains["silenced"]), len(domains["reject"])) - if len(domains) > 0: - locking.acquire() + blocking = blocklist["silenced"] + blocklist["reject"] + blocker = "chaos.social" + + logger.debug("Invoking instances.set_total_blocks(%s, %d) ...", blocker, len(blocking)) + instances.set_total_blocks(blocker, blocking) - for block_level in domains: - logger.info("block_level='%s' has %d row(s)", block_level, len(domains[block_level])) + logger.debug("blocklist[silenced]()=%d,blocklist[reject]()=%d", len(blocklist["silenced"]), len(blocklist["reject"])) + if len(blocking) > 0: + blockdict = list() + for block_level in blocklist: + logger.info("block_level='%s' has %d row(s)", block_level, len(blocklist[block_level])) - for row in domains[block_level]: + for row in blocklist[block_level]: logger.debug("row[%s]='%s'", type(row), row) - if not instances.is_registered(row["domain"]): + if not "domain" in row: + logger.warning("row[]='%s' has no element 'domain' - SKIPPED!", type(row)) + continue + elif instances.is_recent(row["domain"], "last_blocked"): + logger.debug("row[domain]='%s' has been recently crawled - SKIPPED!", row["domain"]) + continue + elif not instances.is_registered(row["domain"]): try: logger.info("Fetching instances from domain='%s' ...", row["domain"]) - federation.fetch_instances(row["domain"], 'chaos.social', None, inspect.currentframe().f_code.co_name) - - logger.debug("Invoking cookies.clear(%s) ...", row["domain"]) - cookies.clear(row["domain"]) + federation.fetch_instances(row["domain"], blocker, None, inspect.currentframe().f_code.co_name) except network.exceptions as exception: logger.warning("Exception '%s' during fetching instances (fetch_cs) from row[domain]='%s'", type(exception), row["domain"]) instances.set_last_error(row["domain"], exception) - if not blocks.is_instance_blocked('chaos.social', row["domain"], block_level): - logger.debug("domain='%s',block_level='%s' blocked by chaos.social, adding ...", row["domain"], block_level) - blocks.add_instance('chaos.social', row["domain"], row["reason"], block_level) + if processing.block(blocker, row["domain"], row["reason"], block_level) and block_level == "reject" and config.get("bot_enabled"): + logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", row["domain"], block_level, blocker) + blockdict.append({ + "blocked": row["domain"], + "reason" : row["reason"], + }) logger.debug("Invoking commit() ...") database.connection.commit() + logger.debug("config.get(bot_enabled)='%s',blockdict()=%d", config.get("bot_enabled"), len(blockdict)) + if config.get("bot_enabled") and len(blockdict) > 0: + logger.info("Sending bot POST for blocker='%s',blockdict()=%d ...", blocker, len(blockdict)) + network.send_bot_post(blocker, blockdict) + + logger.debug("Checking if blocker='%s' has pending updates ...", blocker) + if instances.has_pending(blocker): + logger.debug("Flushing updates for blocker='%s' ...", blocker) + instances.update_data(blocker) + logger.debug("Success! - EXIT!") return 0 def fetch_fba_rss(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) + domains = list() + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + components = urlparse(args.feed) + + if sources.is_recent(components.netloc): + logger.info("API from components.netloc='%s' has recently being accessed - EXIT!", components.netloc) + return 0 + else: + logger.debug("components.netloc='%s' has not been recently used, marking ...", components.netloc) + sources.update(components.netloc) + logger.info("Fetch FBA-specific RSS args.feed='%s' ...", args.feed) response = utils.fetch_url(args.feed, network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))) @@ -515,10 +759,19 @@ def fetch_fba_rss(args: argparse.Namespace) -> int: logger.debug("rss[]='%s'", type(rss)) for item in rss.items: logger.debug("item='%s'", item) - domain = item.link.split("=")[1] + domain = tidyup.domain(item.link.split("=")[1]) - if blacklist.is_blacklisted(domain): - logger.debug("domain='%s' is blacklisted - SKIPPED!", domain) + logger.debug("domain='%s' - AFTER!", domain) + if domain == "": + logger.debug("domain is empty - SKIPPED!") + continue + + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) + + if not utils.is_domain_wanted(domain): + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) continue elif domain in domains: logger.debug("domain='%s' is already added - SKIPPED!", domain) @@ -526,32 +779,44 @@ def fetch_fba_rss(args: argparse.Namespace) -> int: elif instances.is_registered(domain): logger.debug("domain='%s' is already registered - SKIPPED!", domain) continue + elif instances.is_recent(domain): + logger.debug("domain='%s' has been recently crawled - SKIPPED!", domain) + continue logger.debug("Adding domain='%s'", domain) domains.append(domain) logger.debug("domains()=%d", len(domains)) if len(domains) > 0: - locking.acquire() - logger.info("Adding %d new instances ...", len(domains)) for domain in domains: + logger.debug("domain='%s'", domain) try: logger.info("Fetching instances from domain='%s' ...", domain) federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) - - logger.debug("Invoking cookies.clear(%s) ...", domain) - cookies.clear(domain) except network.exceptions as exception: logger.warning("Exception '%s' during fetching instances (fetch_fba_rss) from domain='%s'", type(exception), domain) instances.set_last_error(domain, exception) + return 100 logger.debug("Success! - EXIT!") return 0 def fetch_fbabot_atom(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) - feed = "https://ryona.agency/users/fba/feed.atom" + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + source_domain = "ryona.agency" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + feed = f"https://{source_domain}/users/fba/feed.atom" domains = list() @@ -569,13 +834,22 @@ def fetch_fbabot_atom(args: argparse.Namespace) -> int: doc = bs4.BeautifulSoup(entry.content.value, "html.parser") logger.debug("doc[]='%s'", type(doc)) for element in doc.findAll("a"): + logger.debug("element[]='%s'", type(element)) for href in element["href"].split(","): - logger.debug("href[%s]='%s", type(href), href) + logger.debug("href[%s]='%s' - BEFORE!", type(href), href) domain = tidyup.domain(href) - logger.debug("domain='%s'", domain) + logger.debug("domain='%s' - AFTER!", domain) + if domain == "": + logger.debug("domain is empty - SKIPPED!") + continue + + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) + if not utils.is_domain_wanted(domain): - logger.debug("domain='%s' is not wanted - SKIPPED!", domain) + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) continue elif domain in domains: logger.debug("domain='%s' is already added - SKIPPED!", domain) @@ -583,43 +857,51 @@ def fetch_fbabot_atom(args: argparse.Namespace) -> int: elif instances.is_registered(domain): logger.debug("domain='%s' is already registered - SKIPPED!", domain) continue + elif instances.is_recent(domain): + logger.debug("domain='%s' has been recently crawled - SKIPPED!", domain) + continue logger.debug("Adding domain='%s',domains()=%d", domain, len(domains)) domains.append(domain) - logger.debug("domains(%d)='%s", len(domains), domains) + logger.debug("domains()=%d", len(domains)) if len(domains) > 0: - locking.acquire() - logger.info("Adding %d new instances ...", len(domains)) for domain in domains: + logger.debug("domain='%s'", domain) try: logger.info("Fetching instances from domain='%s' ...", domain) - federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) - - logger.debug("Invoking cookies.clear(%s) ...", domain) - cookies.clear(domain) + federation.fetch_instances(domain, source_domain, None, inspect.currentframe().f_code.co_name) except network.exceptions as exception: logger.warning("Exception '%s' during fetching instances (fetch_fbabot_atom) from domain='%s'", type(exception), domain) instances.set_last_error(domain, exception) + return 100 logger.debug("Success! - EXIT!") return 0 def fetch_instances(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("args.domain='%s' - checking ...", args.domain) + if not validators.domain(args.domain): + logger.warning("args.domain='%s' is not valid.", args.domain) + return 100 + elif blacklist.is_blacklisted(args.domain): + logger.warning("args.domain='%s' is blacklisted, won't check it!", args.domain) + return 101 + + logger.debug("Invoking locking.acquire() ...") locking.acquire() # Initial fetch try: logger.info("Fetching instances from args.domain='%s' ...", args.domain) federation.fetch_instances(args.domain, None, None, inspect.currentframe().f_code.co_name) - - logger.debug("Invoking cookies.clear(%s) ...", args.domain) - cookies.clear(args.domain) except network.exceptions as exception: logger.warning("Exception '%s' during fetching instances (fetch_instances) from args.domain='%s'", type(exception), args.domain) instances.set_last_error(args.domain, exception) + instances.update_data(args.domain) return 100 if args.single: @@ -628,36 +910,51 @@ def fetch_instances(args: argparse.Namespace) -> int: # Loop through some instances database.cursor.execute( - "SELECT domain, origin, software, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'lemmy', 'peertube') AND (last_instance_fetch IS NULL OR last_instance_fetch < ?) ORDER BY rowid DESC", [time.time() - config.get("recheck_instance")] + "SELECT domain, origin, software, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'lemmy', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm') AND (last_instance_fetch IS NULL OR last_instance_fetch < ?) ORDER BY rowid DESC", [time.time() - config.get("recheck_instance")] ) rows = database.cursor.fetchall() logger.info("Checking %d entries ...", len(rows)) for row in rows: - logger.debug("domain='%s'", row[0]) - if blacklist.is_blacklisted(row[0]): - logger.warning("Domain is blacklisted: row[0]='%s'", row[0]) + logger.debug("row[domain]='%s'", row["domain"]) + if row["domain"] == "": + logger.debug("row[domain] is empty - SKIPPED!") continue - try: - logger.info("Fetching instances for instance domain='%s',software='%s',origin='%s',nodeinfo_url='%s'", row[0], row[2], row[1], row[3]) - federation.fetch_instances(row[0], row[1], row[2], inspect.currentframe().f_code.co_name, row[3]) + logger.debug("row[domain]='%s' - BEFORE!", row["domain"]) + domain = row["domain"].encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) - logger.debug("Invoking cookies.clear(%s) ...", row[0]) - cookies.clear(row[0]) + if not utils.is_domain_wanted(domain): + logger.warning("Domain domain='%s' is not wanted - SKIPPED!", domain) + continue + + try: + logger.info("Fetching instances for domain='%s',origin='%s',software='%s',nodeinfo_url='%s'", domain, row["origin"], row["software"], row["nodeinfo_url"]) + federation.fetch_instances(domain, row["origin"], row["software"], inspect.currentframe().f_code.co_name, row["nodeinfo_url"]) except network.exceptions as exception: - logger.warning("Exception '%s' during fetching instances (fetch_instances) from row[0]='%s'", type(exception), row[0]) - instances.set_last_error(row[0], exception) + logger.warning("Exception '%s' during fetching instances (fetch_instances) from domain='%s'", type(exception), domain) + instances.set_last_error(domain, exception) logger.debug("Success - EXIT!") return 0 def fetch_oliphant(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") locking.acquire() + source_domain = "codeberg.org" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + # Base URL - base_url = "https://codeberg.org/oliphant/blocklists/raw/branch/main/blocklists" + base_url = f"https://{source_domain}/oliphant/blocklists/raw/branch/main/blocklists" # URLs to fetch blocklists = ( @@ -688,6 +985,9 @@ def fetch_oliphant(args: argparse.Namespace) -> int: },{ "blocker": "sunny.garden", "csv_url": "mastodon/sunny.garden.csv", + },{ + "blocker": "sunny.garden", + "csv_url": "mastodon/gardenfence.csv", },{ "blocker": "solarpunk.moe", "csv_url": "mastodon/solarpunk.moe.csv", @@ -697,6 +997,9 @@ def fetch_oliphant(args: argparse.Namespace) -> int: },{ "blocker": "union.place", "csv_url": "mastodon/union.place.csv", + },{ + "blocker": "oliphant.social", + "csv_url": "mastodon/birdsite.csv", } ) @@ -706,62 +1009,140 @@ def fetch_oliphant(args: argparse.Namespace) -> int: for block in blocklists: # Is domain given and not equal blocker? if isinstance(args.domain, str) and args.domain != block["blocker"]: - logger.debug("Skipping blocker='%s', not matching args.domain='%s'", block['blocker'], args.domain) + logger.debug("Skipping blocker='%s', not matching args.domain='%s'", block["blocker"], args.domain) continue elif args.domain in domains: logger.debug("args.domain='%s' already handled - SKIPPED!", args.domain) continue # Fetch this URL - logger.info("Fetching csv_url='%s' for blocker='%s' ...", block['csv_url'], block['blocker']) + logger.info("Fetching csv_url='%s' for blocker='%s' ...", block["csv_url"], block["blocker"]) response = utils.fetch_url(f"{base_url}/{block['csv_url']}", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))) - logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text)) - if response.ok and response.content != "": - logger.debug("Fetched %d Bytes, parsing CSV ...", len(response.content)) - reader = csv.DictReader(response.content.decode('utf-8').splitlines(), dialect="unix") + logger.debug("response.ok='%s',response.status_code=%d,response.content()=%d", response.ok, response.status_code, len(response.content)) + if not response.ok or response.status_code >= 300 or response.content == "": + logger.warning("Could not fetch csv_url='%s' for blocker='%s' - SKIPPED!", block["csv_url"], block["blocker"]) + continue - logger.debug("reader[]='%s'", type(reader)) - for row in reader: - logger.debug("row[%s]='%s'", type(row), row) - domain = None - if "#domain" in row: - domain = row["#domain"] - elif "domain" in row: - domain = row["domain"] - else: - logger.debug("row='%s' does not contain domain column", row) - continue + logger.debug("Fetched %d Bytes, parsing CSV ...", len(response.content)) + reader = csv.DictReader(response.content.decode("utf-8").splitlines(), dialect="unix") - logger.debug("domain='%s'", domain) - if not utils.is_domain_wanted(domain): - logger.debug("domain='%s' is not wanted - SKIPPED!", domain) - continue + blockdict = list() - logger.debug("Marking domain='%s' as handled", domain) - domains.append(domain) + cnt = 0 + for row in reader: + logger.debug("row[%s]='%s'", type(row), row) + domain = severity = None + reject_media = reject_reports = False - logger.debug("Processing domain='%s' ...", domain) - processed = utils.process_domain(domain, block["blocker"], inspect.currentframe().f_code.co_name) + if "#domain" in row: + domain = row["#domain"] + elif "domain" in row: + domain = row["domain"] + else: + logger.debug("row='%s' does not contain domain column", row) + continue - logger.debug("processed='%s'", processed) + if "#severity" in row: + severity = blocks.alias_block_level(row["#severity"]) + elif "severity" in row: + severity = blocks.alias_block_level(row["severity"]) + else: + logger.debug("row='%s' does not contain severity column", row) + continue + + if "#reject_media" in row and row["#reject_media"].lower() == "true": + reject_media = True + elif "reject_media" in row and row["reject_media"].lower() == "true": + reject_media = True + + if "#reject_reports" in row and row["#reject_reports"].lower() == "true": + reject_reports = True + elif "reject_reports" in row and row["reject_reports"].lower() == "true": + reject_reports = True + + cnt = cnt + 1 + logger.debug("domain='%s',severity='%s',reject_media='%s',reject_reports='%s'", domain, severity, reject_media, reject_reports) + if domain == "": + logger.debug("domain is empty - SKIPPED!") + continue + elif domain.endswith(".onion"): + logger.debug("domain='%s' is a TOR .onion domain - SKIPPED", domain) + continue + elif domain.endswith(".arpa"): + logger.debug("domain='%s' is a reverse IP address - SKIPPED", domain) + continue + elif domain.endswith(".tld"): + logger.debug("domain='%s' is a fake domain - SKIPPED", domain) + continue + elif domain.find("*") >= 0 or domain.find("?") >= 0: + logger.debug("domain='%s' is obfuscated - Invoking utils.deobfuscate(%s, %s) ...", domain, domain, block["blocker"]) + domain = utils.deobfuscate(domain, block["blocker"]) + logger.debug("domain='%s' - AFTER!", domain) + + if not validators.domain(domain): + logger.debug("domain='%s' is not a valid domain - SKIPPED!") + continue + elif blacklist.is_blacklisted(domain): + logger.warning("domain='%s' is blacklisted - SKIPPED!", domain) + continue + + logger.debug("Marking domain='%s' as handled", domain) + domains.append(domain) + + logger.debug("Processing domain='%s' ...", domain) + processed = processing.domain(domain, block["blocker"], inspect.currentframe().f_code.co_name) + logger.debug("processed='%s'", processed) + + if processing.block(block["blocker"], domain, None, severity) and config.get("bot_enabled"): + logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", domain, block["block_level"], block["blocker"]) + blockdict.append({ + "blocked": domain, + "reason" : block["reason"], + }) + + if reject_media: + processing.block(block["blocker"], domain, None, "reject_media") + if reject_reports: + processing.block(block["blocker"], domain, None, "reject_reports") + + logger.debug("block[blocker]='%s'", block["blocker"]) + if block["blocker"] != "chaos.social": + logger.debug("Invoking instances.set_total_blocks(%s, domains()=%d) ...", block["blocker"], len(domains)) + instances.set_total_blocks(block["blocker"], domains) + + logger.debug("Checking if blocker='%s' has pending updates ...", block["blocker"]) + if instances.has_pending(block["blocker"]): + logger.debug("Flushing updates for block[blocker]='%s' ...", block["blocker"]) + instances.update_data(block["blocker"]) + + logger.debug("Invoking commit() ...") + database.connection.commit() + + logger.debug("config.get(bot_enabled)='%s',blockdict()=%d", config.get("bot_enabled"), len(blockdict)) + if config.get("bot_enabled") and len(blockdict) > 0: + logger.info("Sending bot POST for blocker='%s',blockdict()=%d ...", block["blocker"], len(blockdict)) + network.send_bot_post(block["blocker"], blockdict) logger.debug("Success! - EXIT!") return 0 def fetch_txt(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") locking.acquire() # Static URLs - urls = ( - "https://seirdy.one/pb/bsl.txt", - ) + urls = ({ + "blocker": "seirdy.one", + "url" : "https://seirdy.one/pb/bsl.txt", + },) logger.info("Checking %d text file(s) ...", len(urls)) - for url in urls: - logger.debug("Fetching url='%s' ...", url) - response = utils.fetch_url(url, network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))) + for row in urls: + logger.debug("Fetching row[url]='%s' ...", row["url"]) + response = utils.fetch_url(row["url"], network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))) logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text)) if response.ok and response.status_code < 300 and response.text != "": @@ -770,16 +1151,22 @@ def fetch_txt(args: argparse.Namespace) -> int: logger.info("Processing %d domains ...", len(domains)) for domain in domains: - logger.debug("domain='%s'", domain) + logger.debug("domain='%s' - BEFORE!", domain) + domain = tidyup.domain(domain) + + logger.debug("domain='%s' - AFTER!", domain) if domain == "": logger.debug("domain is empty - SKIPPED!") continue elif not utils.is_domain_wanted(domain): - logger.debug("domain='%s' is not wanted - SKIPPED!", domain) + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) + continue + elif instances.is_recent(domain): + logger.debug("domain='%s' has been recently crawled - SKIPPED!", domain) continue - logger.debug("domain='%s'", domain) - processed = utils.process_domain(domain, 'seirdy.one', inspect.currentframe().f_code.co_name) + logger.debug("Processing domain='%s',row[blocker]='%s'", domain, row["blocker"]) + processed = processing.domain(domain, row["blocker"], inspect.currentframe().f_code.co_name) logger.debug("processed='%s'", processed) if not processed: @@ -791,9 +1178,23 @@ def fetch_txt(args: argparse.Namespace) -> int: def fetch_fedipact(args: argparse.Namespace) -> int: logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") locking.acquire() - response = utils.fetch_url("https://fedipact.online", network.web_headers, (config.get("connection_timeout"), config.get("read_timeout"))) + source_domain = "fedipact.online" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + response = utils.fetch_url( + f"https://{source_domain}", + network.web_headers, + (config.get("connection_timeout"), config.get("read_timeout")) + ) logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text)) if response.ok and response.status_code < 300 and response.text != "": @@ -808,19 +1209,539 @@ def fetch_fedipact(args: argparse.Namespace) -> int: logger.debug("row[]='%s'", type(row)) domain = tidyup.domain(row.contents[0]) - logger.debug("domain='%s'", domain) + logger.debug("domain='%s' - AFTER!", domain) if domain == "": logger.debug("domain is empty - SKIPPED!") continue - elif not utils.is_domain_wanted(domain): - logger.debug("domain='%s' is not wanted - SKIPPED!", domain) + + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) + + if not utils.is_domain_wanted(domain): + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) continue elif instances.is_registered(domain): logger.debug("domain='%s' is already registered - SKIPPED!", domain) continue + elif instances.is_recent(domain): + logger.debug("domain='%s' has been recently crawled - SKIPPED!", domain) + continue logger.info("Fetching domain='%s' ...", domain) federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) logger.debug("Success! - EXIT!") return 0 + +def fetch_joinfediverse(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + source_domain = "joinfediverse.wiki" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + raw = utils.fetch_url( + f"https://{source_domain}/FediBlock", + network.web_headers, + (config.get("connection_timeout"), config.get("read_timeout")) + ).text + logger.debug("raw()=%d,raw[]='%s'", len(raw), type(raw)) + + doc = bs4.BeautifulSoup(raw, "html.parser") + logger.debug("doc[]='%s'", type(doc)) + + tables = doc.findAll("table", {"class": "wikitable"}) + + logger.info("Analyzing %d table(s) ...", len(tables)) + blocklist = list() + for table in tables: + logger.debug("table[]='%s'", type(table)) + + rows = table.findAll("tr") + logger.info("Checking %d row(s) ...", len(rows)) + block_headers = dict() + for row in rows: + logger.debug("row[%s]='%s'", type(row), row) + + headers = row.findAll("th") + logger.debug("Found headers()=%d header(s)", len(headers)) + if len(headers) > 1: + block_headers = dict() + cnt = 0 + for header in headers: + cnt = cnt + 1 + logger.debug("header[]='%s',cnt=%d", type(header), cnt) + text = header.contents[0] + + logger.debug("text[]='%s'", type(text)) + if not isinstance(text, str): + logger.debug("text[]='%s' is not of type 'str' - SKIPPED!", type(text)) + continue + elif validators.domain(text.strip()): + logger.debug("text='%s' is a domain - SKIPPED!", text.strip()) + continue + + text = tidyup.domain(text.strip()) + logger.debug("text='%s' - AFTER!", text) + if text in ["domain", "instance", "subdomain(s)", "block reason(s)"]: + logger.debug("Found header: '%s'=%d", text, cnt) + block_headers[cnt] = text + + elif len(block_headers) == 0: + logger.debug("row is not scrapable - SKIPPED!") + continue + elif len(block_headers) > 0: + logger.debug("Found a row with %d scrapable headers ...", len(block_headers)) + cnt = 0 + block = dict() + + for element in row.find_all(["th", "td"]): + cnt = cnt + 1 + logger.debug("element[]='%s',cnt=%d", type(element), cnt) + if cnt in block_headers: + logger.debug("block_headers[%d]='%s'", cnt, block_headers[cnt]) + + text = element.text.strip() + key = block_headers[cnt] if block_headers[cnt] not in ["domain", "instance"] else "blocked" + + logger.debug("cnt=%d is wanted: key='%s',text[%s]='%s'", cnt, key, type(text), text) + if key in ["domain", "instance"]: + block[key] = text + elif key == "reason": + block[key] = tidyup.reason(text) + elif key == "subdomain(s)": + block[key] = list() + if text != "": + block[key] = text.split("/") + else: + logger.debug("key='%s'", key) + block[key] = text + + logger.debug("block()=%d ...", len(block)) + if len(block) > 0: + logger.debug("Appending block()=%d ...", len(block)) + blocklist.append(block) + + logger.debug("blocklist()=%d", len(blocklist)) + + database.cursor.execute("SELECT domain FROM instances WHERE domain LIKE 'climatejustice.%'") + domains = database.cursor.fetchall() + + logger.debug("domains(%d)[]='%s'", len(domains), type(domains)) + blocking = list() + for block in blocklist: + logger.debug("block='%s'", block) + if "subdomain(s)" in block and len(block["subdomain(s)"]) > 0: + origin = block["blocked"] + logger.debug("origin='%s'", origin) + for subdomain in block["subdomain(s)"]: + block["blocked"] = subdomain + "." + origin + logger.debug("block[blocked]='%s'", block["blocked"]) + blocking.append(block) + else: + blocking.append(block) + + logger.debug("blocking()=%d", blocking) + for block in blocking: + logger.debug("block[]='%s'", type(block)) + if "blocked" not in block: + raise KeyError(f"block()={len(block)} does not have element 'blocked'") + + block["blocked"] = tidyup.domain(block["blocked"]).encode("idna").decode("utf-8") + logger.debug("block[blocked]='%s' - AFTER!", block["blocked"]) + + if block["blocked"] == "": + logger.debug("block[blocked] is empty - SKIPPED!") + continue + elif not utils.is_domain_wanted(block["blocked"]): + logger.warning("block[blocked]='%s' is not wanted - SKIPPED!", block["blocked"]) + continue + elif instances.is_recent(block["blocked"]): + logger.debug("block[blocked]='%s' has been recently checked - SKIPPED!", block["blocked"]) + continue + + logger.info("Proccessing blocked='%s' ...", block["blocked"]) + processing.domain(block["blocked"], "climatejustice.social", inspect.currentframe().f_code.co_name) + + blockdict = list() + for blocker in domains: + blocker = blocker[0] + logger.debug("blocker[%s]='%s'", type(blocker), blocker) + + for block in blocking: + logger.debug("block[blocked]='%s',block[block reason(s)]='%s' - BEFORE!", block["blocked"], block["block reason(s)"] if "block reason(s)" in block else None) + block["reason"] = tidyup.reason(block["block reason(s)"]) if "block reason(s)" in block else None + + logger.debug("block[blocked]='%s',block[reason]='%s' - AFTER!", block["blocked"], block["reason"]) + if block["blocked"] == "": + logger.debug("block[blocked] is empty - SKIPPED!") + continue + elif not utils.is_domain_wanted(block["blocked"]): + logger.warning("blocked='%s' is not wanted - SKIPPED!", block["blocked"]) + continue + + logger.debug("blocked='%s',reason='%s'", block["blocked"], block["reason"]) + if processing.block(blocker, block["blocked"], block["reason"], "reject") and config.get("bot_enabled"): + logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", block["blocked"], block["block_level"], blocker) + blockdict.append({ + "blocked": block["blocked"], + "reason" : block["reason"], + }) + + if instances.has_pending(blocker): + logger.debug("Flushing updates for blocker='%s' ...", blocker) + instances.update_data(blocker) + + logger.debug("Invoking commit() ...") + database.connection.commit() + + logger.debug("config.get(bot_enabled)='%s',blockdict()=%d", config.get("bot_enabled"), len(blockdict)) + if config.get("bot_enabled") and len(blockdict) > 0: + logger.info("Sending bot POST for blocker='%s,blockdict()=%d ...", blocker, len(blockdict)) + network.send_bot_post(blocker, blockdict) + + logger.debug("Success! - EXIT!") + return 0 + +def recheck_obfuscation(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + if isinstance(args.domain, str) and args.domain != "" and utils.is_domain_wanted(args.domain): + database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE has_obfuscation = 1 AND domain = ?", [args.domain]) + elif isinstance(args.software, str) and args.software != "" and validators.domain(args.software) == args.software: + database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE has_obfuscation = 1 AND software = ?", [args.software]) + else: + database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE has_obfuscation = 1") + + rows = database.cursor.fetchall() + logger.info("Checking %d domains ...", len(rows)) + for row in rows: + logger.debug("Fetching peers from domain='%s',software='%s',nodeinfo_url='%s' ...", row["domain"], row["software"], row["nodeinfo_url"]) + if (args.all is None or not args.all) and instances.is_recent(row["domain"]) and args.domain is None and args.software is None: + logger.debug("row[domain]='%s' has been recently checked, args.all[]='%s' - SKIPPED!", row["domain"], type(args.all)) + continue + + blocking = list() + if row["software"] == "pleroma": + logger.debug("domain='%s',software='%s'", row["domain"], row["software"]) + blocking = pleroma.fetch_blocks(row["domain"], row["nodeinfo_url"]) + elif row["software"] == "mastodon": + logger.debug("domain='%s',software='%s'", row["domain"], row["software"]) + blocking = mastodon.fetch_blocks(row["domain"], row["nodeinfo_url"]) + elif row["software"] == "lemmy": + logger.debug("domain='%s',software='%s'", row["domain"], row["software"]) + blocking = lemmy.fetch_blocks(row["domain"], row["nodeinfo_url"]) + elif row["software"] == "friendica": + logger.debug("domain='%s',software='%s'", row["domain"], row["software"]) + blocking = friendica.fetch_blocks(row["domain"]) + elif row["software"] == "misskey": + logger.debug("domain='%s',software='%s'", row["domain"], row["software"]) + blocking = misskey.fetch_blocks(row["domain"]) + else: + logger.warning("Unknown sofware: domain='%s',software='%s'", row["domain"], row["software"]) + + logger.debug("row[domain]='%s'", row["domain"]) + if row["domain"] != "chaos.social": + logger.debug("Invoking instances.set_total_blocks(%s, %d) ...", row["domain"], len(blocking)) + instances.set_total_blocks(row["domain"], blocking) + + obfuscated = 0 + blockdict = list() + + logger.info("Checking %d block(s) from domain='%s' ...", len(blocking), row["domain"]) + for block in blocking: + logger.debug("block[blocked]='%s'", block["blocked"]) + blocked = None + + if block["blocked"] == "": + logger.debug("block[blocked] is empty - SKIPPED!") + continue + elif block["blocked"].endswith(".arpa"): + logger.debug("blocked='%s' is a reversed IP address - SKIPPED!", block["blocked"]) + continue + elif block["blocked"].endswith(".tld"): + logger.debug("blocked='%s' is a fake domain name - SKIPPED!", block["blocked"]) + continue + elif block["blocked"].endswith(".onion"): + logger.debug("blocked='%s' is a TOR onion domain name - SKIPPED!", block["blocked"]) + continue + elif block["blocked"].find("*") >= 0 or block["blocked"].find("?") >= 0: + logger.debug("block='%s' is obfuscated.", block["blocked"]) + obfuscated = obfuscated + 1 + blocked = utils.deobfuscate(block["blocked"], row["domain"], block["hash"] if "hash" in block else None) + elif not utils.is_domain_wanted(block["blocked"]): + logger.warning("blocked='%s' is not wanted - SKIPPED!", block["blocked"]) + continue + elif blocks.is_instance_blocked(row["domain"], block["blocked"]): + logger.debug("blocked='%s' is already blocked - SKIPPED!", block["blocked"]) + continue + + logger.debug("blocked[%s]='%s',block[blocked]='%s'", type(blocked), blocked, block["blocked"]) + if blocked is not None and blocked != block["blocked"]: + logger.debug("blocked='%s' was deobfuscated to blocked='%s'", block["blocked"], blocked) + obfuscated = obfuscated - 1 + if blocks.is_instance_blocked(row["domain"], blocked): + logger.debug("blocked='%s' is already blocked by domain='%s' - SKIPPED!", blocked, row["domain"]) + continue + + block["block_level"] = blocks.alias_block_level(block["block_level"]) + + logger.info("blocked='%s' has been deobfuscated to blocked='%s', adding ...", block["blocked"], blocked) + if processing.block(row["domain"], blocked, block["reason"], block["block_level"]) and block["block_level"] == "reject" and config.get("bot_enabled"): + logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", block["blocked"], block["block_level"], row["domain"]) + blockdict.append({ + "blocked": blocked, + "reason" : block["reason"], + }) + + logger.info("domain='%s' has %d obfuscated domain(s)", row["domain"], obfuscated) + if obfuscated == 0 and len(blocking) > 0: + logger.info("Block list from domain='%s' has been fully deobfuscated.", row["domain"]) + instances.set_has_obfuscation(row["domain"], False) + + if instances.has_pending(row["domain"]): + logger.debug("Flushing updates for blocker='%s' ...", row["domain"]) + instances.update_data(row["domain"]) + + logger.debug("Invoking commit() ...") + database.connection.commit() + + logger.debug("config.get(bot_enabled)='%s',blockdict()=%d", config.get("bot_enabled"), len(blockdict)) + if config.get("bot_enabled") and len(blockdict) > 0: + logger.info("Sending bot POST for blocker='%s,blockdict()=%d ...", row["domain"], len(blockdict)) + network.send_bot_post(row["domain"], blockdict) + + logger.debug("Success! - EXIT!") + return 0 + +def fetch_fedilist(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + source_domain = "demo.fedilist.com" + if sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + url = f"http://{source_domain}/instance/csv?onion=not" + if args.software is not None and args.software != "": + logger.debug("args.software='%s'", args.software) + url = f"http://{source_domain}/instance/csv?software={args.software}&onion=not" + + logger.info("Fetching url='%s' ...", url) + response = reqto.get( + url, + headers=network.web_headers, + timeout=(config.get("connection_timeout"), config.get("read_timeout")), + allow_redirects=False + ) + + logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text)) + if not response.ok or response.status_code >= 300 or len(response.content) == 0: + logger.warning("Failed fetching url='%s': response.ok='%s',response.status_code=%d,response.content()=%d - EXIT!", url, response.ok, response.status_code, len(response.text)) + return 1 + + reader = csv.DictReader(response.content.decode("utf-8").splitlines(), dialect="unix") + + logger.debug("reader[]='%s'", type(reader)) + for row in reader: + logger.debug("row[]='%s'", type(row)) + if "hostname" not in row: + logger.warning("row()=%d has no element 'hostname' - SKIPPED!", len(row)) + continue + + logger.debug("row[hostname]='%s' - BEFORE!", row["hostname"]) + domain = tidyup.domain(row["hostname"]) + logger.debug("domain='%s' - AFTER!", domain) + + if domain == "": + logger.debug("domain is empty after tidyup: row[hostname]='%s' - SKIPPED!", row["hostname"]) + continue + + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) + + if not utils.is_domain_wanted(domain): + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) + continue + elif (args.all is None or not args.all) and instances.is_registered(domain): + logger.debug("domain='%s' is already registered, --all not specified: args.all[]='%s'", domain, type(args.all)) + continue + elif instances.is_recent(domain): + logger.debug("domain='%s' has been recently crawled - SKIPPED!", domain) + continue + + logger.info("Fetching instances from domain='%s' ...", domain) + federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) + + logger.debug("Success! - EXIT!") + return 0 + +def update_nodeinfo(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + if args.domain is not None and args.domain != "": + logger.debug("Fetching args.domain='%s'", args.domain) + database.cursor.execute("SELECT domain, software FROM instances WHERE domain = ?", [args.domain]) + elif args.software is not None and args.software != "": + logger.info("Fetching domains for args.software='%s'", args.software) + database.cursor.execute("SELECT domain, software FROM instances WHERE software = ?", [args.software]) + else: + logger.info("Fetching domains for recently updated ...") + database.cursor.execute("SELECT domain, software FROM instances WHERE last_nodeinfo < ? OR last_nodeinfo IS NULL", [time.time() - config.get("recheck_nodeinfo")]) + + domains = database.cursor.fetchall() + + logger.info("Checking %d domain(s) ...", len(domains)) + cnt = 0 + for row in domains: + logger.debug("row[]='%s'", type(row)) + try: + logger.info("Checking nodeinfo for row[domain]='%s',row[software]='%s' (%s%%) ...", row["domain"], row["software"], "{:5.1f}".format(cnt / len(domains) * 100)) + software = federation.determine_software(row["domain"]) + + logger.debug("Determined software='%s'", software) + if (software != row["software"] and software is not None) or args.force is True: + logger.warning("Software type for row[domain]='%s' has changed from '%s' to '%s'!", row["domain"], row["software"], software) + instances.set_software(row["domain"], software) + + instances.set_success(row["domain"]) + except network.exceptions as exception: + logger.warning("Exception '%s' during updating nodeinfo for row[domain]='%s'", type(exception), row["domain"]) + instances.set_last_error(row["domain"], exception) + + instances.set_last_nodeinfo(row["domain"]) + instances.update_data(row["domain"]) + cnt = cnt + 1 + + logger.debug("Success! - EXIT!") + return 0 + +def fetch_instances_social(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + logger.debug("Invoking locking.acquire() ...") + locking.acquire() + + source_domain = "instances.social" + + if config.get("instances_social_api_key") == "": + logger.error("API key not set. Please set in your config.json file.") + return 1 + elif sources.is_recent(source_domain): + logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) + return 0 + else: + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) + + headers = { + "Authorization": f"Bearer {config.get('instances_social_api_key')}", + } + + fetched = network.get_json_api( + source_domain, + "/api/1.0/instances/list?count=0&sort_by=name", + headers, + (config.get("connection_timeout"), config.get("read_timeout")) + ) + logger.debug("fetched[]='%s'", type(fetched)) + + if "error_message" in fetched: + logger.warning("Error during fetching API result: '%s' - EXIT!", fetched["error_message"]) + return 2 + elif "exception" in fetched: + logger.warning("Exception '%s' during fetching API result - EXIT!", type(fetched["exception"])) + return 3 + elif "json" not in fetched: + logger.warning("fetched has no element 'json' - EXIT!") + return 4 + elif "instances" not in fetched["json"]: + logger.warning("fetched[row] has no element 'instances' - EXIT!") + return 5 + + domains = list() + rows = fetched["json"]["instances"] + + logger.info("Checking %d row(s) ...", len(rows)) + for row in rows: + logger.debug("row[]='%s'", type(row)) + domain = tidyup.domain(row["name"]) + logger.debug("domain='%s' - AFTER!", domain) + + if domain == "": + logger.debug("domain is empty - SKIPPED!") + continue + + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) + + if not utils.is_domain_wanted(domain): + logger.warning("domain='%s' is not wanted - SKIPPED!", domain) + continue + elif domain in domains: + logger.debug("domain='%s' is already added - SKIPPED!", domain) + continue + elif instances.is_registered(domain): + logger.debug("domain='%s' is already registered - SKIPPED!", domain) + continue + elif instances.is_recent(domain): + logger.debug("domain='%s' has been recently crawled - SKIPPED!", domain) + continue + + logger.info("Fetching instances from domain='%s'", domain) + federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) + + logger.debug("Success! - EXIT!") + return 0 + +def convert_idna(args: argparse.Namespace) -> int: + logger.debug("args[]='%s' - CALLED!", type(args)) + + database.cursor.execute("SELECT domain FROM instances WHERE domain NOT LIKE '%xn--%' ORDER BY domain ASC") + rows = database.cursor.fetchall() + + logger.debug("rows[]='%s'", type(rows)) + instances.translate_idnas(rows, "domain") + + database.cursor.execute("SELECT origin FROM instances WHERE origin NOT LIKE '%xn--%' ORDER BY origin ASC") + rows = database.cursor.fetchall() + + logger.debug("rows[]='%s'", type(rows)) + instances.translate_idnas(rows, "origin") + + database.cursor.execute("SELECT blocker FROM blocks WHERE blocker NOT LIKE '%xn--%' ORDER BY blocker ASC") + rows = database.cursor.fetchall() + + logger.debug("rows[]='%s'", type(rows)) + blocks.translate_idnas(rows, "blocker") + + database.cursor.execute("SELECT blocked FROM blocks WHERE blocked NOT LIKE '%xn--%' ORDER BY blocked ASC") + rows = database.cursor.fetchall() + + logger.debug("rows[]='%s'", type(rows)) + blocks.translate_idnas(rows, "blocked") + + logger.debug("Success! - EXIT!") + return 0