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

Federated blocklist enpoint can be a simple list of strings

main
Bob Mottram 2024-02-10 12:11:30 +00:00
parent dc1c709248
commit ca0ffdbd6b
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
blocking.py
View File

@ -1871,6 +1871,18 @@ def load_federated_blocks_endpoints(base_dir: str) -> []:
return block_federated_endpoints
def _valid_blocklist_entry(text: str) -> bool:
"""is the given blocklist entry valid?
"""
if ' ' in text or \
',' in text or \
';' in text or \
'.' not in text or \
'<' in text:
return False
return True
def _update_federated_blocks(session, base_dir: str,
http_prefix: str,
domain: str,
@ -1917,6 +1929,16 @@ def _update_federated_blocks(session, base_dir: str,
# of service
if len(blocked_json) < max_api_blocks:
for block_dict in blocked_json:
if isinstance(block_dict, str):
# a simple list of strings containing handles
# or domains
handle = block_dict
if _valid_blocklist_entry(handle):
new_block_api_str += handle + '\n'
if handle not in block_federated:
block_federated.append(handle)
continue
if not isinstance(block_dict, dict):
continue
if not block_dict.get('username'):
@ -1926,11 +1948,7 @@ def _update_federated_blocks(session, base_dir: str,
handle = block_dict['username']
if handle.startswith('@'):
handle = handle[1:]
if ' ' in handle or \
',' in handle or \
';' in handle or \
'.' not in handle or \
'<' in handle:
if not _valid_blocklist_entry(handle):
continue
new_block_api_str += handle + '\n'
if handle not in block_federated: