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

Reject relayed DMs

main
bashrc 2026-04-20 11:12:37 +01:00
parent 300ee918de
commit ed8e16e146
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inbox.py
View File

@ -1474,6 +1474,17 @@ def _bounce_dm(sender_post_id: str, session, http_prefix: str,
return True return True
def _is_relayed_dm(post_json_object: {}) -> bool:
"""Returns true if the DM is relayed
See https://holos.fedilab.app/e2ee
"""
if 'holos:e2eeEnabled' not in post_json_object['object']:
return False
if not isinstance(post_json_object['object']['holos:e2eeEnabled'], bool):
return True
return post_json_object['object']['holos:e2eeEnabled']
def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int, def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
post_json_object: {}, update_index_list: [], post_json_object: {}, update_index_list: [],
session, http_prefix: str, session, http_prefix: str,
@ -1542,6 +1553,10 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
# Not sending to yourself # Not sending to yourself
if not sending_to_self: if not sending_to_self:
obj_has_dict = has_object_dict(post_json_object)
if obj_has_dict:
if _is_relayed_dm(post_json_object):
return False
# is this a vote on a question? # is this a vote on a question?
if is_vote(base_dir, nickname, domain, if is_vote(base_dir, nickname, domain,
post_json_object, debug): post_json_object, debug):
@ -1567,7 +1582,6 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
# send back a bounce DM # send back a bounce DM
if post_json_object.get('id') and \ if post_json_object.get('id') and \
post_json_object.get('object'): post_json_object.get('object'):
obj_has_dict = has_object_dict(post_json_object)
# don't send bounces back to # don't send bounces back to
# replies to bounce messages # replies to bounce messages
obj = post_json_object['object'] obj = post_json_object['object']