indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2022-03-31 23:59:00 +01:00
parent f1b37f2bde 92f3bbb763
commit 5a38d6d00a
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
blocking.py
View File

@ -327,10 +327,10 @@ def is_blocked_domain(base_dir: str, domain: str,
if not broch_mode_is_active(base_dir): if not broch_mode_is_active(base_dir):
if blocked_cache: if blocked_cache:
for blocked_str in blocked_cache: for blocked_str in blocked_cache:
if '*@' + domain in blocked_str: if blocked_str == '*@' + domain:
return True return True
if short_domain: if short_domain:
if '*@' + short_domain in blocked_str: if blocked_str == '*@' + short_domain:
return True return True
else: else:
# instance block list # instance block list
@ -339,10 +339,10 @@ def is_blocked_domain(base_dir: str, domain: str,
try: try:
with open(global_blocking_filename, 'r') as fp_blocked: with open(global_blocking_filename, 'r') as fp_blocked:
blocked_str = fp_blocked.read() blocked_str = fp_blocked.read()
if '*@' + domain in blocked_str: if '*@' + domain + '\n' in blocked_str:
return True return True
if short_domain: if short_domain:
if '*@' + short_domain in blocked_str: if '*@' + short_domain + '\n' in blocked_str:
return True return True
except OSError as ex: except OSError as ex:
print('EX: unable to read ' + global_blocking_filename + print('EX: unable to read ' + global_blocking_filename +
@ -379,7 +379,7 @@ def is_blocked(base_dir: str, nickname: str, domain: str,
if '*@' + domain in blocked_str: if '*@' + domain in blocked_str:
return True return True
if block_handle: if block_handle:
if block_handle in blocked_str: if blocked_str == block_handle:
return True return True
else: else:
global_blocks_filename = base_dir + '/accounts/blocking.txt' global_blocks_filename = base_dir + '/accounts/blocking.txt'
@ -387,33 +387,34 @@ def is_blocked(base_dir: str, nickname: str, domain: str,
if '*@' + block_domain in open(global_blocks_filename).read(): if '*@' + block_domain in open(global_blocks_filename).read():
return True return True
if block_handle: if block_handle:
if block_handle in open(global_blocks_filename).read(): block_str = block_handle + '\n'
if block_str in open(global_blocks_filename).read():
return True return True
else: else:
# instance allow list # instance allow list
allow_filename = base_dir + '/accounts/allowedinstances.txt' allow_filename = base_dir + '/accounts/allowedinstances.txt'
short_domain = _get_short_domain(block_domain) short_domain = _get_short_domain(block_domain)
if not short_domain: if not short_domain:
if block_domain not in open(allow_filename).read(): if block_domain + '\n' not in open(allow_filename).read():
return True return True
else: else:
if short_domain not in open(allow_filename).read(): if short_domain + '\n' not in open(allow_filename).read():
return True return True
# account level allow list # account level allow list
account_dir = acct_dir(base_dir, nickname, domain) account_dir = acct_dir(base_dir, nickname, domain)
allow_filename = account_dir + '/allowedinstances.txt' allow_filename = account_dir + '/allowedinstances.txt'
if os.path.isfile(allow_filename): if os.path.isfile(allow_filename):
if block_domain not in open(allow_filename).read(): if block_domain + '\n' not in open(allow_filename).read():
return True return True
# account level block list # account level block list
blocking_filename = account_dir + '/blocking.txt' blocking_filename = account_dir + '/blocking.txt'
if os.path.isfile(blocking_filename): if os.path.isfile(blocking_filename):
if '*@' + block_domain in open(blocking_filename).read(): if '*@' + block_domain + '\n' in open(blocking_filename).read():
return True return True
if block_handle: if block_handle:
if block_handle in open(blocking_filename).read(): if block_handle + '\n' in open(blocking_filename).read():
return True return True
return False return False

4
crawlers.py
View File

@ -114,7 +114,7 @@ def blocked_user_agent(calling_domain: str, agent_str: str,
agent_str_lower = agent_str.lower() agent_str_lower = agent_str.lower()
for ua_block in default_user_agent_blocks: for ua_block in default_user_agent_blocks:
if ua_block in agent_str_lower: if ua_block in agent_str_lower:
print('Blocked User agent: ' + ua_block) print('Blocked User agent 1: ' + ua_block)
return True, blocked_cache_last_updated return True, blocked_cache_last_updated
agent_domain = None agent_domain = None
@ -176,5 +176,5 @@ def blocked_user_agent(calling_domain: str, agent_str: str,
is_blocked_domain(base_dir, agent_domain, blocked_cache) is_blocked_domain(base_dir, agent_domain, blocked_cache)
# if self.server.debug: # if self.server.debug:
if blocked_ua: if blocked_ua:
print('Blocked User agent: ' + agent_domain) print('Blocked User agent 2: ' + agent_domain)
return blocked_ua, blocked_cache_last_updated return blocked_ua, blocked_cache_last_updated